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 2017/05/08 15:45:24 UTC
[1/2] syncope git commit: Fixing joda-time dep
Repository: syncope
Updated Branches:
refs/heads/2_0_X 8f33e423f -> 214eca8b0
refs/heads/master 2c59f9815 -> 704b3adb9
Fixing joda-time dep
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/214eca8b
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/214eca8b
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/214eca8b
Branch: refs/heads/2_0_X
Commit: 214eca8b005c5548a29121bdfabbb21ce0223279
Parents: 8f33e42
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon May 8 17:45:06 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon May 8 17:45:06 2017 +0200
----------------------------------------------------------------------
.../client/console/commons/ITabComponent.java | 2 +-
.../apache/syncope/client/console/panels/Realm.java | 16 ++++++++--------
client/lib/pom.xml | 7 ++++++-
ext/elasticsearch/client-elasticsearch/pom.xml | 2 +-
ext/swagger-ui/pom.xml | 5 +++++
5 files changed, 21 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/214eca8b/client/console/src/main/java/org/apache/syncope/client/console/commons/ITabComponent.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/ITabComponent.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/ITabComponent.java
index 8d9ec0f..a49c917 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/ITabComponent.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/ITabComponent.java
@@ -42,7 +42,7 @@ public abstract class ITabComponent extends Component implements ITab {
* @param title IModel used to represent the title of the tab. Must contain a string
* @param roles authorized roles
*/
- public ITabComponent(final IModel<String> title, final String[] roles) {
+ public ITabComponent(final IModel<String> title, final String... roles) {
super(UUID.randomUUID().toString());
this.title = title;
http://git-wip-us.apache.org/repos/asf/syncope/blob/214eca8b/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
index 722eed9..3c78300 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
@@ -85,8 +85,8 @@ public abstract class Realm extends WizardMgtPanel<RealmTO> {
setPageRef(pageRef);
- AjaxBootstrapTabbedPanel<ITab> tabbedPanel
- = new AjaxBootstrapTabbedPanel<>("tabbedPanel", buildTabList(pageRef));
+ AjaxBootstrapTabbedPanel<ITab> tabbedPanel =
+ new AjaxBootstrapTabbedPanel<>("tabbedPanel", buildTabList(pageRef));
tabbedPanel.setSelectedTab(selectedIndex);
addInnerObject(tabbedPanel);
this.wizardBuilder = new RealmWizardBuilder(pageRef);
@@ -105,8 +105,8 @@ public abstract class Realm extends WizardMgtPanel<RealmTO> {
private List<ITab> buildTabList(final PageReference pageRef) {
List<ITab> tabs = new ArrayList<>();
- tabs.add(new ITabComponent(new Model<>("DETAILS"), new String[] {
- StandardEntitlement.REALM_CREATE, StandardEntitlement.REALM_UPDATE, StandardEntitlement.REALM_DELETE }) {
+ tabs.add(new ITabComponent(new Model<>("DETAILS"),
+ StandardEntitlement.REALM_CREATE, StandardEntitlement.REALM_UPDATE, StandardEntitlement.REALM_DELETE) {
private static final long serialVersionUID = -5861786415855103549L;
@@ -167,15 +167,15 @@ public abstract class Realm extends WizardMgtPanel<RealmTO> {
}
});
- final Triple<UserFormLayoutInfo, GroupFormLayoutInfo, Map<String, AnyObjectFormLayoutInfo>> formLayoutInfo
- = FormLayoutInfoUtils.fetch(anyTypeTOs);
+ final Triple<UserFormLayoutInfo, GroupFormLayoutInfo, Map<String, AnyObjectFormLayoutInfo>> formLayoutInfo =
+ FormLayoutInfoUtils.fetch(anyTypeTOs);
Collections.sort(anyTypeTOs, new AnyTypeComparator());
for (final AnyTypeTO anyTypeTO : anyTypeTOs) {
tabs.add(new ITabComponent(
new Model<>(anyTypeTO.getKey()),
AnyTypeKind.GROUP.name().equals(anyTypeTO.getKey())
- ? null : new String[]{String.format("%s_SEARCH", anyTypeTO.getKey())}) {
+ ? null : String.format("%s_SEARCH", anyTypeTO.getKey())) {
private static final long serialVersionUID = 1169585538404171118L;
@@ -228,7 +228,7 @@ public abstract class Realm extends WizardMgtPanel<RealmTO> {
|| CollectionUtils.isEmpty(afterObj.getAttrMap().get(ConnIdSpecialName.NAME).getValues())
? StringUtils.EMPTY
: afterObj.getAttrMap().get(ConnIdSpecialName.NAME).getValues().
- iterator().next();
+ iterator().next();
return new Label("field", remoteId);
} else if ("status".equalsIgnoreCase(key)) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/214eca8b/client/lib/pom.xml
----------------------------------------------------------------------
diff --git a/client/lib/pom.xml b/client/lib/pom.xml
index 0256774..0e3cb1d 100644
--- a/client/lib/pom.xml
+++ b/client/lib/pom.xml
@@ -56,7 +56,12 @@ under the License.
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
-
+
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
http://git-wip-us.apache.org/repos/asf/syncope/blob/214eca8b/ext/elasticsearch/client-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/ext/elasticsearch/client-elasticsearch/pom.xml b/ext/elasticsearch/client-elasticsearch/pom.xml
index 09a9750..1419052 100644
--- a/ext/elasticsearch/client-elasticsearch/pom.xml
+++ b/ext/elasticsearch/client-elasticsearch/pom.xml
@@ -61,7 +61,7 @@ under the License.
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
</dependency>
-
+
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
http://git-wip-us.apache.org/repos/asf/syncope/blob/214eca8b/ext/swagger-ui/pom.xml
----------------------------------------------------------------------
diff --git a/ext/swagger-ui/pom.xml b/ext/swagger-ui/pom.xml
index 807fe87..426d29e 100644
--- a/ext/swagger-ui/pom.xml
+++ b/ext/swagger-ui/pom.xml
@@ -54,6 +54,11 @@ under the License.
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ </dependency>
</dependencies>
<build>
[2/2] syncope git commit: Fixing joda-time dep
Posted by il...@apache.org.
Fixing joda-time dep
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/704b3adb
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/704b3adb
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/704b3adb
Branch: refs/heads/master
Commit: 704b3adb99318a76352f32bec8ba78e36f73afb8
Parents: 2c59f98
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon May 8 17:45:06 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon May 8 17:45:15 2017 +0200
----------------------------------------------------------------------
.../client/console/commons/ITabComponent.java | 2 +-
.../apache/syncope/client/console/panels/Realm.java | 16 ++++++++--------
client/lib/pom.xml | 7 ++++++-
ext/elasticsearch/client-elasticsearch/pom.xml | 2 +-
ext/swagger-ui/pom.xml | 5 +++++
5 files changed, 21 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/704b3adb/client/console/src/main/java/org/apache/syncope/client/console/commons/ITabComponent.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/ITabComponent.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/ITabComponent.java
index 8d9ec0f..a49c917 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/ITabComponent.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/ITabComponent.java
@@ -42,7 +42,7 @@ public abstract class ITabComponent extends Component implements ITab {
* @param title IModel used to represent the title of the tab. Must contain a string
* @param roles authorized roles
*/
- public ITabComponent(final IModel<String> title, final String[] roles) {
+ public ITabComponent(final IModel<String> title, final String... roles) {
super(UUID.randomUUID().toString());
this.title = title;
http://git-wip-us.apache.org/repos/asf/syncope/blob/704b3adb/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
index 722eed9..3c78300 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java
@@ -85,8 +85,8 @@ public abstract class Realm extends WizardMgtPanel<RealmTO> {
setPageRef(pageRef);
- AjaxBootstrapTabbedPanel<ITab> tabbedPanel
- = new AjaxBootstrapTabbedPanel<>("tabbedPanel", buildTabList(pageRef));
+ AjaxBootstrapTabbedPanel<ITab> tabbedPanel =
+ new AjaxBootstrapTabbedPanel<>("tabbedPanel", buildTabList(pageRef));
tabbedPanel.setSelectedTab(selectedIndex);
addInnerObject(tabbedPanel);
this.wizardBuilder = new RealmWizardBuilder(pageRef);
@@ -105,8 +105,8 @@ public abstract class Realm extends WizardMgtPanel<RealmTO> {
private List<ITab> buildTabList(final PageReference pageRef) {
List<ITab> tabs = new ArrayList<>();
- tabs.add(new ITabComponent(new Model<>("DETAILS"), new String[] {
- StandardEntitlement.REALM_CREATE, StandardEntitlement.REALM_UPDATE, StandardEntitlement.REALM_DELETE }) {
+ tabs.add(new ITabComponent(new Model<>("DETAILS"),
+ StandardEntitlement.REALM_CREATE, StandardEntitlement.REALM_UPDATE, StandardEntitlement.REALM_DELETE) {
private static final long serialVersionUID = -5861786415855103549L;
@@ -167,15 +167,15 @@ public abstract class Realm extends WizardMgtPanel<RealmTO> {
}
});
- final Triple<UserFormLayoutInfo, GroupFormLayoutInfo, Map<String, AnyObjectFormLayoutInfo>> formLayoutInfo
- = FormLayoutInfoUtils.fetch(anyTypeTOs);
+ final Triple<UserFormLayoutInfo, GroupFormLayoutInfo, Map<String, AnyObjectFormLayoutInfo>> formLayoutInfo =
+ FormLayoutInfoUtils.fetch(anyTypeTOs);
Collections.sort(anyTypeTOs, new AnyTypeComparator());
for (final AnyTypeTO anyTypeTO : anyTypeTOs) {
tabs.add(new ITabComponent(
new Model<>(anyTypeTO.getKey()),
AnyTypeKind.GROUP.name().equals(anyTypeTO.getKey())
- ? null : new String[]{String.format("%s_SEARCH", anyTypeTO.getKey())}) {
+ ? null : String.format("%s_SEARCH", anyTypeTO.getKey())) {
private static final long serialVersionUID = 1169585538404171118L;
@@ -228,7 +228,7 @@ public abstract class Realm extends WizardMgtPanel<RealmTO> {
|| CollectionUtils.isEmpty(afterObj.getAttrMap().get(ConnIdSpecialName.NAME).getValues())
? StringUtils.EMPTY
: afterObj.getAttrMap().get(ConnIdSpecialName.NAME).getValues().
- iterator().next();
+ iterator().next();
return new Label("field", remoteId);
} else if ("status".equalsIgnoreCase(key)) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/704b3adb/client/lib/pom.xml
----------------------------------------------------------------------
diff --git a/client/lib/pom.xml b/client/lib/pom.xml
index 1499665..f682e45 100644
--- a/client/lib/pom.xml
+++ b/client/lib/pom.xml
@@ -65,7 +65,12 @@ under the License.
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
-
+
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
http://git-wip-us.apache.org/repos/asf/syncope/blob/704b3adb/ext/elasticsearch/client-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/ext/elasticsearch/client-elasticsearch/pom.xml b/ext/elasticsearch/client-elasticsearch/pom.xml
index 08e1314..91a7947 100644
--- a/ext/elasticsearch/client-elasticsearch/pom.xml
+++ b/ext/elasticsearch/client-elasticsearch/pom.xml
@@ -61,7 +61,7 @@ under the License.
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
</dependency>
-
+
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
http://git-wip-us.apache.org/repos/asf/syncope/blob/704b3adb/ext/swagger-ui/pom.xml
----------------------------------------------------------------------
diff --git a/ext/swagger-ui/pom.xml b/ext/swagger-ui/pom.xml
index 2f9e0a1..8bd29ae 100644
--- a/ext/swagger-ui/pom.xml
+++ b/ext/swagger-ui/pom.xml
@@ -54,6 +54,11 @@ under the License.
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ </dependency>
</dependencies>
<build>