You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by an...@apache.org on 2019/06/27 02:13:40 UTC
[sling-whiteboard] branch feature/sling-cpconverter-maven-plugin
updated (21be47c -> 13aa43b)
This is an automated email from the ASF dual-hosted git repository.
andysch pushed a change to branch feature/sling-cpconverter-maven-plugin
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git.
from 21be47c SLING-8490 - Added a target mode allowing a POM to convert packages added as dependencies
add c35d1d0 @releng updated parent to latest sling-bundle-parent
add 64f179e @releng updated parent to latest sling-bundle-parent
add 187298f Renaming to Sling Model Persist, fixed test error with JDK 11 (PostConstruct wasn't imported, needed to add module dependency on javax annotations)
add 729442a Updated artifact id to org.apache.sling.models.persist
add 08d7450 Corrected license headers
add 1725026 Implement recommendations from Dan Klco; and renamed to Sling Model Persistor so the name is a more correct noun pattern
add 0c10119 Merge pull request #40 from badvision/master
new 13aa43b Merge branch 'master' into feature/sling-cpconverter-maven-plugin
The 1 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:
.../models/persist/annotations/ChildType.java | 31 -
.../persist/annotations/DirectDescendants.java | 38 --
.../sling/models/persist/annotations/Ignore.java | 37 --
.../models/persist/annotations/ResourceType.java | 31 -
.../models/persist/impl/util/AssertUtils.java | 50 --
.../persist/bean/BeanWithAnnotatedPathField.java | 26 -
.../persist/bean/BeanWithAnnotatedPathGetter.java | 30 -
.../models/persist/bean/BeanWithPathField.java | 23 -
.../models/persist/bean/BeanWithPathGetter.java | 21 -
{SlingJCRPersist => SlingModelPersist}/pom.xml | 359 +++++------
.../src/main/assembly/felix.xml | 0
.../injectors/MapOfChildResourcesInjector.java | 244 ++++----
.../sling/models/persistor/ModelPersistor.java | 60 +-
.../models/persistor/annotations/ChildType.java | 53 +-
.../persistor/annotations/DirectDescendants.java | 21 +-
.../sling/models/persistor/annotations/Ignore.java | 20 +-
.../models/persistor/annotations/ResourceType.java | 53 +-
.../models/persistor/impl/ModelPersistorImpl.java | 593 +++++++++---------
.../models/persistor}/impl/ResourceTypeKey.java | 130 ++--
.../persistor}/impl/util/ReflectionUtils.java | 606 +++++++++----------
.../injectors/BeanWithDirectMappedChildren.java | 108 ++--
.../models/injectors/BeanWithMappedChildren.java | 104 ++--
.../injectors/MapOfChildResourcesInjectorTest.java | 206 ++++---
.../sling/models/persist/ModelPersistTest.java | 668 +++++++++++----------
.../persist/bean/BeanWithAnnotatedPathField.java | 27 +-
.../persist/bean/BeanWithAnnotatedPathGetter.java | 31 +-
.../models/persist/bean/BeanWithMappedNames.java | 312 +++++-----
.../models/persist/bean/BeanWithPathField.java | 28 +-
.../models/persist/bean/BeanWithPathGetter.java | 23 +-
.../sling/models/persist/bean/ComplexBean.java | 181 +++---
.../sling/models/persist/bean/MappedChildren.java | 101 ++--
.../models/persist/impl/ResourceTypeKeyTest.java | 118 ++--
feature-diff/pom.xml | 25 +-
runtime2feature/pom.xml | 25 +-
34 files changed, 2135 insertions(+), 2248 deletions(-)
delete mode 100755 SlingJCRPersist/src/main/java/org/apache/sling/models/persist/annotations/ChildType.java
delete mode 100755 SlingJCRPersist/src/main/java/org/apache/sling/models/persist/annotations/DirectDescendants.java
delete mode 100755 SlingJCRPersist/src/main/java/org/apache/sling/models/persist/annotations/Ignore.java
delete mode 100755 SlingJCRPersist/src/main/java/org/apache/sling/models/persist/annotations/ResourceType.java
delete mode 100755 SlingJCRPersist/src/main/java/org/apache/sling/models/persist/impl/util/AssertUtils.java
delete mode 100755 SlingJCRPersist/src/test/java/org/apache/sling/models/persist/bean/BeanWithAnnotatedPathField.java
delete mode 100755 SlingJCRPersist/src/test/java/org/apache/sling/models/persist/bean/BeanWithAnnotatedPathGetter.java
delete mode 100755 SlingJCRPersist/src/test/java/org/apache/sling/models/persist/bean/BeanWithPathField.java
delete mode 100755 SlingJCRPersist/src/test/java/org/apache/sling/models/persist/bean/BeanWithPathGetter.java
rename {SlingJCRPersist => SlingModelPersist}/pom.xml (93%)
mode change 100755 => 100644
rename {SlingJCRPersist => SlingModelPersist}/src/main/assembly/felix.xml (100%)
mode change 100755 => 100644
rename {SlingJCRPersist => SlingModelPersist}/src/main/java/org/apache/sling/models/injectors/MapOfChildResourcesInjector.java (85%)
mode change 100755 => 100644
rename SlingJCRPersist/src/main/java/org/apache/sling/models/persist/JcrPersist.java => SlingModelPersist/src/main/java/org/apache/sling/models/persistor/ModelPersistor.java (52%)
mode change 100755 => 100644
copy mvresourceprovider/src/main/java/org/apache/sling/mvresource/impl/MvSession.java => SlingModelPersist/src/main/java/org/apache/sling/models/persistor/annotations/ChildType.java (68%)
copy featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/Features.java => SlingModelPersist/src/main/java/org/apache/sling/models/persistor/annotations/DirectDescendants.java (61%)
copy featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/Features.java => SlingModelPersist/src/main/java/org/apache/sling/models/persistor/annotations/Ignore.java (63%)
copy mvresourceprovider/src/main/java/org/apache/sling/mvresource/impl/MvSession.java => SlingModelPersist/src/main/java/org/apache/sling/models/persistor/annotations/ResourceType.java (67%)
rename SlingJCRPersist/src/main/java/org/apache/sling/models/persist/impl/JcrPersistImpl.java => SlingModelPersist/src/main/java/org/apache/sling/models/persistor/impl/ModelPersistorImpl.java (75%)
mode change 100755 => 100644
rename {SlingJCRPersist/src/main/java/org/apache/sling/models/persist => SlingModelPersist/src/main/java/org/apache/sling/models/persistor}/impl/ResourceTypeKey.java (61%)
mode change 100755 => 100644
rename {SlingJCRPersist/src/main/java/org/apache/sling/models/persist => SlingModelPersist/src/main/java/org/apache/sling/models/persistor}/impl/util/ReflectionUtils.java (89%)
mode change 100755 => 100644
rename {SlingJCRPersist => SlingModelPersist}/src/test/java/org/apache/sling/models/injectors/BeanWithDirectMappedChildren.java (54%)
mode change 100755 => 100644
rename {SlingJCRPersist => SlingModelPersist}/src/test/java/org/apache/sling/models/injectors/BeanWithMappedChildren.java (56%)
mode change 100755 => 100644
rename {SlingJCRPersist => SlingModelPersist}/src/test/java/org/apache/sling/models/injectors/MapOfChildResourcesInjectorTest.java (76%)
mode change 100755 => 100644
rename SlingJCRPersist/src/test/java/org/apache/sling/models/persist/JcrWriterTest.java => SlingModelPersist/src/test/java/org/apache/sling/models/persist/ModelPersistTest.java (93%)
mode change 100755 => 100644
copy maven-central-source-reporter/src/main/java/org/apache/sling/tooling/msra/impl/Main.java => SlingModelPersist/src/test/java/org/apache/sling/models/persist/bean/BeanWithAnnotatedPathField.java (62%)
copy maven-central-source-reporter/src/main/java/org/apache/sling/tooling/msra/impl/Main.java => SlingModelPersist/src/test/java/org/apache/sling/models/persist/bean/BeanWithAnnotatedPathGetter.java (59%)
rename {SlingJCRPersist => SlingModelPersist}/src/test/java/org/apache/sling/models/persist/bean/BeanWithMappedNames.java (78%)
mode change 100755 => 100644
copy maven-central-source-reporter/src/main/java/org/apache/sling/tooling/msra/impl/Main.java => SlingModelPersist/src/test/java/org/apache/sling/models/persist/bean/BeanWithPathField.java (59%)
copy maven-central-source-reporter/src/main/java/org/apache/sling/tooling/msra/impl/Main.java => SlingModelPersist/src/test/java/org/apache/sling/models/persist/bean/BeanWithPathGetter.java (65%)
rename {SlingJCRPersist => SlingModelPersist}/src/test/java/org/apache/sling/models/persist/bean/ComplexBean.java (68%)
mode change 100755 => 100644
rename {SlingJCRPersist => SlingModelPersist}/src/test/java/org/apache/sling/models/persist/bean/MappedChildren.java (57%)
mode change 100755 => 100644
rename {SlingJCRPersist => SlingModelPersist}/src/test/java/org/apache/sling/models/persist/impl/ResourceTypeKeyTest.java (62%)
mode change 100755 => 100644
[sling-whiteboard] 01/01: Merge branch 'master' into
feature/sling-cpconverter-maven-plugin
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andysch pushed a commit to branch feature/sling-cpconverter-maven-plugin
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit 13aa43b3ff688528f0754c7e9cc633e3efc2f8fc
Merge: 21be47c 0c10119
Author: Andreas Schaefer <sc...@iMac.local>
AuthorDate: Wed Jun 26 19:12:06 2019 -0700
Merge branch 'master' into feature/sling-cpconverter-maven-plugin
.../models/persist/annotations/ChildType.java | 31 -
.../persist/annotations/DirectDescendants.java | 38 --
.../sling/models/persist/annotations/Ignore.java | 37 --
.../models/persist/annotations/ResourceType.java | 31 -
.../models/persist/impl/util/AssertUtils.java | 50 --
.../persist/bean/BeanWithAnnotatedPathField.java | 26 -
.../persist/bean/BeanWithAnnotatedPathGetter.java | 30 -
.../models/persist/bean/BeanWithPathField.java | 23 -
.../models/persist/bean/BeanWithPathGetter.java | 21 -
{SlingJCRPersist => SlingModelPersist}/pom.xml | 359 +++++------
.../src/main/assembly/felix.xml | 0
.../injectors/MapOfChildResourcesInjector.java | 244 ++++----
.../sling/models/persistor/ModelPersistor.java | 60 +-
.../models/persistor/annotations/ChildType.java | 30 +
.../persistor/annotations/DirectDescendants.java | 36 ++
.../sling/models/persistor/annotations/Ignore.java | 35 ++
.../models/persistor/annotations/ResourceType.java | 30 +
.../models/persistor/impl/ModelPersistorImpl.java | 593 +++++++++---------
.../models/persistor}/impl/ResourceTypeKey.java | 130 ++--
.../persistor}/impl/util/ReflectionUtils.java | 606 +++++++++----------
.../injectors/BeanWithDirectMappedChildren.java | 108 ++--
.../models/injectors/BeanWithMappedChildren.java | 104 ++--
.../injectors/MapOfChildResourcesInjectorTest.java | 206 ++++---
.../sling/models/persist/ModelPersistTest.java | 668 +++++++++++----------
.../persist/bean/BeanWithAnnotatedPathField.java | 38 ++
.../persist/bean/BeanWithAnnotatedPathGetter.java | 42 ++
.../models/persist/bean/BeanWithMappedNames.java | 312 +++++-----
.../models/persist/bean/BeanWithPathField.java | 35 ++
.../models/persist/bean/BeanWithPathGetter.java | 34 ++
.../sling/models/persist/bean/ComplexBean.java | 181 +++---
.../sling/models/persist/bean/MappedChildren.java | 101 ++--
.../models/persist/impl/ResourceTypeKeyTest.java | 118 ++--
feature-diff/pom.xml | 25 +-
runtime2feature/pom.xml | 25 +-
34 files changed, 2263 insertions(+), 2144 deletions(-)