You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/02/25 19:33:29 UTC
[isis] branch dev/2.0.0-M2-cherrypicked updated (2d48658 -> 92cf8e3)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch dev/2.0.0-M2-cherrypicked
in repository https://gitbox.apache.org/repos/asf/isis.git.
discard 2d48658 ISIS-1744: helloworld/simpleapp: update to org.incode build-4
discard 77189c0 ISIS-1744 updating DN versions
discard 3530c67 ISIS-1811: updates versions to 2.0.0-M2-SNAPSHOT
discard a92f6b9 ISIS-1728: uses typesafe queries for helloworld
discard 01bc653 ISIS-1724: removes the deprecated IsisJdoSupport in the jdo applib
discard dbff2c9 ISIS-1276: fixes algorithm for lookup of datastore id's, at least
discard 2a5b4a3 ISIS-1276: fixes compile issues in metamodel and runtime
discard d90b900 ISIS-1276: updates applib, replaces references of TypesafeQuery to be instead JDOQLTypedQuery
discard 9b8a69f ISIS-1276: updates references for datanucleus.
add da21d61 ISIS-1880 add path syntax validation
add 3e02680 ISIS-1881 package swagger-ui with core/metamodel
add 48c78c8 ISIS-1881 remove swagger-ui from simpleapp/helloworld and artifacts
add b368925 ISIS-1823 introduce config property to hide footer
add c8edfae ISIS-1841 refactor: remove guava idioms
add b168d21 ISIS-1841 Internal API: introduces _Bytes
add 6552f91 ISIS-1841 for compression and base64 encoding resort to internal API
add 8d9afe8 ISIS-1841 Internal API: add tests for compression and base64 encoding
add 6f4d95b ISIS-1841 _Bytes: refactor to symmetrical naming
add 4f96ff2 ISIS-1841 for base64 encoding resort to internal API
add dd11151 ISIS-1841 fix typos, enhance java-doc
add ed9d958 ISIS-1827 remove guava from ExceptionRecognizer implementation
new 6ef6546 ISIS-1276: updates references for datanucleus.
new 8a89698 ISIS-1276: updates applib, replaces references of TypesafeQuery to be instead JDOQLTypedQuery
new 6bbf245 ISIS-1276: fixes compile issues in metamodel and runtime
new 593b87e ISIS-1276: fixes algorithm for lookup of datastore id's, at least
new 1edb33d ISIS-1724: removes the deprecated IsisJdoSupport in the jdo applib
new ac3d02b ISIS-1728: uses typesafe queries for helloworld
new a806259 ISIS-1811: updates versions to 2.0.0-M2-SNAPSHOT
new 3f5ccb6 ISIS-1744 updating DN versions
new 92cf8e3 ISIS-1744: helloworld/simpleapp: update to org.incode build-4
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (2d48658)
\
N -- N -- N refs/heads/dev/2.0.0-M2-cherrypicked (92cf8e3)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../isis/applib/annotation/MemberGroupLayout.java | 20 +-
.../apache/isis/applib/internal/_Constants.java | 5 +
.../apache/isis/applib/internal/base/_Bytes.java | 172 +
.../internal/base/_Bytes_GZipCompressor.java | 61 +
.../apache/isis/applib/internal/base/_Strings.java | 268 +-
.../exceprecog/ExceptionRecognizerAbstract.java | 33 -
...java => ExceptionRecognizerAbstractLegacy.java} | 43 +-
.../exceprecog/ExceptionRecognizerComposite.java | 3 +-
.../exceprecog/ExceptionRecognizerForType.java | 58 +-
....java => ExceptionRecognizerForTypeLegacy.java} | 68 +-
...xceptionRecognizerForJDODataStoreException.java | 4 +-
...traintViolationForeignKeyNoActionException.java | 4 +-
...ionRecognizerForJDOObjectNotFoundException.java | 4 +-
...yConstraintViolationUniqueOrIndexException.java | 4 +-
.../repository/RepositoryServiceLegacy.java | 4 +-
.../UrlEncodingServiceUsingBaseEncoding.java | 39 +-
.../UrlEncodingServiceWithCompressionAbstract.java | 50 +-
.../isis/applib/value/LocalResourcePath.java | 23 +-
.../isis/applib/internal/base/BytesTest.java | 127 +
.../isis/applib/internal/base/StringsTest.java | 62 +
.../ExceptionRecognizerForType2Test.java | 73 -
.../exceprecog/ExceptionRecognizerForTypeTest.java | 36 +-
.../exceprecog/ExceptionRecognizerGeneralTest.java | 8 +-
...codingServiceWithCompression_Abstract_Test.java | 2 +-
.../src/main/resources}/swagger-ui/00-README.md | 0
.../src/main/resources}/swagger-ui/css/print.css | 0
.../src/main/resources}/swagger-ui/css/reset.css | 0
.../src/main/resources}/swagger-ui/css/screen.css | 0
.../src/main/resources}/swagger-ui/css/style.css | 0
.../main/resources}/swagger-ui/css/typography.css | 0
.../resources}/swagger-ui/fonts/DroidSans-Bold.ttf | Bin
.../main/resources}/swagger-ui/fonts/DroidSans.ttf | Bin
.../main/resources}/swagger-ui/images/collapse.gif | Bin
.../main/resources}/swagger-ui/images/expand.gif | Bin
.../swagger-ui/images/explorer_icons.png | Bin
.../resources}/swagger-ui/images/favicon-16x16.png | Bin
.../resources}/swagger-ui/images/favicon-32x32.png | Bin
.../main/resources}/swagger-ui/images/favicon.ico | Bin
.../resources}/swagger-ui/images/logo_small.png | Bin
.../resources}/swagger-ui/images/pet_store_api.png | Bin
.../main/resources}/swagger-ui/images/throbber.gif | Bin
.../resources}/swagger-ui/images/wordnik_api.png | Bin
.../resources}/swagger-ui/index-ORIG-2.2.10.html | 0
.../src/main/resources}/swagger-ui/index.html | 8 +-
.../src/main/resources}/swagger-ui/lang/ca.js | 0
.../src/main/resources}/swagger-ui/lang/el.js | 0
.../src/main/resources}/swagger-ui/lang/en.js | 0
.../src/main/resources}/swagger-ui/lang/es.js | 0
.../src/main/resources}/swagger-ui/lang/fr.js | 0
.../src/main/resources}/swagger-ui/lang/geo.js | 0
.../src/main/resources}/swagger-ui/lang/it.js | 0
.../src/main/resources}/swagger-ui/lang/ja.js | 0
.../src/main/resources}/swagger-ui/lang/ko-kr.js | 0
.../src/main/resources}/swagger-ui/lang/pl.js | 0
.../src/main/resources}/swagger-ui/lang/pt.js | 0
.../src/main/resources}/swagger-ui/lang/ru.js | 0
.../src/main/resources}/swagger-ui/lang/tr.js | 0
.../main/resources}/swagger-ui/lang/translator.js | 0
.../src/main/resources}/swagger-ui/lang/zh-cn.js | 0
.../main/resources}/swagger-ui/lib/backbone-min.js | 0
.../src/main/resources}/swagger-ui/lib/es5-shim.js | 0
.../resources}/swagger-ui/lib/handlebars-4.0.5.js | 0
.../swagger-ui/lib/highlight.9.1.0.pack.js | 0
.../lib/highlight.9.1.0.pack_extended.js | 0
.../resources}/swagger-ui/lib/jquery-1.8.0.min.js | 0
.../resources}/swagger-ui/lib/jquery.ba-bbq.min.js | 0
.../swagger-ui/lib/jquery.slideto.min.js | 0
.../resources}/swagger-ui/lib/jquery.wiggle.min.js | 0
.../main/resources}/swagger-ui/lib/js-yaml.min.js | 0
.../resources}/swagger-ui/lib/jsoneditor.min.js | 0
.../main/resources}/swagger-ui/lib/lodash.min.js | 0
.../src/main/resources}/swagger-ui/lib/marked.js | 0
.../swagger-ui/lib/object-assign-pollyfill.js | 0
.../resources}/swagger-ui/lib/sanitize-html.min.js | 0
.../resources}/swagger-ui/lib/swagger-oauth.js | 0
.../src/main/resources}/swagger-ui/o2c.html | 0
.../src/main/resources}/swagger-ui/swagger-ui.js | 0
.../main/resources}/swagger-ui/swagger-ui.min.js | 0
.../wicket/viewer/IsisWicketApplication.java | 2 -
.../wicket/model/isis/WicketViewerSettings.java | 3 +
.../wicket/ui/components/footer/FooterPanel.java | 14 +-
.../src/main/webapp/swagger-ui/00-README.md | 5 -
.../src/main/webapp/swagger-ui/css/print.css | 1 -
.../src/main/webapp/swagger-ui/css/reset.css | 1 -
.../src/main/webapp/swagger-ui/css/screen.css | 1 -
.../src/main/webapp/swagger-ui/css/style.css | 1 -
.../src/main/webapp/swagger-ui/css/typography.css | 0
.../webapp/swagger-ui/fonts/DroidSans-Bold.ttf | Bin 42480 -> 0 bytes
.../src/main/webapp/swagger-ui/fonts/DroidSans.ttf | Bin 41028 -> 0 bytes
.../src/main/webapp/swagger-ui/images/collapse.gif | Bin 69 -> 0 bytes
.../src/main/webapp/swagger-ui/images/expand.gif | Bin 73 -> 0 bytes
.../webapp/swagger-ui/images/explorer_icons.png | Bin 5115 -> 0 bytes
.../webapp/swagger-ui/images/favicon-16x16.png | Bin 445 -> 0 bytes
.../webapp/swagger-ui/images/favicon-32x32.png | Bin 1141 -> 0 bytes
.../src/main/webapp/swagger-ui/images/favicon.ico | Bin 5430 -> 0 bytes
.../main/webapp/swagger-ui/images/logo_small.png | Bin 455 -> 0 bytes
.../webapp/swagger-ui/images/pet_store_api.png | Bin 631 -> 0 bytes
.../src/main/webapp/swagger-ui/images/throbber.gif | Bin 9257 -> 0 bytes
.../main/webapp/swagger-ui/images/wordnik_api.png | Bin 670 -> 0 bytes
.../main/webapp/swagger-ui/index-ORIG-2.2.10.html | 126 -
.../src/main/webapp/swagger-ui/index.html | 168 -
.../src/main/webapp/swagger-ui/lang/ca.js | 53 -
.../src/main/webapp/swagger-ui/lang/el.js | 56 -
.../src/main/webapp/swagger-ui/lang/en.js | 56 -
.../src/main/webapp/swagger-ui/lang/es.js | 53 -
.../src/main/webapp/swagger-ui/lang/fr.js | 54 -
.../src/main/webapp/swagger-ui/lang/geo.js | 56 -
.../src/main/webapp/swagger-ui/lang/it.js | 52 -
.../src/main/webapp/swagger-ui/lang/ja.js | 56 -
.../src/main/webapp/swagger-ui/lang/ko-kr.js | 53 -
.../src/main/webapp/swagger-ui/lang/pl.js | 53 -
.../src/main/webapp/swagger-ui/lang/pt.js | 53 -
.../src/main/webapp/swagger-ui/lang/ru.js | 56 -
.../src/main/webapp/swagger-ui/lang/tr.js | 53 -
.../src/main/webapp/swagger-ui/lang/translator.js | 39 -
.../src/main/webapp/swagger-ui/lang/zh-cn.js | 56 -
.../src/main/webapp/swagger-ui/lib/backbone-min.js | 1 -
.../src/main/webapp/swagger-ui/lib/es5-shim.js | 1 -
.../main/webapp/swagger-ui/lib/handlebars-4.0.5.js | 3 -
.../webapp/swagger-ui/lib/highlight.9.1.0.pack.js | 1 -
.../lib/highlight.9.1.0.pack_extended.js | 1 -
.../main/webapp/swagger-ui/lib/jquery-1.8.0.min.js | 3 -
.../webapp/swagger-ui/lib/jquery.ba-bbq.min.js | 1 -
.../webapp/swagger-ui/lib/jquery.slideto.min.js | 1 -
.../webapp/swagger-ui/lib/jquery.wiggle.min.js | 1 -
.../src/main/webapp/swagger-ui/lib/js-yaml.min.js | 2 -
.../main/webapp/swagger-ui/lib/jsoneditor.min.js | 5 -
.../src/main/webapp/swagger-ui/lib/lodash.min.js | 2 -
.../src/main/webapp/swagger-ui/lib/marked.js | 1 -
.../swagger-ui/lib/object-assign-pollyfill.js | 1 -
.../webapp/swagger-ui/lib/sanitize-html.min.js | 4 -
.../main/webapp/swagger-ui/lib/swagger-oauth.js | 1 -
.../helloworld/src/main/webapp/swagger-ui/o2c.html | 20 -
.../src/main/webapp/swagger-ui/swagger-ui.js | 25344 -------------------
.../src/main/webapp/swagger-ui/swagger-ui.min.js | 15 -
.../webapp/src/main/webapp/swagger-ui/00-README.md | 5 -
.../src/main/webapp/swagger-ui/css/print.css | 1 -
.../src/main/webapp/swagger-ui/css/reset.css | 1 -
.../src/main/webapp/swagger-ui/css/screen.css | 1 -
.../src/main/webapp/swagger-ui/css/style.css | 1 -
.../src/main/webapp/swagger-ui/css/typography.css | 0
.../webapp/swagger-ui/fonts/DroidSans-Bold.ttf | Bin 42480 -> 0 bytes
.../src/main/webapp/swagger-ui/fonts/DroidSans.ttf | Bin 41028 -> 0 bytes
.../src/main/webapp/swagger-ui/images/collapse.gif | Bin 69 -> 0 bytes
.../src/main/webapp/swagger-ui/images/expand.gif | Bin 73 -> 0 bytes
.../webapp/swagger-ui/images/explorer_icons.png | Bin 5115 -> 0 bytes
.../webapp/swagger-ui/images/favicon-16x16.png | Bin 445 -> 0 bytes
.../webapp/swagger-ui/images/favicon-32x32.png | Bin 1141 -> 0 bytes
.../src/main/webapp/swagger-ui/images/favicon.ico | Bin 5430 -> 0 bytes
.../main/webapp/swagger-ui/images/logo_small.png | Bin 455 -> 0 bytes
.../webapp/swagger-ui/images/pet_store_api.png | Bin 631 -> 0 bytes
.../src/main/webapp/swagger-ui/images/throbber.gif | Bin 9257 -> 0 bytes
.../main/webapp/swagger-ui/images/wordnik_api.png | Bin 670 -> 0 bytes
.../webapp/src/main/webapp/swagger-ui/lang/ca.js | 53 -
.../webapp/src/main/webapp/swagger-ui/lang/el.js | 56 -
.../webapp/src/main/webapp/swagger-ui/lang/en.js | 56 -
.../webapp/src/main/webapp/swagger-ui/lang/es.js | 53 -
.../webapp/src/main/webapp/swagger-ui/lang/fr.js | 54 -
.../webapp/src/main/webapp/swagger-ui/lang/geo.js | 56 -
.../webapp/src/main/webapp/swagger-ui/lang/it.js | 52 -
.../webapp/src/main/webapp/swagger-ui/lang/ja.js | 56 -
.../src/main/webapp/swagger-ui/lang/ko-kr.js | 53 -
.../webapp/src/main/webapp/swagger-ui/lang/pl.js | 53 -
.../webapp/src/main/webapp/swagger-ui/lang/pt.js | 53 -
.../webapp/src/main/webapp/swagger-ui/lang/ru.js | 56 -
.../webapp/src/main/webapp/swagger-ui/lang/tr.js | 53 -
.../src/main/webapp/swagger-ui/lang/translator.js | 39 -
.../src/main/webapp/swagger-ui/lang/zh-cn.js | 56 -
.../src/main/webapp/swagger-ui/lib/backbone-min.js | 1 -
.../src/main/webapp/swagger-ui/lib/es5-shim.js | 1 -
.../main/webapp/swagger-ui/lib/handlebars-4.0.5.js | 3 -
.../webapp/swagger-ui/lib/highlight.9.1.0.pack.js | 1 -
.../lib/highlight.9.1.0.pack_extended.js | 1 -
.../main/webapp/swagger-ui/lib/jquery-1.8.0.min.js | 3 -
.../webapp/swagger-ui/lib/jquery.ba-bbq.min.js | 1 -
.../webapp/swagger-ui/lib/jquery.slideto.min.js | 1 -
.../webapp/swagger-ui/lib/jquery.wiggle.min.js | 1 -
.../src/main/webapp/swagger-ui/lib/js-yaml.min.js | 2 -
.../main/webapp/swagger-ui/lib/jsoneditor.min.js | 5 -
.../src/main/webapp/swagger-ui/lib/lodash.min.js | 2 -
.../src/main/webapp/swagger-ui/lib/marked.js | 1 -
.../swagger-ui/lib/object-assign-pollyfill.js | 1 -
.../webapp/swagger-ui/lib/sanitize-html.min.js | 4 -
.../main/webapp/swagger-ui/lib/swagger-oauth.js | 1 -
.../src/main/webapp/swagger-ui/swagger-ui.js | 25344 -------------------
.../src/main/webapp/swagger-ui/swagger-ui.min.js | 15 -
.../src/main/webapp/swagger-ui/00-README.md | 5 -
.../src/main/webapp/swagger-ui/css/print.css | 1 -
.../src/main/webapp/swagger-ui/css/reset.css | 1 -
.../src/main/webapp/swagger-ui/css/screen.css | 1 -
.../src/main/webapp/swagger-ui/css/style.css | 1 -
.../src/main/webapp/swagger-ui/css/typography.css | 0
.../webapp/swagger-ui/fonts/DroidSans-Bold.ttf | Bin 42480 -> 0 bytes
.../src/main/webapp/swagger-ui/fonts/DroidSans.ttf | Bin 41028 -> 0 bytes
.../src/main/webapp/swagger-ui/images/collapse.gif | Bin 69 -> 0 bytes
.../src/main/webapp/swagger-ui/images/expand.gif | Bin 73 -> 0 bytes
.../webapp/swagger-ui/images/explorer_icons.png | Bin 5115 -> 0 bytes
.../webapp/swagger-ui/images/favicon-16x16.png | Bin 445 -> 0 bytes
.../webapp/swagger-ui/images/favicon-32x32.png | Bin 1141 -> 0 bytes
.../src/main/webapp/swagger-ui/images/favicon.ico | Bin 5430 -> 0 bytes
.../main/webapp/swagger-ui/images/logo_small.png | Bin 455 -> 0 bytes
.../webapp/swagger-ui/images/pet_store_api.png | Bin 631 -> 0 bytes
.../src/main/webapp/swagger-ui/images/throbber.gif | Bin 9257 -> 0 bytes
.../main/webapp/swagger-ui/images/wordnik_api.png | Bin 670 -> 0 bytes
.../main/webapp/swagger-ui/index-ORIG-2.2.10.html | 129 -
.../src/main/webapp/swagger-ui/index.html | 171 -
.../src/main/webapp/swagger-ui/lang/ca.js | 53 -
.../src/main/webapp/swagger-ui/lang/el.js | 56 -
.../src/main/webapp/swagger-ui/lang/en.js | 56 -
.../src/main/webapp/swagger-ui/lang/es.js | 53 -
.../src/main/webapp/swagger-ui/lang/fr.js | 54 -
.../src/main/webapp/swagger-ui/lang/geo.js | 56 -
.../src/main/webapp/swagger-ui/lang/it.js | 52 -
.../src/main/webapp/swagger-ui/lang/ja.js | 56 -
.../src/main/webapp/swagger-ui/lang/ko-kr.js | 53 -
.../src/main/webapp/swagger-ui/lang/pl.js | 53 -
.../src/main/webapp/swagger-ui/lang/pt.js | 53 -
.../src/main/webapp/swagger-ui/lang/ru.js | 56 -
.../src/main/webapp/swagger-ui/lang/tr.js | 53 -
.../src/main/webapp/swagger-ui/lang/translator.js | 39 -
.../src/main/webapp/swagger-ui/lang/zh-cn.js | 56 -
.../src/main/webapp/swagger-ui/lib/backbone-min.js | 1 -
.../src/main/webapp/swagger-ui/lib/es5-shim.js | 1 -
.../main/webapp/swagger-ui/lib/handlebars-4.0.5.js | 3 -
.../webapp/swagger-ui/lib/highlight.9.1.0.pack.js | 1 -
.../lib/highlight.9.1.0.pack_extended.js | 1 -
.../main/webapp/swagger-ui/lib/jquery-1.8.0.min.js | 3 -
.../webapp/swagger-ui/lib/jquery.ba-bbq.min.js | 1 -
.../webapp/swagger-ui/lib/jquery.slideto.min.js | 1 -
.../webapp/swagger-ui/lib/jquery.wiggle.min.js | 1 -
.../src/main/webapp/swagger-ui/lib/js-yaml.min.js | 2 -
.../main/webapp/swagger-ui/lib/jsoneditor.min.js | 5 -
.../src/main/webapp/swagger-ui/lib/lodash.min.js | 2 -
.../src/main/webapp/swagger-ui/lib/marked.js | 1 -
.../swagger-ui/lib/object-assign-pollyfill.js | 1 -
.../webapp/swagger-ui/lib/sanitize-html.min.js | 4 -
.../main/webapp/swagger-ui/lib/swagger-oauth.js | 1 -
.../src/main/webapp/swagger-ui/o2c.html | 23 -
.../src/main/webapp/swagger-ui/swagger-ui.js | 25344 -------------------
.../src/main/webapp/swagger-ui/swagger-ui.min.js | 15 -
.../main/webapp/swagger-ui/index-ORIG-2.2.10.html | 129 -
.../webapp/src/main/webapp/swagger-ui/index.html | 171 -
.../webapp/src/main/webapp/swagger-ui/o2c.html | 23 -
243 files changed, 775 insertions(+), 79971 deletions(-)
create mode 100644 core/applib/src/main/java/org/apache/isis/applib/internal/base/_Bytes.java
create mode 100644 core/applib/src/main/java/org/apache/isis/applib/internal/base/_Bytes_GZipCompressor.java
copy core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/{ExceptionRecognizerAbstract.java => ExceptionRecognizerAbstractLegacy.java} (79%)
rename core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/{ExceptionRecognizerForType2.java => ExceptionRecognizerForTypeLegacy.java} (69%)
create mode 100644 core/applib/src/test/java/org/apache/isis/applib/internal/base/BytesTest.java
delete mode 100644 core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType2Test.java
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/00-README.md (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/css/print.css (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/css/reset.css (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/css/screen.css (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/css/style.css (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/css/typography.css (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/fonts/DroidSans-Bold.ttf (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/fonts/DroidSans.ttf (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/images/collapse.gif (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/images/expand.gif (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/images/explorer_icons.png (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/images/favicon-16x16.png (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/images/favicon-32x32.png (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/images/favicon.ico (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/images/logo_small.png (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/images/pet_store_api.png (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/images/throbber.gif (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/images/wordnik_api.png (100%)
rename {example/application/simpleapp/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/index-ORIG-2.2.10.html (100%)
rename {example/application/simpleapp/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/index.html (97%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lang/ca.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lang/el.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lang/en.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lang/es.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lang/fr.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lang/geo.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lang/it.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lang/ja.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lang/ko-kr.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lang/pl.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lang/pt.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lang/ru.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lang/tr.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lang/translator.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lang/zh-cn.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lib/backbone-min.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lib/es5-shim.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lib/handlebars-4.0.5.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lib/highlight.9.1.0.pack.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lib/highlight.9.1.0.pack_extended.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lib/jquery-1.8.0.min.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lib/jquery.ba-bbq.min.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lib/jquery.slideto.min.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lib/jquery.wiggle.min.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lib/js-yaml.min.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lib/jsoneditor.min.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lib/lodash.min.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lib/marked.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lib/object-assign-pollyfill.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lib/sanitize-html.min.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/lib/swagger-oauth.js (100%)
rename {example/application/simpleapp/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/o2c.html (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/swagger-ui.js (100%)
rename {example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp => core/metamodel/src/main/resources}/swagger-ui/swagger-ui.min.js (100%)
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/00-README.md
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/css/print.css
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/css/reset.css
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/css/screen.css
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/css/style.css
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/css/typography.css
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/fonts/DroidSans-Bold.ttf
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/fonts/DroidSans.ttf
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/images/collapse.gif
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/images/expand.gif
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/images/explorer_icons.png
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/images/favicon-16x16.png
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/images/favicon-32x32.png
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/images/favicon.ico
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/images/logo_small.png
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/images/pet_store_api.png
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/images/throbber.gif
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/images/wordnik_api.png
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/index-ORIG-2.2.10.html
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/index.html
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lang/ca.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lang/el.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lang/en.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lang/es.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lang/fr.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lang/geo.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lang/it.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lang/ja.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lang/ko-kr.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lang/pl.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lang/pt.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lang/ru.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lang/tr.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lang/translator.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lang/zh-cn.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lib/backbone-min.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lib/es5-shim.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lib/handlebars-4.0.5.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lib/highlight.9.1.0.pack.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lib/highlight.9.1.0.pack_extended.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lib/jquery-1.8.0.min.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lib/jquery.ba-bbq.min.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lib/jquery.slideto.min.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lib/jquery.wiggle.min.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lib/js-yaml.min.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lib/jsoneditor.min.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lib/lodash.min.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lib/marked.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lib/object-assign-pollyfill.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lib/sanitize-html.min.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/lib/swagger-oauth.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/o2c.html
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/swagger-ui.js
delete mode 100644 example/application/helloworld/src/main/webapp/swagger-ui/swagger-ui.min.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/00-README.md
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/css/print.css
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/css/reset.css
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/css/screen.css
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/css/style.css
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/css/typography.css
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/fonts/DroidSans-Bold.ttf
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/fonts/DroidSans.ttf
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/images/collapse.gif
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/images/expand.gif
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/images/explorer_icons.png
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/images/favicon-16x16.png
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/images/favicon-32x32.png
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/images/favicon.ico
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/images/logo_small.png
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/images/pet_store_api.png
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/images/throbber.gif
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/images/wordnik_api.png
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lang/ca.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lang/el.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lang/en.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lang/es.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lang/fr.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lang/geo.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lang/it.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lang/ja.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lang/ko-kr.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lang/pl.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lang/pt.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lang/ru.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lang/tr.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lang/translator.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lang/zh-cn.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lib/backbone-min.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lib/es5-shim.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lib/handlebars-4.0.5.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lib/highlight.9.1.0.pack.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lib/highlight.9.1.0.pack_extended.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lib/jquery-1.8.0.min.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lib/jquery.ba-bbq.min.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lib/jquery.slideto.min.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lib/jquery.wiggle.min.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lib/js-yaml.min.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lib/jsoneditor.min.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lib/lodash.min.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lib/marked.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lib/object-assign-pollyfill.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lib/sanitize-html.min.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/lib/swagger-oauth.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/swagger-ui.js
delete mode 100644 example/application/simpleapp/webapp/src/main/webapp/swagger-ui/swagger-ui.min.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/00-README.md
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/css/print.css
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/css/reset.css
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/css/screen.css
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/css/style.css
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/css/typography.css
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/fonts/DroidSans-Bold.ttf
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/fonts/DroidSans.ttf
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/images/collapse.gif
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/images/expand.gif
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/images/explorer_icons.png
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/images/favicon-16x16.png
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/images/favicon-32x32.png
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/images/favicon.ico
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/images/logo_small.png
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/images/pet_store_api.png
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/images/throbber.gif
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/images/wordnik_api.png
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/index-ORIG-2.2.10.html
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/index.html
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lang/ca.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lang/el.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lang/en.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lang/es.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lang/fr.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lang/geo.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lang/it.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lang/ja.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lang/ko-kr.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lang/pl.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lang/pt.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lang/ru.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lang/tr.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lang/translator.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lang/zh-cn.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lib/backbone-min.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lib/es5-shim.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lib/handlebars-4.0.5.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lib/highlight.9.1.0.pack.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lib/highlight.9.1.0.pack_extended.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lib/jquery-1.8.0.min.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lib/jquery.ba-bbq.min.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lib/jquery.slideto.min.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lib/jquery.wiggle.min.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lib/js-yaml.min.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lib/jsoneditor.min.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lib/lodash.min.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lib/marked.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lib/object-assign-pollyfill.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lib/sanitize-html.min.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/lib/swagger-oauth.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/o2c.html
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/swagger-ui.js
delete mode 100644 example/archetype/helloworld/src/main/resources/archetype-resources/src/main/webapp/swagger-ui/swagger-ui.min.js
delete mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/swagger-ui/index-ORIG-2.2.10.html
delete mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/swagger-ui/index.html
delete mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/swagger-ui/o2c.html
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.
[isis] 07/09: ISIS-1811: updates versions to 2.0.0-M2-SNAPSHOT
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch dev/2.0.0-M2-cherrypicked
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a806259c0a59d29e8c5d21065d1c3c3ddfd3af1b
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 9 07:15:06 2018 +0000
ISIS-1811: updates versions to 2.0.0-M2-SNAPSHOT
Conflicts:
core/pom.xml
---
adocs/documentation/pom.xml | 2 +-
core/applib/pom.xml | 2 +-
core/integtestsupport/pom.xml | 2 +-
core/log4j/pom.xml | 2 +-
core/maven-plugin/pom.xml | 2 +-
core/mavendeps/intellij/pom.xml | 2 +-
core/mavendeps/testing/pom.xml | 2 +-
core/mavendeps/webapp/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
core/pom.xml | 10 +++++-----
core/runtime/pom.xml | 2 +-
.../systemusinginstallers/IsisComponentProvider.java | 13 -------------
core/schema/pom.xml | 2 +-
core/security-shiro/pom.xml | 6 +++---
core/security/pom.xml | 2 +-
core/specsupport/pom.xml | 2 +-
core/unittestsupport/pom.xml | 2 +-
core/viewer-restfulobjects-applib/pom.xml | 2 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
core/viewer-restfulobjects-server/pom.xml | 2 +-
core/viewer-wicket-applib/pom.xml | 2 +-
core/viewer-wicket-impl/pom.xml | 2 +-
core/viewer-wicket-model/pom.xml | 2 +-
core/viewer-wicket-ui/pom.xml | 2 +-
core/webserver/pom.xml | 2 +-
core/wrapper/pom.xml | 2 +-
example/application/helloworld/pom.xml | 2 +-
example/application/simpleapp/application/pom.xml | 2 +-
example/application/simpleapp/module-simple/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 2 +-
example/application/simpleapp/webapp/pom.xml | 2 +-
example/archetype/helloworld/pom.xml | 2 +-
example/archetype/simpleapp/pom.xml | 4 ++--
pom.xml | 2 +-
34 files changed, 40 insertions(+), 53 deletions(-)
diff --git a/adocs/documentation/pom.xml b/adocs/documentation/pom.xml
index 960a2e4..659e31b 100644
--- a/adocs/documentation/pom.xml
+++ b/adocs/documentation/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.isis.docs</groupId>
<artifactId>isis-documentation</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Isis Docs</name>
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 9cfea89..7fa9feb 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>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-applib</artifactId>
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 50e15c1..83e5dd5 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>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-integtestsupport</artifactId>
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index 115312e..12b8253 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-log4j</artifactId>
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 3e3646b..0ff59a6 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.tool</groupId>
diff --git a/core/mavendeps/intellij/pom.xml b/core/mavendeps/intellij/pom.xml
index 7a387b6..ce57609 100644
--- a/core/mavendeps/intellij/pom.xml
+++ b/core/mavendeps/intellij/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/mavendeps/testing/pom.xml b/core/mavendeps/testing/pom.xml
index 6504f20..cd2b9f2 100644
--- a/core/mavendeps/testing/pom.xml
+++ b/core/mavendeps/testing/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/mavendeps/webapp/pom.xml b/core/mavendeps/webapp/pom.xml
index ddeecf4..9b3d24e 100644
--- a/core/mavendeps/webapp/pom.xml
+++ b/core/mavendeps/webapp/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 697eb3d..1361ac7 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-metamodel</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 2eaff2a..eadeac8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -50,7 +50,7 @@
</prerequisites>
<properties>
- <core-version>2.0.0-M1-SNAPSHOT</core-version>
+ <core-version>2.0.0-M2-SNAPSHOT</core-version>
<jar-plugin.automaticModuleName>org.apache.isis.core</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/core</git-plugin.propertiesDir>
@@ -90,10 +90,10 @@
<!-- Datanucleus Objectstore -->
<jdo-api.version>3.2.0-m7</jdo-api.version>
- <datanucleus-core.version>5.1.2</datanucleus-core.version>
- <datanucleus-api-jdo.version>5.1.2</datanucleus-api-jdo.version>
+ <datanucleus-core.version>5.1.5</datanucleus-core.version>
+ <datanucleus-api-jdo.version>5.1.4</datanucleus-api-jdo.version>
<datanucleus-jdo-query.version>5.0.2</datanucleus-jdo-query.version>
- <datanucleus-rdbms.version>5.1.2</datanucleus-rdbms.version>
+ <datanucleus-rdbms.version>5.1.5</datanucleus-rdbms.version>
<datanucleus-jodatime.version>5.1.0-release</datanucleus-jodatime.version>
<!--
ISIS-1288: seen integration tests to fail;
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 0aa0361..01b7f38 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-runtime</artifactId>
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
index e8b2dc0..9b2936a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
@@ -25,19 +25,6 @@ import java.util.Map;
import java.util.Set;
import javax.annotation.Nullable;
-<<<<<<< dev/2.0.0-M2-cherrypicked
-=======
-import javax.jdo.annotations.PersistenceCapable;
-
-import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.common.collect.FluentIterable;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
-import org.reflections.Reflections;
->>>>>>> e20eec9 ISIS-1728: uses typesafe queries for helloworld
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.annotation.DomainObject;
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index eb39ae7..52ac941 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-schema</artifactId>
diff --git a/core/security-shiro/pom.xml b/core/security-shiro/pom.xml
index 13535bb..249459a 100644
--- a/core/security-shiro/pom.xml
+++ b/core/security-shiro/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-security-shiro</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
<name>Apache Isis Security Shiro</name>
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security-shiro</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 03fc5e7..cf44483 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-security</artifactId>
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index 6ae7e18..a31d9df 100644
--- a/core/specsupport/pom.xml
+++ b/core/specsupport/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-specsupport</artifactId>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 49972f5..9c36059 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-unittestsupport</artifactId>
diff --git a/core/viewer-restfulobjects-applib/pom.xml b/core/viewer-restfulobjects-applib/pom.xml
index e3206ae..ab27a7c 100644
--- a/core/viewer-restfulobjects-applib/pom.xml
+++ b/core/viewer-restfulobjects-applib/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-applib</artifactId>
diff --git a/core/viewer-restfulobjects-rendering/pom.xml b/core/viewer-restfulobjects-rendering/pom.xml
index 7a9feb3..c581b80 100644
--- a/core/viewer-restfulobjects-rendering/pom.xml
+++ b/core/viewer-restfulobjects-rendering/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index 1bae1d0..39519ef 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
diff --git a/core/viewer-wicket-applib/pom.xml b/core/viewer-wicket-applib/pom.xml
index a415304..11ebfb0 100644
--- a/core/viewer-wicket-applib/pom.xml
+++ b/core/viewer-wicket-applib/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-wicket-applib</artifactId>
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml
index 9c11554..33a7f12 100644
--- a/core/viewer-wicket-impl/pom.xml
+++ b/core/viewer-wicket-impl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<name>Apache Isis Wicket Viewer Implementation</name>
diff --git a/core/viewer-wicket-model/pom.xml b/core/viewer-wicket-model/pom.xml
index aa7a091..7dd62f8 100644
--- a/core/viewer-wicket-model/pom.xml
+++ b/core/viewer-wicket-model/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-wicket-model</artifactId>
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml
index edf4621..8b99385 100644
--- a/core/viewer-wicket-ui/pom.xml
+++ b/core/viewer-wicket-ui/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-viewer-wicket-ui</artifactId>
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 24ec1d8..0ef3631 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-webserver</artifactId>
diff --git a/core/wrapper/pom.xml b/core/wrapper/pom.xml
index 3d2f9a8..8f839f3 100644
--- a/core/wrapper/pom.xml
+++ b/core/wrapper/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>isis-core-wrapper</artifactId>
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index 002742f..87408e8 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.isis.example.application</groupId>
<artifactId>helloworld</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
<name>HelloWorld</name>
diff --git a/example/application/simpleapp/application/pom.xml b/example/application/simpleapp/application/pom.xml
index e46f103..05fb986 100644
--- a/example/application/simpleapp/application/pom.xml
+++ b/example/application/simpleapp/application/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-application</artifactId>
diff --git a/example/application/simpleapp/module-simple/pom.xml b/example/application/simpleapp/module-simple/pom.xml
index 4910509..c605819 100644
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-module-simple</artifactId>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index b2af7e6..ff851e2 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
<name>SimpleApp Parent</name>
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index da6eea8..b1ad666 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-webapp</artifactId>
diff --git a/example/archetype/helloworld/pom.xml b/example/archetype/helloworld/pom.xml
index 5f84e1f..a72fb6f 100644
--- a/example/archetype/helloworld/pom.xml
+++ b/example/archetype/helloworld/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>helloworld-archetype</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>helloworld-archetype</name>
<build>
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index a432bb2..646c9dc 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>simpleapp-archetype</name>
<build>
@@ -70,7 +70,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<properties>
diff --git a/pom.xml b/pom.xml
index b376ff4..7914330 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.isis</groupId>
<artifactId>isis-all</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
<packaging>pom</packaging>
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.
[isis] 05/09: ISIS-1724: removes the deprecated IsisJdoSupport in
the jdo applib
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch dev/2.0.0-M2-cherrypicked
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1edb33dbfd7f3ef939b702874d501cdc78993d1c
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Sep 19 22:50:00 2017 +0100
ISIS-1724: removes the deprecated IsisJdoSupport in the jdo applib
---
.../objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
index e5171c9..6e2ef41 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
@@ -62,7 +62,7 @@ import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
nature = NatureOfService.DOMAIN,
menuOrder = "" + Integer.MAX_VALUE
)
-public class IsisJdoSupportImpl implements IsisJdoSupport {
+public class IsisJdoSupportImpl implements org.apache.isis.applib.services.jdosupport.IsisJdoSupport {
@Programmatic
@Override
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.
[isis] 08/09: ISIS-1744 updating DN versions
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch dev/2.0.0-M2-cherrypicked
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 3f5ccb61abe1209a1eb2892a98627691e17b8d73
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Feb 19 15:22:30 2018 +0100
ISIS-1744 updating DN versions
datanucleus-core.version 5.1.6 datanucleus-api-jdo.version 5.1.4
datanucleus-jdo-query.version 5.0.4
datanucleus-rdbms.version 5.1.6
---
core/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index eadeac8..c3ed148 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -90,10 +90,10 @@
<!-- Datanucleus Objectstore -->
<jdo-api.version>3.2.0-m7</jdo-api.version>
- <datanucleus-core.version>5.1.5</datanucleus-core.version>
+ <datanucleus-core.version>5.1.6</datanucleus-core.version>
<datanucleus-api-jdo.version>5.1.4</datanucleus-api-jdo.version>
- <datanucleus-jdo-query.version>5.0.2</datanucleus-jdo-query.version>
- <datanucleus-rdbms.version>5.1.5</datanucleus-rdbms.version>
+ <datanucleus-jdo-query.version>5.0.4</datanucleus-jdo-query.version>
+ <datanucleus-rdbms.version>5.1.6</datanucleus-rdbms.version>
<datanucleus-jodatime.version>5.1.0-release</datanucleus-jodatime.version>
<!--
ISIS-1288: seen integration tests to fail;
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.
[isis] 01/09: ISIS-1276: updates references for datanucleus.
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch dev/2.0.0-M2-cherrypicked
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6ef65462ba6af9f2ca126746407f1e7595d29576
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Sep 18 22:13:20 2017 +0100
ISIS-1276: updates references for datanucleus.
Also updated org.incode:incode-build to 3-SNAPSHOT, and java-mavenmixin-datanucleus to 0.0.5-SNAPSHOT
---
core/applib/pom.xml | 39 ++--------------------------------
core/pom.xml | 19 ++++++++---------
core/unittestsupport/pom.xml | 5 ++---
example/application/helloworld/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 2 +-
5 files changed, 15 insertions(+), 52 deletions(-)
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 2d84f74..9cfea89 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -56,41 +56,6 @@
</excludes>
</resource>
</resources>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.datanucleus
- </groupId>
- <artifactId>
- datanucleus-maven-plugin
- </artifactId>
- <versionRange>
- [4.0.0-release,)
- </versionRange>
- <goals>
- <goal>enhance</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<dependencies>
@@ -132,8 +97,8 @@
<!-- DataNucleus' standard JDO support -->
<dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>javax.jdo</artifactId>
</dependency>
<!-- DataNucleus' (proprietary) type-safe query support-->
diff --git a/core/pom.xml b/core/pom.xml
index c06cbb0..2eaff2a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -88,14 +88,13 @@
[6] https://github.com/moment/moment/blob/develop/LICENSE</license.additional-notes>
<!-- Datanucleus Objectstore -->
- <jdo-api.version>3.1</jdo-api.version>
+ <jdo-api.version>3.2.0-m7</jdo-api.version>
- <datanucleus-core.version>4.1.7</datanucleus-core.version>
- <datanucleus-api-jdo.version>4.1.1</datanucleus-api-jdo.version>
- <datanucleus-jdo-query.version>4.0.5</datanucleus-jdo-query.version>
- <datanucleus-rdbms.version>4.1.9</datanucleus-rdbms.version>
-
- <datanucleus-jodatime.version>4.1.0-release</datanucleus-jodatime.version>
+ <datanucleus-core.version>5.1.2</datanucleus-core.version>
+ <datanucleus-api-jdo.version>5.1.2</datanucleus-api-jdo.version>
+ <datanucleus-jdo-query.version>5.0.2</datanucleus-jdo-query.version>
+ <datanucleus-rdbms.version>5.1.2</datanucleus-rdbms.version>
+ <datanucleus-jodatime.version>5.1.0-release</datanucleus-jodatime.version>
<!--
ISIS-1288: seen integration tests to fail;
domain object date holding 1-Aug-2015 after xactn retrieved as 31-Jul-2015
@@ -104,7 +103,7 @@
<datanucleus-jodatime.version>4.1.1</datanucleus-jodatime.version>
-->
- <datanucleus-maven-plugin.version>4.0.2</datanucleus-maven-plugin.version>
+ <datanucleus-maven-plugin.version>5.0.2</datanucleus-maven-plugin.version>
<shiro.version>1.2.6</shiro.version>
@@ -2028,8 +2027,8 @@ ${license.additional-notes}
<!-- DataNucleus -->
<dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>javax.jdo</artifactId>
<version>${jdo-api.version}</version>
</dependency>
<dependency>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 51a84e7..49972f5 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -61,9 +61,8 @@
</dependency>
<dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <version>${jdo-api.version}</version>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>javax.jdo</artifactId>
<optional>true</optional>
</dependency>
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index c4570e3..002742f 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.incode</groupId>
<artifactId>incode-build</artifactId>
- <version>2</version>
+ <version>3-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.example.application</groupId>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 84de916..b2af7e6 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.incode</groupId>
<artifactId>incode-build</artifactId>
- <version>2</version>
+ <version>3-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.example.application</groupId>
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.
[isis] 02/09: ISIS-1276: updates applib,
replaces references of TypesafeQuery to be instead JDOQLTypedQuery
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch dev/2.0.0-M2-cherrypicked
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 8a8969855d76af5ddf094b0fca13da3be6b80503
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Sep 18 22:17:54 2017 +0100
ISIS-1276: updates applib, replaces references of TypesafeQuery to be instead JDOQLTypedQuery
---
.../org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java b/core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
index 4ca5c10..75a4e0f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupport.java
@@ -23,10 +23,9 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
+import javax.jdo.JDOQLTypedQuery;
import javax.jdo.PersistenceManager;
-
-import org.datanucleus.query.typesafe.BooleanExpression;
-import org.datanucleus.query.typesafe.TypesafeQuery;
+import javax.jdo.query.BooleanExpression;
import org.apache.isis.applib.annotation.Programmatic;
@@ -132,5 +131,5 @@ public interface IsisJdoSupport {
* </p>
*/
@Programmatic
- <T> TypesafeQuery<T> newTypesafeQuery(Class<T> cls);
+ <T> JDOQLTypedQuery<T> newTypesafeQuery(Class<T> cls);
}
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.
[isis] 04/09: ISIS-1276: fixes algorithm for lookup of datastore
id's, at least
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch dev/2.0.0-M2-cherrypicked
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 593b87eb25cd052ad9dca8c4dd2ac45fb0ea973e
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Sep 18 22:55:49 2017 +0100
ISIS-1276: fixes algorithm for lookup of datastore id's, at least
---
.../persistence/spi/JdoObjectIdSerializer.java | 45 +++++++---------------
1 file changed, 13 insertions(+), 32 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
index fcfb0d8..e185908 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
@@ -93,37 +93,14 @@ public final class JdoObjectIdSerializer {
final DatastoreId dnOid = (DatastoreId) jdoOid;
final Object keyValue = dnOid.getKeyAsObject();
- if(false) {
-
- //
- // 1.8.0 original handling, appending a prefix "L_" or whatever
- //
- // if required by user community, we could add a property in isis.properties to enable if requested.
- //
- if(keyValue instanceof String) {
- return "S" + SEPARATOR + keyValue;
- }
- if(keyValue instanceof Long) {
- return "L" + SEPARATOR + keyValue;
- }
-
- if(keyValue instanceof BigInteger) {
- return "B" + SEPARATOR + keyValue;
- }
- if(keyValue instanceof Integer) {
- return "I" + SEPARATOR + keyValue;
- }
-
- } else {
- if( keyValue instanceof String ||
- keyValue instanceof Long ||
- keyValue instanceof BigDecimal || // 1.8.0 did not support BigDecimal
- keyValue instanceof BigInteger ||
- keyValue instanceof Integer) {
-
- // no separator
- return "" + keyValue;
- }
+ if( keyValue instanceof String ||
+ keyValue instanceof Long ||
+ keyValue instanceof BigDecimal || // 1.8.0 did not support BigDecimal
+ keyValue instanceof BigInteger ||
+ keyValue instanceof Integer) {
+
+ // no separator
+ return "" + keyValue;
}
}
@@ -204,7 +181,11 @@ public final class JdoObjectIdSerializer {
// @javax.jdo.annotations.PersistenceCapable(identityType = IdentityType.DATASTORE)
// for one of the common types (prettier handling)
- return idStr + "[OID]" + spec.getFullIdentifier();
+ // in DN 4.1, we did this...
+ // return idStr + "[OID]" + spec.getFullIdentifier();
+
+ // in DN 5.1, we simply do this...
+ return idStr;
}
}
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.
[isis] 03/09: ISIS-1276: fixes compile issues in metamodel and
runtime
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch dev/2.0.0-M2-cherrypicked
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6bbf2452de60e4f394d87907f497299c17aa97ce
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Sep 18 22:29:13 2017 +0100
ISIS-1276: fixes compile issues in metamodel and runtime
---
...ionParameterAbstractTest_getId_and_getName.java | 8 ++++---
.../DataNucleusApplicationComponents.java | 2 +-
.../persistence/PersistenceSessionFactory.java | 2 +-
.../CreateSchemaObjectFromClassMetadata.java | 3 ++-
.../service/support/IsisJdoSupportImpl.java | 27 +++++++++-------------
5 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
index 1f3fcc3..3e1eb76 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.specloader.specimpl;
+import javax.ws.rs.HEAD;
+
import com.google.common.base.Predicate;
import com.google.common.collect.Lists;
@@ -164,7 +166,7 @@ public class ObjectActionParameterAbstractTest_getId_and_getName {
one(actionParamPeer).getFacet(NamedFacet.class);
will(returnValue(null));
- one(parentAction).getParameters((Predicate<ObjectActionParameter>) with(Expectations.<Predicate>anything()));
+ one(parentAction).getParameters(with(Expectations.<Predicate<ObjectActionParameter>>anything()));
will(returnValue(Lists.newArrayList(objectActionParameter)));
}
});
@@ -183,7 +185,7 @@ public class ObjectActionParameterAbstractTest_getId_and_getName {
one(actionParamPeer).getFacet(NamedFacet.class);
will(returnValue(null));
- one(parentAction).getParameters(with(Expectations.<Predicate>anything()));
+ one(parentAction).getParameters(with(Expectations.<Predicate<ObjectActionParameter>>anything()));
will(returnValue(Lists.newArrayList(stubObjectActionParameterString, objectActionParameter, stubObjectActionParameterString2)));
}
});
@@ -202,7 +204,7 @@ public class ObjectActionParameterAbstractTest_getId_and_getName {
one(actionParamPeer).getFacet(NamedFacet.class);
will(returnValue(null));
- one(parentAction).getParameters(with(Expectations.<Predicate>anything()));
+ one(parentAction).getParameters(with(Expectations.<Predicate<ObjectActionParameter>>anything()));
will(returnValue(Lists.newArrayList(stubObjectActionParameterString, objectActionParameter, stubObjectActionParameterString2)));
}
});
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
index 4e8d9fa..0108c88 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
@@ -160,7 +160,7 @@ public class DataNucleusApplicationComponents implements ApplicationScopedCompon
// (if the configured StoreMgr supports it, and if requested in isis.properties)
//
datanucleusProps.put(PropertyNames.PROPERTY_SCHEMA_AUTOCREATE_ALL, "false"); // turn off, cos want to do the schema object ourselves...
- datanucleusProps.put(PropertyNames.PROPERTY_SCHEMA_AUTOCREATE_SCHEMA, "false");
+ datanucleusProps.put(PropertyNames.PROPERTY_SCHEMA_AUTOCREATE_DATABASE, "false");
datanucleusProps.put(PropertyNames.PROPERTY_SCHEMA_AUTOCREATE_TABLES, "true"); // but have DN do everything else...
datanucleusProps.put(PropertyNames.PROPERTY_SCHEMA_AUTOCREATE_COLUMNS, "true");
datanucleusProps.put(PropertyNames.PROPERTY_SCHEMA_AUTOCREATE_CONSTRAINTS, "true");
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
index ad72168..146f16a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
@@ -106,7 +106,7 @@ public class PersistenceSessionFactory implements ApplicationScopedComponent, Fi
putIfNotPresent(props, "javax.jdo.PersistenceManagerFactoryClass", JDOPersistenceManagerFactory.class.getName());
// previously we defaulted this property to "true", but that could cause the target database to be modified
- putIfNotPresent(props, PropertyNames.PROPERTY_SCHEMA_AUTOCREATE_SCHEMA, Boolean.FALSE.toString());
+ putIfNotPresent(props, PropertyNames.PROPERTY_SCHEMA_AUTOCREATE_DATABASE, Boolean.FALSE.toString());
putIfNotPresent(props, PropertyNames.PROPERTY_SCHEMA_VALIDATE_ALL, Boolean.TRUE.toString());
putIfNotPresent(props, PropertyNames.PROPERTY_CACHE_L2_TYPE, "none");
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java
index 465f19b..1191a46 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java
@@ -31,10 +31,11 @@ import org.datanucleus.ClassLoaderResolver;
import org.datanucleus.enhancer.EnhancementNucleusContextImpl;
import org.datanucleus.metadata.AbstractClassMetaData;
import org.datanucleus.metadata.MetaDataListener;
-import org.datanucleus.store.encryption.ConnectionEncryptionProvider;
+import org.datanucleus.store.ConnectionEncryptionProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
/**
* Implementation note: the methods in this class are <tt>protected</tt> to allow for easy subclassing.
*/
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
index a9a2ac5..e5171c9 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
@@ -29,16 +29,14 @@ import java.util.Map;
import java.util.concurrent.Callable;
import javax.jdo.Extent;
+import javax.jdo.JDOQLTypedQuery;
import javax.jdo.PersistenceManager;
import javax.jdo.datastore.JDOConnection;
+import javax.jdo.query.BooleanExpression;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.datanucleus.api.jdo.JDOPersistenceManager;
-import org.datanucleus.query.typesafe.BooleanExpression;
-import org.datanucleus.query.typesafe.TypesafeQuery;
-
import org.apache.isis.applib.FatalException;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
@@ -158,12 +156,9 @@ public class IsisJdoSupportImpl implements IsisJdoSupport {
// temporarily disable concurrency checking while this method is performed
try {
- ConcurrencyChecking.executeWithConcurrencyCheckingDisabled(new Callable<Void>() {
- @Override
- public Void call() {
- getJdoPersistenceManager().deletePersistentAll(instances);
- return null;
- }
+ ConcurrencyChecking.executeWithConcurrencyCheckingDisabled((Callable<Void>) () -> {
+ getJdoPersistenceManager().deletePersistentAll(instances);
+ return null;
});
} catch (final Exception ex) {
throw new FatalException(ex);
@@ -176,31 +171,31 @@ public class IsisJdoSupportImpl implements IsisJdoSupport {
@Programmatic
@Override
public <T> List<T> executeQuery(final Class<T> cls, final BooleanExpression expression) {
- final TypesafeQuery<T> query = newTypesafeQuery(cls).filter(expression);
+ final JDOQLTypedQuery<T> query = newTypesafeQuery(cls).filter(expression);
return executeListAndClose(query);
}
@Programmatic
@Override
public <T> T executeQueryUnique(final Class<T> cls, final BooleanExpression expression) {
- final TypesafeQuery<T> query = newTypesafeQuery(cls).filter(expression);
+ final JDOQLTypedQuery<T> query = newTypesafeQuery(cls).filter(expression);
return executeUniqueAndClose(query);
}
@Programmatic
@Override
- public <T> TypesafeQuery<T> newTypesafeQuery(Class<T> cls) {
- return ((JDOPersistenceManager)getJdoPersistenceManager()).newTypesafeQuery(cls);
+ public <T> JDOQLTypedQuery<T> newTypesafeQuery(Class<T> cls) {
+ return getJdoPersistenceManager().newJDOQLTypedQuery(cls);
}
- private static <T> List<T> executeListAndClose(final TypesafeQuery<T> query) {
+ private static <T> List<T> executeListAndClose(final JDOQLTypedQuery<T> query) {
final List<T> elements = query.executeList();
final List<T> list = Lists.newArrayList(elements);
query.closeAll();
return list;
}
- private static <T> T executeUniqueAndClose(final TypesafeQuery<T> query) {
+ private static <T> T executeUniqueAndClose(final JDOQLTypedQuery<T> query) {
final T result = query.executeUnique();
query.closeAll();
return result;
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.
[isis] 09/09: ISIS-1744: helloworld/simpleapp: update to org.incode
build-4
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch dev/2.0.0-M2-cherrypicked
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 92cf8e36f0ba64bc8c3ddc09c3590e11800d87ab
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 5 14:46:25 2018 +0000
ISIS-1744: helloworld/simpleapp: update to org.incode build-4
---
example/application/helloworld/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index 87408e8..778632a 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.incode</groupId>
<artifactId>incode-build</artifactId>
- <version>3-SNAPSHOT</version>
+ <version>4</version>
</parent>
<groupId>org.apache.isis.example.application</groupId>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index ff851e2..b38ee1b 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.incode</groupId>
<artifactId>incode-build</artifactId>
- <version>3-SNAPSHOT</version>
+ <version>4</version>
</parent>
<groupId>org.apache.isis.example.application</groupId>
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.
[isis] 06/09: ISIS-1728: uses typesafe queries for helloworld
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch dev/2.0.0-M2-cherrypicked
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ac3d02b15a50ec1446484a7062e102d5c5383aad
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Sep 19 23:02:07 2017 +0100
ISIS-1728: uses typesafe queries for helloworld
Conflicts:
core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
---
.../systemusinginstallers/IsisComponentProvider.java | 13 +++++++++++++
.../src/main/java/domainapp/dom/impl/HelloWorldObject.java | 4 +++-
.../src/main/java/domainapp/dom/impl/HelloWorldObjects.java | 9 +++++----
.../domainapp/modules/simple/dom/impl/SimpleObjects.java | 7 +++----
4 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
index 9b2936a..e8b2dc0 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
@@ -25,6 +25,19 @@ import java.util.Map;
import java.util.Set;
import javax.annotation.Nullable;
+<<<<<<< dev/2.0.0-M2-cherrypicked
+=======
+import javax.jdo.annotations.PersistenceCapable;
+
+import com.google.common.base.Function;
+import com.google.common.base.Joiner;
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
+import org.reflections.Reflections;
+>>>>>>> e20eec9 ISIS-1728: uses typesafe queries for helloworld
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.annotation.DomainObject;
diff --git a/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java b/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java
index 54a1a35..502b756 100644
--- a/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java
+++ b/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java
@@ -43,7 +43,6 @@ import org.apache.isis.applib.services.title.TitleService;
@javax.jdo.annotations.PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "helloworld" )
@javax.jdo.annotations.DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@javax.jdo.annotations.Version(strategy= VersionStrategy.DATE_TIME, column ="version")
-@javax.jdo.annotations.Unique(name="HelloWorldObject_name_UNQ", members = {"name"})
@DomainObject(auditing = Auditing.ENABLED)
@DomainObjectLayout() // causes UI events to be triggered
public class HelloWorldObject implements Comparable<HelloWorldObject> {
@@ -52,6 +51,8 @@ public class HelloWorldObject implements Comparable<HelloWorldObject> {
this.name = name;
}
+
+ @javax.jdo.annotations.Unique
@javax.jdo.annotations.Column(allowsNull = "false", length = 40)
@Property(editing = Editing.DISABLED)
@Title(prepend = "Object: ")
@@ -59,6 +60,7 @@ public class HelloWorldObject implements Comparable<HelloWorldObject> {
public String getName() { return name; }
public void setName(final String name) { this.name = name; }
+
@javax.jdo.annotations.Column(allowsNull = "true", length = 4000)
@Property(editing = Editing.ENABLED)
private String notes;
diff --git a/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java b/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
index 92bd565..2c776f5 100644
--- a/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
+++ b/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
@@ -20,7 +20,7 @@ package domainapp.dom.impl;
import java.util.List;
-import org.datanucleus.query.typesafe.TypesafeQuery;
+import javax.jdo.JDOQLTypedQuery;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.DomainService;
@@ -31,9 +31,9 @@ import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
-import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.repository.RepositoryService;
+
@DomainService(
nature = NatureOfService.VIEW_MENU_ONLY,
objectType = "helloworld.HelloWorldObjects"
@@ -52,7 +52,7 @@ public class HelloWorldObjects {
@Action(semantics = SemanticsOf.SAFE)
@MemberOrder(sequence = "2")
public List<HelloWorldObject> findByName(final String name) {
- TypesafeQuery<HelloWorldObject> q = isisJdoSupport.newTypesafeQuery(HelloWorldObject.class);
+ JDOQLTypedQuery<HelloWorldObject> q = isisJdoSupport.newTypesafeQuery(HelloWorldObject.class);
final QHelloWorldObject cand = QHelloWorldObject.candidate();
q = q.filter(
cand.name.indexOf(q.stringParameter("name")).ne(-1)
@@ -64,7 +64,8 @@ public class HelloWorldObjects {
@Action(semantics = SemanticsOf.SAFE, restrictTo = RestrictTo.PROTOTYPING)
@MemberOrder(sequence = "3")
public List<HelloWorldObject> listAll() {
- return repositoryService.allInstances(HelloWorldObject.class);
+ return isisJdoSupport.newTypesafeQuery(HelloWorldObject.class)
+ .executeList();
}
@javax.inject.Inject
diff --git a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
index 335f9d0..d77fe47 100644
--- a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
+++ b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
@@ -20,7 +20,7 @@ package domainapp.modules.simple.dom.impl;
import java.util.List;
-import org.datanucleus.query.typesafe.TypesafeQuery;
+import javax.jdo.JDOQLTypedQuery;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
@@ -35,7 +35,6 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.applib.services.xactn.TransactionService;
@DomainService(
nature = NatureOfService.VIEW_MENU_ONLY,
@@ -63,7 +62,7 @@ public class SimpleObjects {
@ParameterLayout(named="Name")
final String name
) {
- TypesafeQuery<SimpleObject> q = isisJdoSupport.newTypesafeQuery(SimpleObject.class);
+ JDOQLTypedQuery<SimpleObject> q = isisJdoSupport.newTypesafeQuery(SimpleObject.class);
final QSimpleObject cand = QSimpleObject.candidate();
q = q.filter(
cand.name.indexOf(q.stringParameter("name")).ne(-1)
@@ -74,7 +73,7 @@ public class SimpleObjects {
@Programmatic
public SimpleObject findByNameExact(final String name) {
- TypesafeQuery<SimpleObject> q = isisJdoSupport.newTypesafeQuery(SimpleObject.class);
+ JDOQLTypedQuery<SimpleObject> q = isisJdoSupport.newTypesafeQuery(SimpleObject.class);
final QSimpleObject cand = QSimpleObject.candidate();
q = q.filter(
cand.name.eq(q.stringParameter("name"))
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.