You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/06/20 09:21:06 UTC
[1/2] syncope git commit: Removing unwanted transitive dependency
Repository: syncope
Updated Branches:
refs/heads/master 649ba7743 -> 21cbd7054
Removing unwanted transitive dependency
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/75004d97
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/75004d97
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/75004d97
Branch: refs/heads/master
Commit: 75004d97a809915ca2c864adf9f652fe9f0f9729
Parents: 649ba77
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Mon Jun 20 10:55:44 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Mon Jun 20 10:55:44 2016 +0200
----------------------------------------------------------------------
pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/75004d97/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c47c186..6c124e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -987,6 +987,10 @@ under the License.
<groupId>org.webjars</groupId>
<artifactId>Eonasdan-bootstrap-datetimepicker</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.webjars</groupId>
+ <artifactId>momentjs</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
[2/2] syncope git commit: White noise, ignore
Posted by il...@apache.org.
White noise, ignore
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/21cbd705
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/21cbd705
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/21cbd705
Branch: refs/heads/master
Commit: 21cbd70546b43d9b3dc07d9d1f40ed08099d33f1
Parents: 75004d9
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Mon Jun 20 11:17:36 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Mon Jun 20 11:17:36 2016 +0200
----------------------------------------------------------------------
.../org/apache/syncope/common/lib/search/SearchableFields.java | 2 +-
.../main/java/org/apache/syncope/common/lib/types/AnyTypeKind.java | 2 +-
.../core/persistence/jpa/entity/resource/AbstractAnyTemplate.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/21cbd705/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java b/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java
index 0912cf9..9f67cee 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java
@@ -52,7 +52,7 @@ public final class SearchableFields {
}
public static List<String> get(final AnyTypeKind anyTypeKind) {
- return get(anyTypeKind.getToClass());
+ return get(anyTypeKind.getTOClass());
}
public static List<String> get(final Class<? extends AnyTO> anyRef) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/21cbd705/common/lib/src/main/java/org/apache/syncope/common/lib/types/AnyTypeKind.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/AnyTypeKind.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/AnyTypeKind.java
index 136d798..12fbf59 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/AnyTypeKind.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/AnyTypeKind.java
@@ -37,7 +37,7 @@ public enum AnyTypeKind {
this.toClass = toClass;
}
- public Class<? extends AnyTO> getToClass() {
+ public Class<? extends AnyTO> getTOClass() {
return toClass;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/21cbd705/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/AbstractAnyTemplate.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/AbstractAnyTemplate.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/AbstractAnyTemplate.java
index 591e9f3..2af788b 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/AbstractAnyTemplate.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/AbstractAnyTemplate.java
@@ -59,7 +59,7 @@ public abstract class AbstractAnyTemplate extends AbstractGeneratedKeyEntity imp
: new JPAAnyUtilsFactory().getInstance(anyType.getKind()).newAnyTO()
: anyType == null
? null
- : POJOHelper.deserialize(template, anyType.getKind().getToClass());
+ : POJOHelper.deserialize(template, anyType.getKind().getTOClass());
}
@Override