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 2014/08/05 13:18:14 UTC
svn commit: r1615909 [9/12] - in /syncope/branches/1_2_X:
archetype/src/main/resources/
archetype/src/main/resources/archetype-resources/console/
archetype/src/main/resources/archetype-resources/core/
build-tools/src/main/resources/ client/src/main/jav...
Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/PasswordPolicySpec.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/PasswordPolicySpec.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/PasswordPolicySpec.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/PasswordPolicySpec.java Tue Aug 5 11:18:11 2014
@@ -1,367 +1,367 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
-import org.apache.syncope.common.annotation.SchemaList;
-
-@XmlType
-public class PasswordPolicySpec extends AbstractPolicySpec {
-
- private static final long serialVersionUID = -7988778083915548547L;
-
- /**
- * History length.
- */
- private int historyLength;
-
- /**
- * Minimum length.
- */
- private int maxLength;
-
- /**
- * Maximum length.
- */
- private int minLength;
-
- /**
- * Substrings not permitted.
- */
- private List<String> wordsNotPermitted;
-
- /**
- * User attribute values not permitted.
- */
- @SchemaList
- private List<String> schemasNotPermitted;
-
- /**
- * Specify if one or more non alphanumeric characters are required.
- */
- private boolean nonAlphanumericRequired;
-
- /**
- * Specify if one or more alphanumeric characters are required.
- */
- private boolean alphanumericRequired;
-
- /**
- * Specify if one or more digits are required.
- */
- private boolean digitRequired;
-
- /**
- * Specify if one or more lowercase alphabetic characters are required.
- */
- private boolean lowercaseRequired;
-
- /**
- * Specify if one or more uppercase alphabetic characters are required.
- */
- private boolean uppercaseRequired;
-
- /**
- * Specify if must start with a digit.
- */
- private boolean mustStartWithDigit;
-
- /**
- * Specify if mustn't start with a digit.
- */
- private boolean mustntStartWithDigit;
-
- /**
- * Specify if must end with a digit.
- */
- private boolean mustEndWithDigit;
-
- /**
- * Specify if mustn't end with a digit.
- */
- private boolean mustntEndWithDigit;
-
- /**
- * Specify if must start with a non alphanumeric character.
- */
- private boolean mustStartWithNonAlpha;
-
- /**
- * Specify if must start with a alphanumeric character.
- */
- private boolean mustStartWithAlpha;
-
- /**
- * Specify if mustn't start with a non alphanumeric character.
- */
- private boolean mustntStartWithNonAlpha;
-
- /**
- * Specify if mustn't start with a alphanumeric character.
- */
- private boolean mustntStartWithAlpha;
-
- /**
- * Specify if must end with a non alphanumeric character.
- */
- private boolean mustEndWithNonAlpha;
-
- /**
- * Specify if must end with a alphanumeric character.
- */
- private boolean mustEndWithAlpha;
-
- /**
- * Specify if mustn't end with a non alphanumeric character.
- */
- private boolean mustntEndWithNonAlpha;
-
- /**
- * Specify if mustn't end with a alphanumeric character.
- */
- private boolean mustntEndWithAlpha;
-
- /**
- * Specify if password shall not be stored internally.
- */
- private boolean allowNullPassword;
-
- /**
- * Substrings not permitted as prefix.
- */
- private List<String> prefixesNotPermitted;
-
- /**
- * Substrings not permitted as suffix.
- */
- private List<String> suffixesNotPermitted;
-
- public boolean isDigitRequired() {
- return digitRequired;
- }
-
- public void setDigitRequired(final boolean digitRequired) {
- this.digitRequired = digitRequired;
- }
-
- public boolean isLowercaseRequired() {
- return lowercaseRequired;
- }
-
- public void setLowercaseRequired(final boolean lowercaseRequired) {
- this.lowercaseRequired = lowercaseRequired;
- }
-
- public int getMaxLength() {
- return maxLength;
- }
-
- public void setMaxLength(final int maxLength) {
- this.maxLength = maxLength;
- }
-
- public int getMinLength() {
- return minLength;
- }
-
- public void setMinLength(final int minLength) {
- this.minLength = minLength;
- }
-
- public boolean isMustEndWithDigit() {
- return mustEndWithDigit;
- }
-
- public void setMustEndWithDigit(final boolean mustEndWithDigit) {
- this.mustEndWithDigit = mustEndWithDigit;
- }
-
- public boolean isMustEndWithNonAlpha() {
- return mustEndWithNonAlpha;
- }
-
- public void setMustEndWithNonAlpha(final boolean mustEndWithNonAlpha) {
- this.mustEndWithNonAlpha = mustEndWithNonAlpha;
- }
-
- public boolean isMustStartWithDigit() {
- return mustStartWithDigit;
- }
-
- public void setMustStartWithDigit(final boolean mustStartWithDigit) {
- this.mustStartWithDigit = mustStartWithDigit;
- }
-
- public boolean isMustStartWithNonAlpha() {
- return mustStartWithNonAlpha;
- }
-
- public void setMustStartWithNonAlpha(final boolean mustStartWithNonAlpha) {
- this.mustStartWithNonAlpha = mustStartWithNonAlpha;
- }
-
- public boolean isMustntEndWithDigit() {
- return mustntEndWithDigit;
- }
-
- public void setMustntEndWithDigit(final boolean mustntEndWithDigit) {
- this.mustntEndWithDigit = mustntEndWithDigit;
- }
-
- public boolean isMustntEndWithNonAlpha() {
- return mustntEndWithNonAlpha;
- }
-
- public void setMustntEndWithNonAlpha(final boolean mustntEndWithNonAlpha) {
- this.mustntEndWithNonAlpha = mustntEndWithNonAlpha;
- }
-
- public boolean isMustntStartWithDigit() {
- return mustntStartWithDigit;
- }
-
- public void setMustntStartWithDigit(final boolean mustntStartWithDigit) {
- this.mustntStartWithDigit = mustntStartWithDigit;
- }
-
- public boolean isMustntStartWithNonAlpha() {
- return mustntStartWithNonAlpha;
- }
-
- public void setMustntStartWithNonAlpha(final boolean mustntStartWithNonAlpha) {
- this.mustntStartWithNonAlpha = mustntStartWithNonAlpha;
- }
-
- public boolean isNonAlphanumericRequired() {
- return nonAlphanumericRequired;
- }
-
- public void setNonAlphanumericRequired(final boolean nonAlphanumericRequired) {
- this.nonAlphanumericRequired = nonAlphanumericRequired;
- }
-
- @XmlElementWrapper(name = "prefixesNotPermitted")
- @XmlElement(name = "prefix")
- @JsonProperty("prefixesNotPermitted")
- public List<String> getPrefixesNotPermitted() {
- if (prefixesNotPermitted == null) {
- prefixesNotPermitted = new ArrayList<String>();
- }
- return prefixesNotPermitted;
- }
-
- @XmlElementWrapper(name = "schemasNotPermitted")
- @XmlElement(name = "schema")
- @JsonProperty("schemasNotPermitted")
- public List<String> getSchemasNotPermitted() {
- if (schemasNotPermitted == null) {
- schemasNotPermitted = new ArrayList<String>();
- }
- return schemasNotPermitted;
- }
-
- @XmlElementWrapper(name = "suffixesNotPermitted")
- @XmlElement(name = "suffix")
- @JsonProperty("suffixesNotPermitted")
- public List<String> getSuffixesNotPermitted() {
- if (suffixesNotPermitted == null) {
- suffixesNotPermitted = new ArrayList<String>();
- }
- return suffixesNotPermitted;
- }
-
- public boolean isUppercaseRequired() {
- return uppercaseRequired;
- }
-
- public void setUppercaseRequired(final boolean uppercaseRequired) {
- this.uppercaseRequired = uppercaseRequired;
- }
-
- @XmlElementWrapper(name = "wordsNotPermitted")
- @XmlElement(name = "word")
- @JsonProperty("wordsNotPermitted")
- public List<String> getWordsNotPermitted() {
- if (wordsNotPermitted == null) {
- wordsNotPermitted = new ArrayList<String>();
- }
- return wordsNotPermitted;
- }
-
- public boolean isAlphanumericRequired() {
- return alphanumericRequired;
- }
-
- public void setAlphanumericRequired(final boolean alphanumericRequired) {
- this.alphanumericRequired = alphanumericRequired;
- }
-
- public boolean isMustEndWithAlpha() {
- return mustEndWithAlpha;
- }
-
- public void setMustEndWithAlpha(final boolean mustEndWithAlpha) {
- this.mustEndWithAlpha = mustEndWithAlpha;
- }
-
- public boolean isMustStartWithAlpha() {
- return mustStartWithAlpha;
- }
-
- public void setMustStartWithAlpha(final boolean mustStartWithAlpha) {
- this.mustStartWithAlpha = mustStartWithAlpha;
- }
-
- public boolean isMustntEndWithAlpha() {
- return mustntEndWithAlpha;
- }
-
- public void setMustntEndWithAlpha(final boolean mustntEndWithAlpha) {
- this.mustntEndWithAlpha = mustntEndWithAlpha;
- }
-
- public boolean isMustntStartWithAlpha() {
- return mustntStartWithAlpha;
- }
-
- public void setMustntStartWithAlpha(final boolean mustntStartWithAlpha) {
- this.mustntStartWithAlpha = mustntStartWithAlpha;
- }
-
- public int getHistoryLength() {
- return historyLength;
- }
-
- public void setHistoryLength(final int historyLength) {
- this.historyLength = historyLength;
- }
-
- public boolean isAllowNullPassword() {
- return allowNullPassword;
- }
-
- public void setAllowNullPassword(final boolean allowNullPassword) {
- this.allowNullPassword = allowNullPassword;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlType;
+import org.apache.syncope.common.annotation.SchemaList;
+
+@XmlType
+public class PasswordPolicySpec extends AbstractPolicySpec {
+
+ private static final long serialVersionUID = -7988778083915548547L;
+
+ /**
+ * History length.
+ */
+ private int historyLength;
+
+ /**
+ * Minimum length.
+ */
+ private int maxLength;
+
+ /**
+ * Maximum length.
+ */
+ private int minLength;
+
+ /**
+ * Substrings not permitted.
+ */
+ private List<String> wordsNotPermitted;
+
+ /**
+ * User attribute values not permitted.
+ */
+ @SchemaList
+ private List<String> schemasNotPermitted;
+
+ /**
+ * Specify if one or more non alphanumeric characters are required.
+ */
+ private boolean nonAlphanumericRequired;
+
+ /**
+ * Specify if one or more alphanumeric characters are required.
+ */
+ private boolean alphanumericRequired;
+
+ /**
+ * Specify if one or more digits are required.
+ */
+ private boolean digitRequired;
+
+ /**
+ * Specify if one or more lowercase alphabetic characters are required.
+ */
+ private boolean lowercaseRequired;
+
+ /**
+ * Specify if one or more uppercase alphabetic characters are required.
+ */
+ private boolean uppercaseRequired;
+
+ /**
+ * Specify if must start with a digit.
+ */
+ private boolean mustStartWithDigit;
+
+ /**
+ * Specify if mustn't start with a digit.
+ */
+ private boolean mustntStartWithDigit;
+
+ /**
+ * Specify if must end with a digit.
+ */
+ private boolean mustEndWithDigit;
+
+ /**
+ * Specify if mustn't end with a digit.
+ */
+ private boolean mustntEndWithDigit;
+
+ /**
+ * Specify if must start with a non alphanumeric character.
+ */
+ private boolean mustStartWithNonAlpha;
+
+ /**
+ * Specify if must start with a alphanumeric character.
+ */
+ private boolean mustStartWithAlpha;
+
+ /**
+ * Specify if mustn't start with a non alphanumeric character.
+ */
+ private boolean mustntStartWithNonAlpha;
+
+ /**
+ * Specify if mustn't start with a alphanumeric character.
+ */
+ private boolean mustntStartWithAlpha;
+
+ /**
+ * Specify if must end with a non alphanumeric character.
+ */
+ private boolean mustEndWithNonAlpha;
+
+ /**
+ * Specify if must end with a alphanumeric character.
+ */
+ private boolean mustEndWithAlpha;
+
+ /**
+ * Specify if mustn't end with a non alphanumeric character.
+ */
+ private boolean mustntEndWithNonAlpha;
+
+ /**
+ * Specify if mustn't end with a alphanumeric character.
+ */
+ private boolean mustntEndWithAlpha;
+
+ /**
+ * Specify if password shall not be stored internally.
+ */
+ private boolean allowNullPassword;
+
+ /**
+ * Substrings not permitted as prefix.
+ */
+ private List<String> prefixesNotPermitted;
+
+ /**
+ * Substrings not permitted as suffix.
+ */
+ private List<String> suffixesNotPermitted;
+
+ public boolean isDigitRequired() {
+ return digitRequired;
+ }
+
+ public void setDigitRequired(final boolean digitRequired) {
+ this.digitRequired = digitRequired;
+ }
+
+ public boolean isLowercaseRequired() {
+ return lowercaseRequired;
+ }
+
+ public void setLowercaseRequired(final boolean lowercaseRequired) {
+ this.lowercaseRequired = lowercaseRequired;
+ }
+
+ public int getMaxLength() {
+ return maxLength;
+ }
+
+ public void setMaxLength(final int maxLength) {
+ this.maxLength = maxLength;
+ }
+
+ public int getMinLength() {
+ return minLength;
+ }
+
+ public void setMinLength(final int minLength) {
+ this.minLength = minLength;
+ }
+
+ public boolean isMustEndWithDigit() {
+ return mustEndWithDigit;
+ }
+
+ public void setMustEndWithDigit(final boolean mustEndWithDigit) {
+ this.mustEndWithDigit = mustEndWithDigit;
+ }
+
+ public boolean isMustEndWithNonAlpha() {
+ return mustEndWithNonAlpha;
+ }
+
+ public void setMustEndWithNonAlpha(final boolean mustEndWithNonAlpha) {
+ this.mustEndWithNonAlpha = mustEndWithNonAlpha;
+ }
+
+ public boolean isMustStartWithDigit() {
+ return mustStartWithDigit;
+ }
+
+ public void setMustStartWithDigit(final boolean mustStartWithDigit) {
+ this.mustStartWithDigit = mustStartWithDigit;
+ }
+
+ public boolean isMustStartWithNonAlpha() {
+ return mustStartWithNonAlpha;
+ }
+
+ public void setMustStartWithNonAlpha(final boolean mustStartWithNonAlpha) {
+ this.mustStartWithNonAlpha = mustStartWithNonAlpha;
+ }
+
+ public boolean isMustntEndWithDigit() {
+ return mustntEndWithDigit;
+ }
+
+ public void setMustntEndWithDigit(final boolean mustntEndWithDigit) {
+ this.mustntEndWithDigit = mustntEndWithDigit;
+ }
+
+ public boolean isMustntEndWithNonAlpha() {
+ return mustntEndWithNonAlpha;
+ }
+
+ public void setMustntEndWithNonAlpha(final boolean mustntEndWithNonAlpha) {
+ this.mustntEndWithNonAlpha = mustntEndWithNonAlpha;
+ }
+
+ public boolean isMustntStartWithDigit() {
+ return mustntStartWithDigit;
+ }
+
+ public void setMustntStartWithDigit(final boolean mustntStartWithDigit) {
+ this.mustntStartWithDigit = mustntStartWithDigit;
+ }
+
+ public boolean isMustntStartWithNonAlpha() {
+ return mustntStartWithNonAlpha;
+ }
+
+ public void setMustntStartWithNonAlpha(final boolean mustntStartWithNonAlpha) {
+ this.mustntStartWithNonAlpha = mustntStartWithNonAlpha;
+ }
+
+ public boolean isNonAlphanumericRequired() {
+ return nonAlphanumericRequired;
+ }
+
+ public void setNonAlphanumericRequired(final boolean nonAlphanumericRequired) {
+ this.nonAlphanumericRequired = nonAlphanumericRequired;
+ }
+
+ @XmlElementWrapper(name = "prefixesNotPermitted")
+ @XmlElement(name = "prefix")
+ @JsonProperty("prefixesNotPermitted")
+ public List<String> getPrefixesNotPermitted() {
+ if (prefixesNotPermitted == null) {
+ prefixesNotPermitted = new ArrayList<String>();
+ }
+ return prefixesNotPermitted;
+ }
+
+ @XmlElementWrapper(name = "schemasNotPermitted")
+ @XmlElement(name = "schema")
+ @JsonProperty("schemasNotPermitted")
+ public List<String> getSchemasNotPermitted() {
+ if (schemasNotPermitted == null) {
+ schemasNotPermitted = new ArrayList<String>();
+ }
+ return schemasNotPermitted;
+ }
+
+ @XmlElementWrapper(name = "suffixesNotPermitted")
+ @XmlElement(name = "suffix")
+ @JsonProperty("suffixesNotPermitted")
+ public List<String> getSuffixesNotPermitted() {
+ if (suffixesNotPermitted == null) {
+ suffixesNotPermitted = new ArrayList<String>();
+ }
+ return suffixesNotPermitted;
+ }
+
+ public boolean isUppercaseRequired() {
+ return uppercaseRequired;
+ }
+
+ public void setUppercaseRequired(final boolean uppercaseRequired) {
+ this.uppercaseRequired = uppercaseRequired;
+ }
+
+ @XmlElementWrapper(name = "wordsNotPermitted")
+ @XmlElement(name = "word")
+ @JsonProperty("wordsNotPermitted")
+ public List<String> getWordsNotPermitted() {
+ if (wordsNotPermitted == null) {
+ wordsNotPermitted = new ArrayList<String>();
+ }
+ return wordsNotPermitted;
+ }
+
+ public boolean isAlphanumericRequired() {
+ return alphanumericRequired;
+ }
+
+ public void setAlphanumericRequired(final boolean alphanumericRequired) {
+ this.alphanumericRequired = alphanumericRequired;
+ }
+
+ public boolean isMustEndWithAlpha() {
+ return mustEndWithAlpha;
+ }
+
+ public void setMustEndWithAlpha(final boolean mustEndWithAlpha) {
+ this.mustEndWithAlpha = mustEndWithAlpha;
+ }
+
+ public boolean isMustStartWithAlpha() {
+ return mustStartWithAlpha;
+ }
+
+ public void setMustStartWithAlpha(final boolean mustStartWithAlpha) {
+ this.mustStartWithAlpha = mustStartWithAlpha;
+ }
+
+ public boolean isMustntEndWithAlpha() {
+ return mustntEndWithAlpha;
+ }
+
+ public void setMustntEndWithAlpha(final boolean mustntEndWithAlpha) {
+ this.mustntEndWithAlpha = mustntEndWithAlpha;
+ }
+
+ public boolean isMustntStartWithAlpha() {
+ return mustntStartWithAlpha;
+ }
+
+ public void setMustntStartWithAlpha(final boolean mustntStartWithAlpha) {
+ this.mustntStartWithAlpha = mustntStartWithAlpha;
+ }
+
+ public int getHistoryLength() {
+ return historyLength;
+ }
+
+ public void setHistoryLength(final int historyLength) {
+ this.historyLength = historyLength;
+ }
+
+ public boolean isAllowNullPassword() {
+ return allowNullPassword;
+ }
+
+ public void setAllowNullPassword(final boolean allowNullPassword) {
+ this.allowNullPassword = allowNullPassword;
+ }
+}
Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/PolicyType.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/PolicyType.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/PolicyType.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/PolicyType.java Tue Aug 5 11:18:11 2014
@@ -1,61 +1,61 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
-public enum PolicyType {
-
- /**
- * Account policy like:
- * password expire time, change password at first access, ...
- */
- ACCOUNT("Account Policy"),
- GLOBAL_ACCOUNT("Account Global Policy"),
- /**
- * Password policy regarding password syntax.
- */
- PASSWORD("Password Policy"),
- GLOBAL_PASSWORD("Password Global Policy"),
- /**
- * SYNC policy regarding account conflicts resolution.
- */
- SYNC("Synchronization Policy"),
- GLOBAL_SYNC("Synchronization Global Policy"),
- /**
- * PUSH policy regarding account conflicts resolution.
- */
- PUSH("Push Policy"),
- GLOBAL_PUSH("Push Global Policy");
-
- private String description;
-
- PolicyType(final String description) {
- this.description = description;
- }
-
- public String getDescription() {
- return description;
- }
-
- public static PolicyType fromString(final String value) {
- return PolicyType.valueOf(value.toUpperCase());
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+@XmlEnum
+public enum PolicyType {
+
+ /**
+ * Account policy like:
+ * password expire time, change password at first access, ...
+ */
+ ACCOUNT("Account Policy"),
+ GLOBAL_ACCOUNT("Account Global Policy"),
+ /**
+ * Password policy regarding password syntax.
+ */
+ PASSWORD("Password Policy"),
+ GLOBAL_PASSWORD("Password Global Policy"),
+ /**
+ * SYNC policy regarding account conflicts resolution.
+ */
+ SYNC("Synchronization Policy"),
+ GLOBAL_SYNC("Synchronization Global Policy"),
+ /**
+ * PUSH policy regarding account conflicts resolution.
+ */
+ PUSH("Push Policy"),
+ GLOBAL_PUSH("Push Global Policy");
+
+ private String description;
+
+ PolicyType(final String description) {
+ this.description = description;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public static PolicyType fromString(final String value) {
+ return PolicyType.valueOf(value.toUpperCase());
+ }
+}
Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/PropagationMode.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/PropagationMode.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/PropagationMode.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/PropagationMode.java Tue Aug 5 11:18:11 2014
@@ -1,29 +1,29 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
-public enum PropagationMode {
-
- ONE_PHASE,
- TWO_PHASES
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+@XmlEnum
+public enum PropagationMode {
+
+ ONE_PHASE,
+ TWO_PHASES
+
+}
Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/PropagationTaskExecStatus.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/PropagationTaskExecStatus.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/PropagationTaskExecStatus.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/PropagationTaskExecStatus.java Tue Aug 5 11:18:11 2014
@@ -1,49 +1,49 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-/**
- * Status of a propagation task execution.
- *
- * CREATED -> SUBMITTED or UBSUBMITTED (depending on the external resource to
- * return success or failure).
- * SUBMITTED -> SUCCESS or FAILURE (depending on the external resource to
- * report success or failure).
- *
- * @see org.apache.syncope.common.to.TaskExecTO
- */
-@XmlEnum
-public enum PropagationTaskExecStatus {
-
- CREATED,
- SUBMITTED,
- UNSUBMITTED,
- SUCCESS,
- FAILURE;
-
- public boolean isSuccessful() {
- return this == SUCCESS || this == SUBMITTED;
- }
-
- public static PropagationTaskExecStatus fromString(final String value) {
- return PropagationTaskExecStatus.valueOf(value.toUpperCase());
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+/**
+ * Status of a propagation task execution.
+ *
+ * CREATED -> SUBMITTED or UBSUBMITTED (depending on the external resource to
+ * return success or failure).
+ * SUBMITTED -> SUCCESS or FAILURE (depending on the external resource to
+ * report success or failure).
+ *
+ * @see org.apache.syncope.common.to.TaskExecTO
+ */
+@XmlEnum
+public enum PropagationTaskExecStatus {
+
+ CREATED,
+ SUBMITTED,
+ UNSUBMITTED,
+ SUCCESS,
+ FAILURE;
+
+ public boolean isSuccessful() {
+ return this == SUCCESS || this == SUBMITTED;
+ }
+
+ public static PropagationTaskExecStatus fromString(final String value) {
+ return PropagationTaskExecStatus.valueOf(value.toUpperCase());
+ }
+}
Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ReportExecExportFormat.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ReportExecExportFormat.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ReportExecExportFormat.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ReportExecExportFormat.java Tue Aug 5 11:18:11 2014
@@ -1,32 +1,32 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
-public enum ReportExecExportFormat {
-
- XML,
- HTML,
- PDF,
- RTF,
- CSV
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+@XmlEnum
+public enum ReportExecExportFormat {
+
+ XML,
+ HTML,
+ PDF,
+ RTF,
+ CSV
+
+}
Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ReportExecStatus.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ReportExecStatus.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ReportExecStatus.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ReportExecStatus.java Tue Aug 5 11:18:11 2014
@@ -1,34 +1,34 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
-public enum ReportExecStatus {
-
- STARTED,
- RUNNING,
- SUCCESS,
- FAILURE;
-
- public static ReportExecStatus fromString(final String value) {
- return ReportExecStatus.valueOf(value.toUpperCase());
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+@XmlEnum
+public enum ReportExecStatus {
+
+ STARTED,
+ RUNNING,
+ SUCCESS,
+ FAILURE;
+
+ public static ReportExecStatus fromString(final String value) {
+ return ReportExecStatus.valueOf(value.toUpperCase());
+ }
+}
Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ResourceOperation.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ResourceOperation.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ResourceOperation.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/ResourceOperation.java Tue Aug 5 11:18:11 2014
@@ -1,31 +1,31 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
-public enum ResourceOperation {
-
- CREATE,
- UPDATE,
- DELETE,
- NONE
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+@XmlEnum
+public enum ResourceOperation {
+
+ CREATE,
+ UPDATE,
+ DELETE,
+ NONE
+
+}
Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/SchemaType.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/SchemaType.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/SchemaType.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/SchemaType.java Tue Aug 5 11:18:11 2014
@@ -1,68 +1,68 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-import org.apache.syncope.common.to.AbstractSchemaTO;
-import org.apache.syncope.common.to.DerSchemaTO;
-import org.apache.syncope.common.to.SchemaTO;
-import org.apache.syncope.common.to.VirSchemaTO;
-
-@XmlEnum
-public enum SchemaType {
-
- /**
- * Standard schema for normal attributes to be stored within syncope.
- */
- NORMAL(SchemaTO.class),
- /**
- * Derived schema calculated based on other attributes.
- */
- DERIVED(DerSchemaTO.class),
- /**
- * Virtual schema for attributes fetched from remote resources only.
- */
- VIRTUAL(VirSchemaTO.class);
-
- private final Class<? extends AbstractSchemaTO> toClass;
-
- SchemaType(final Class<? extends AbstractSchemaTO> toClass) {
- this.toClass = toClass;
- }
-
- public Class<? extends AbstractSchemaTO> getToClass() {
- return toClass;
- }
-
- public static SchemaType fromToClass(final Class<? extends AbstractSchemaTO> toClass) {
- SchemaType schemaType = null;
-
- if (SchemaTO.class.equals(toClass)) {
- schemaType = SchemaType.NORMAL;
- } else if (DerSchemaTO.class.equals(toClass)) {
- schemaType = SchemaType.DERIVED;
- } else if (VirSchemaTO.class.equals(toClass)) {
- schemaType = SchemaType.VIRTUAL;
- } else {
- throw new IllegalArgumentException("Unexpected class: " + toClass.getName());
- }
-
- return schemaType;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+import org.apache.syncope.common.to.AbstractSchemaTO;
+import org.apache.syncope.common.to.DerSchemaTO;
+import org.apache.syncope.common.to.SchemaTO;
+import org.apache.syncope.common.to.VirSchemaTO;
+
+@XmlEnum
+public enum SchemaType {
+
+ /**
+ * Standard schema for normal attributes to be stored within syncope.
+ */
+ NORMAL(SchemaTO.class),
+ /**
+ * Derived schema calculated based on other attributes.
+ */
+ DERIVED(DerSchemaTO.class),
+ /**
+ * Virtual schema for attributes fetched from remote resources only.
+ */
+ VIRTUAL(VirSchemaTO.class);
+
+ private final Class<? extends AbstractSchemaTO> toClass;
+
+ SchemaType(final Class<? extends AbstractSchemaTO> toClass) {
+ this.toClass = toClass;
+ }
+
+ public Class<? extends AbstractSchemaTO> getToClass() {
+ return toClass;
+ }
+
+ public static SchemaType fromToClass(final Class<? extends AbstractSchemaTO> toClass) {
+ SchemaType schemaType = null;
+
+ if (SchemaTO.class.equals(toClass)) {
+ schemaType = SchemaType.NORMAL;
+ } else if (DerSchemaTO.class.equals(toClass)) {
+ schemaType = SchemaType.DERIVED;
+ } else if (VirSchemaTO.class.equals(toClass)) {
+ schemaType = SchemaType.VIRTUAL;
+ } else {
+ throw new IllegalArgumentException("Unexpected class: " + toClass.getName());
+ }
+
+ return schemaType;
+ }
+}
Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/SubjectType.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/SubjectType.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/SubjectType.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/SubjectType.java Tue Aug 5 11:18:11 2014
@@ -1,34 +1,34 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
-public enum SubjectType {
-
- USER,
- ROLE;
-
- public AttributableType asAttributableType() {
- return this == USER
- ? AttributableType.USER
- : AttributableType.ROLE;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+@XmlEnum
+public enum SubjectType {
+
+ USER,
+ ROLE;
+
+ public AttributableType asAttributableType() {
+ return this == USER
+ ? AttributableType.USER
+ : AttributableType.ROLE;
+ }
+}
Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/SyncPolicySpec.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/SyncPolicySpec.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/SyncPolicySpec.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/SyncPolicySpec.java Tue Aug 5 11:18:11 2014
@@ -1,97 +1,97 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
-import org.apache.syncope.common.annotation.ClassList;
-import org.apache.syncope.common.annotation.SchemaList;
-
-@XmlType
-public class SyncPolicySpec extends AbstractPolicySpec {
-
- private static final long serialVersionUID = -3144027171719498127L;
-
- /**
- * SyncopeUser attributes and fields for matching during synchronization.
- */
- @SchemaList(extended = true)
- private final List<String> uAltSearchSchemas = new ArrayList<String>();
-
- @ClassList
- private String userJavaRule;
-
- /**
- * SyncopeRole attributes and fields for matching during synchronization.
- */
- @SchemaList(extended = true)
- private final List<String> rAltSearchSchemas = new ArrayList<String>();
-
- @ClassList
- private String roleJavaRule;
-
- /**
- * Conflict resolution action.
- */
- private ConflictResolutionAction conflictResolutionAction;
-
- public ConflictResolutionAction getConflictResolutionAction() {
- return conflictResolutionAction == null
- ? ConflictResolutionAction.IGNORE
- : conflictResolutionAction;
- }
-
- public void setConflictResolutionAction(final ConflictResolutionAction conflictResolutionAction) {
- this.conflictResolutionAction = conflictResolutionAction;
- }
-
- @XmlElementWrapper(name = "userAltSearchSchemas")
- @XmlElement(name = "userAltSearchSchema")
- @JsonProperty("userAltSearchSchemas")
- public List<String> getuAltSearchSchemas() {
- return uAltSearchSchemas;
- }
-
- @XmlElementWrapper(name = "roleAltSearchSchemas")
- @XmlElement(name = "roleAltSearchSchema")
- @JsonProperty("roleAltSearchSchemas")
- public List<String> getrAltSearchSchemas() {
- return rAltSearchSchemas;
- }
-
- public String getRoleJavaRule() {
- return roleJavaRule;
- }
-
- public void setRoleJavaRule(final String roleJavaRule) {
- this.roleJavaRule = roleJavaRule;
- }
-
- public String getUserJavaRule() {
- return userJavaRule;
- }
-
- public void setUserJavaRule(final String userJavaRule) {
- this.userJavaRule = userJavaRule;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlType;
+import org.apache.syncope.common.annotation.ClassList;
+import org.apache.syncope.common.annotation.SchemaList;
+
+@XmlType
+public class SyncPolicySpec extends AbstractPolicySpec {
+
+ private static final long serialVersionUID = -3144027171719498127L;
+
+ /**
+ * SyncopeUser attributes and fields for matching during synchronization.
+ */
+ @SchemaList(extended = true)
+ private final List<String> uAltSearchSchemas = new ArrayList<String>();
+
+ @ClassList
+ private String userJavaRule;
+
+ /**
+ * SyncopeRole attributes and fields for matching during synchronization.
+ */
+ @SchemaList(extended = true)
+ private final List<String> rAltSearchSchemas = new ArrayList<String>();
+
+ @ClassList
+ private String roleJavaRule;
+
+ /**
+ * Conflict resolution action.
+ */
+ private ConflictResolutionAction conflictResolutionAction;
+
+ public ConflictResolutionAction getConflictResolutionAction() {
+ return conflictResolutionAction == null
+ ? ConflictResolutionAction.IGNORE
+ : conflictResolutionAction;
+ }
+
+ public void setConflictResolutionAction(final ConflictResolutionAction conflictResolutionAction) {
+ this.conflictResolutionAction = conflictResolutionAction;
+ }
+
+ @XmlElementWrapper(name = "userAltSearchSchemas")
+ @XmlElement(name = "userAltSearchSchema")
+ @JsonProperty("userAltSearchSchemas")
+ public List<String> getuAltSearchSchemas() {
+ return uAltSearchSchemas;
+ }
+
+ @XmlElementWrapper(name = "roleAltSearchSchemas")
+ @XmlElement(name = "roleAltSearchSchema")
+ @JsonProperty("roleAltSearchSchemas")
+ public List<String> getrAltSearchSchemas() {
+ return rAltSearchSchemas;
+ }
+
+ public String getRoleJavaRule() {
+ return roleJavaRule;
+ }
+
+ public void setRoleJavaRule(final String roleJavaRule) {
+ this.roleJavaRule = roleJavaRule;
+ }
+
+ public String getUserJavaRule() {
+ return userJavaRule;
+ }
+
+ public void setUserJavaRule(final String userJavaRule) {
+ this.userJavaRule = userJavaRule;
+ }
+}
Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/TaskType.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/TaskType.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/TaskType.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/TaskType.java Tue Aug 5 11:18:11 2014
@@ -1,54 +1,54 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
-public enum TaskType {
-
- PROPAGATION("propagation"),
- NOTIFICATION("notification"),
- SCHEDULED("sched"),
- SYNCHRONIZATION("sync"),
- PUSH("push");
-
- private String name;
-
- private TaskType(final String name) {
- this.name = name;
- }
-
- @Override
- public String toString() {
- return name;
- }
-
- public static TaskType fromString(final String name) {
- if (name != null) {
- for (TaskType t : TaskType.values()) {
- if (t.name.equalsIgnoreCase(name)) {
- return t;
- }
- }
- }
-
- return null;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+@XmlEnum
+public enum TaskType {
+
+ PROPAGATION("propagation"),
+ NOTIFICATION("notification"),
+ SCHEDULED("sched"),
+ SYNCHRONIZATION("sync"),
+ PUSH("push");
+
+ private String name;
+
+ private TaskType(final String name) {
+ this.name = name;
+ }
+
+ @Override
+ public String toString() {
+ return name;
+ }
+
+ public static TaskType fromString(final String name) {
+ if (name != null) {
+ for (TaskType t : TaskType.values()) {
+ if (t.name.equalsIgnoreCase(name)) {
+ return t;
+ }
+ }
+ }
+
+ return null;
+ }
+}
Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/TraceLevel.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/TraceLevel.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/TraceLevel.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/TraceLevel.java Tue Aug 5 11:18:11 2014
@@ -1,43 +1,43 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
-public enum TraceLevel {
-
- /**
- * No details at all.
- */
- NONE,
- /**
- * Only failed entries.
- */
- FAILURES,
- /**
- * Only an overall summary.
- */
- SUMMARY,
- /**
- * All available information, including per-entry information.
- */
- ALL
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+@XmlEnum
+public enum TraceLevel {
+
+ /**
+ * No details at all.
+ */
+ NONE,
+ /**
+ * Only failed entries.
+ */
+ FAILURES,
+ /**
+ * Only an overall summary.
+ */
+ SUMMARY,
+ /**
+ * All available information, including per-entry information.
+ */
+ ALL
+
+}
Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/UnmatchingRule.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/UnmatchingRule.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/UnmatchingRule.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/UnmatchingRule.java Tue Aug 5 11:18:11 2014
@@ -1,47 +1,47 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-/**
- * Sync/Push task un-matching rule.
- */
-@XmlEnum
-public enum UnmatchingRule {
-
- /**
- * Do not perform any action.
- */
- IGNORE,
- /**
- * Link the resource and create entity.
- */
- ASSIGN,
- /**
- * Create entity without linking the resource.
- */
- PROVISION,
- /**
- * Just unlink resource without performing any (de-)provisioning operation.
- * In case of sync task UNLINK and IGNORE will coincide.
- */
- UNLINK
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+/**
+ * Sync/Push task un-matching rule.
+ */
+@XmlEnum
+public enum UnmatchingRule {
+
+ /**
+ * Do not perform any action.
+ */
+ IGNORE,
+ /**
+ * Link the resource and create entity.
+ */
+ ASSIGN,
+ /**
+ * Create entity without linking the resource.
+ */
+ PROVISION,
+ /**
+ * Just unlink resource without performing any (de-)provisioning operation.
+ * In case of sync task UNLINK and IGNORE will coincide.
+ */
+ UNLINK
+
+}
Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/WorkflowFormPropertyType.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/WorkflowFormPropertyType.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/WorkflowFormPropertyType.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/WorkflowFormPropertyType.java Tue Aug 5 11:18:11 2014
@@ -1,32 +1,32 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
-public enum WorkflowFormPropertyType {
-
- String,
- Long,
- Enum,
- Date,
- Boolean
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+@XmlEnum
+public enum WorkflowFormPropertyType {
+
+ String,
+ Long,
+ Enum,
+ Date,
+ Boolean
+
+}
Modified: syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/package-info.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/package-info.java?rev=1615909&r1=1615908&r2=1615909&view=diff
==============================================================================
--- syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/package-info.java (original)
+++ syncope/branches/1_2_X/common/src/main/java/org/apache/syncope/common/types/package-info.java Tue Aug 5 11:18:11 2014
@@ -1,23 +1,23 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-@XmlSchema(namespace = SyncopeConstants.NAMESPACE)
-package org.apache.syncope.common.types;
-
-import javax.xml.bind.annotation.XmlSchema;
-import org.apache.syncope.common.SyncopeConstants;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+@XmlSchema(namespace = SyncopeConstants.NAMESPACE)
+package org.apache.syncope.common.types;
+
+import javax.xml.bind.annotation.XmlSchema;
+import org.apache.syncope.common.SyncopeConstants;