svn commit: r1443356 - /syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/
Author: ilgrosso Date: Thu Feb 7 08:51:03 2013 New Revision: 1443356 URL: http://svn.apache.org/viewvc?rev=1443356view=rev Log: Fixing some italian typos Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage_it.properties syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/SchedTaskModalPage_it.properties syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage_it.properties Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties?rev=1443356r1=1443355r2=1443356view=diff == --- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties (original) +++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties Thu Feb 7 08:51:03 2013 @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -title=Account policy management +title=Policy Management description=Description type=Type @@ -55,12 +55,6 @@ mustntEndWithAlpha=Mustn't end with alph #- # Account policy specification properties #- -#minLength=Minimum size -#maxLength=Maximum size -#wordsNotPermitted=Substrings not permitted -#schemasNotPermitted=Mustn't contain value of the following attributes -#prefixesNotPermitted=Prefixes not permitted -#suffixesNotPermitted=Suffixes not permitted allUpperCase=All upper case allLowerCase=All lower case propagateSuspension=Propagate suspension Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties?rev=1443356r1=1443355r2=1443356view=diff == --- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties (original) +++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties Thu Feb 7 08:51:03 2013 @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -title=Gestiona Account Policy +title=Gestione Policy description=Descrizione type=Tipo @@ -40,28 +40,22 @@ mustStartWithDigit=Deve iniziare con un mustntStartWithDigit=Non deve iniziare con un numero mustEndWithDigit=Deve terminare con un numero mustntEndWithDigit=Non deve terminare con un numero -mustStartWithNonAlpha=Deve iniziare con un caratter non alfanumerico -mustStartWithAlpha=Deve iniziare con un caratter alfanumerico -mustntStartWithNonAlpha=Non deve iniziare con un caratter non alfanumerico -mustntStartWithAlpha=Non deve iniziare con un caratter alfanumerico -mustEndWithNonAlpha=Deve terminare con un caratter non alfanumerico -mustEndWithAlpha=Deve terminare con un caratter alfanumerico -mustntEndWithNonAlpha=Non deve terminare con un caratter non alfanumerico -mustntEndWithAlpha=Non deve terminare con un caratter alfanumerico +mustStartWithNonAlpha=Deve iniziare con un carattere non alfanumerico +mustStartWithAlpha=Deve iniziare con un carattere alfanumerico +mustntStartWithNonAlpha=Non deve iniziare con un carattere non alfanumerico +mustntStartWithAlpha=Non deve iniziare con un carattere alfanumerico +mustEndWithNonAlpha=Deve terminare con un carattere non alfanumerico +mustEndWithAlpha=Deve terminare con un carattere alfanumerico +mustntEndWithNonAlpha=Non deve terminare con un carattere non alfanumerico +mustntEndWithAlpha=Non deve terminare con un carattere alfanumerico #- #- # Account policy specification properties #- -#minLength=Lunghezza minima -#maxLength=Lunghezza massima -#wordsNotPermitted=Sottostringhe non permesse -#schemasNotPermitted=Non deve contenere i valore dei seguenti attributi -#prefixesNotPermitted=Prefissi non permessi -#suffixesNotPermitted=Suffissi non permessi allUpperCase=Tutte maiuscole allLowerCase=Tutte minuscole -propagateSuspension=Propagate sospensione +propagateSuspension=Propagare sospensione
svn commit: r1443362 - in /syncope/trunk: ./ console/src/main/resources/org/apache/syncope/console/pages/
Author: ilgrosso Date: Thu Feb 7 09:00:52 2013 New Revision: 1443362 URL: http://svn.apache.org/viewvc?rev=1443362view=rev Log: Merge from 1_0_X Modified: syncope/trunk/ (props changed) syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage_it.properties syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchedTaskModalPage_it.properties syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage_it.properties Propchange: syncope/trunk/ -- Merged /syncope/branches/1_0_X:r1442496-1443356 Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties?rev=1443362r1=1443361r2=1443362view=diff == --- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties (original) +++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties Thu Feb 7 09:00:52 2013 @@ -55,12 +55,6 @@ mustntEndWithAlpha=Mustn't end with alph #- # Account policy specification properties #- -#minLength=Minimum size -#maxLength=Maximum size -#wordsNotPermitted=Substrings not permitted -#schemasNotPermitted=Mustn't contain value of the following attributes -#prefixesNotPermitted=Prefixes not permitted -#suffixesNotPermitted=Suffixes not permitted allUpperCase=All upper case allLowerCase=All lower case propagateSuspension=Propagate suspension Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties?rev=1443362r1=1443361r2=1443362view=diff == --- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties (original) +++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties Thu Feb 7 09:00:52 2013 @@ -40,28 +40,22 @@ mustStartWithDigit=Deve iniziare con un mustntStartWithDigit=Non deve iniziare con un numero mustEndWithDigit=Deve terminare con un numero mustntEndWithDigit=Non deve terminare con un numero -mustStartWithNonAlpha=Deve iniziare con un caratter non alfanumerico -mustStartWithAlpha=Deve iniziare con un caratter alfanumerico -mustntStartWithNonAlpha=Non deve iniziare con un caratter non alfanumerico -mustntStartWithAlpha=Non deve iniziare con un caratter alfanumerico -mustEndWithNonAlpha=Deve terminare con un caratter non alfanumerico -mustEndWithAlpha=Deve terminare con un caratter alfanumerico -mustntEndWithNonAlpha=Non deve terminare con un caratter non alfanumerico -mustntEndWithAlpha=Non deve terminare con un caratter alfanumerico +mustStartWithNonAlpha=Deve iniziare con un carattere non alfanumerico +mustStartWithAlpha=Deve iniziare con un carattere alfanumerico +mustntStartWithNonAlpha=Non deve iniziare con un carattere non alfanumerico +mustntStartWithAlpha=Non deve iniziare con un carattere alfanumerico +mustEndWithNonAlpha=Deve terminare con un carattere non alfanumerico +mustEndWithAlpha=Deve terminare con un carattere alfanumerico +mustntEndWithNonAlpha=Non deve terminare con un carattere non alfanumerico +mustntEndWithAlpha=Non deve terminare con un carattere alfanumerico #- #- # Account policy specification properties #- -#minLength=Lunghezza minima -#maxLength=Lunghezza massima -#wordsNotPermitted=Sottostringhe non permesse -#schemasNotPermitted=Non deve contenere i valore dei seguenti attributi -#prefixesNotPermitted=Prefissi non permessi -#suffixesNotPermitted=Suffissi non permessi allUpperCase=Tutte maiuscole allLowerCase=Tutte minuscole -propagateSuspension=Propagate sospensione +propagateSuspension=Propagare sospensione permittedLoginRetries=Numero massimo di login consecutivi falliti #- Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage_it.properties URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage_it.properties?rev=1443362r1=1443361r2=1443362view=diff
svn commit: r1443410 - in /syncope/trunk/core/src/test: java/org/apache/syncope/core/rest/UserTestITCase.java resources/content.xml
Author: ilgrosso
Date: Thu Feb 7 11:08:42 2013
New Revision: 1443410
URL: http://svn.apache.org/viewvc?rev=1443410view=rev
Log:
[SYNCOPE-265] Renaming ws-target-resource-3 to ws-target-resource-timeout
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
syncope/trunk/core/src/test/resources/content.xml
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java?rev=1443410r1=1443409r2=1443410view=diff
==
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
Thu Feb 7 11:08:42 2013
@@ -1814,7 +1814,7 @@ public class UserTestITCase extends Abst
public void issueSYNCOPE279() {
UserTO userTO = getUniqueSampleTO(syncope...@apache.org);
userTO.getResources().clear();
-userTO.addResource(ws-target-resource-3);
+userTO.addResource(ws-target-resource-timeout);
createUser(userTO);
}
Modified: syncope/trunk/core/src/test/resources/content.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/content.xml?rev=1443410r1=1443409r2=1443410view=diff
==
--- syncope/trunk/core/src/test/resources/content.xml (original)
+++ syncope/trunk/core/src/test/resources/content.xml Thu Feb 7 11:08:42 2013
@@ -346,7 +346,7 @@ under the License.
randomPwdIfNotProvided=0 enforceMandatoryCondition=1
propagationMode=TWO_PHASES
propagationPriority=0 propagationPrimary=1
createTraceLevel=FAILURES deleteTraceLevel=NONE updateTraceLevel=ALL
syncTraceLevel=ALL
syncPolicy_id=9/
- ExternalResource name=ws-target-resource-3 connector_id=102
+ ExternalResource name=ws-target-resource-timeout connector_id=102
randomPwdIfNotProvided=0 enforceMandatoryCondition=1
propagationMode=TWO_PHASES
propagationPriority=0 propagationPrimary=1
createTraceLevel=FAILURES deleteTraceLevel=NONE updateTraceLevel=ALL
syncTraceLevel=ALL
xmlConfiguration=%3Cset%3E%0A++%3Corg.apache.syncope.common.types.ConnConfProperty%3E%0A%3Cschema%3E%0A++%3Cname%3Eendpoint%3C/name%3E%0A++%3Ctype%3Ejava.lang.String%3C/type%3E%0A++%3Crequired%3Etrue%3C/required%3E%0A%3C/schema%3E%0A%3Cvalues%3E%0A++%3Cjava.lang.String%3Ehttp%3A//localhost%3A9080/syncope-build-tools/services/provisioning%3C/java.lang.String%3E%0A%3C/values%3E%0A%3Coverridable%3Etrue%3C/overridable%3E%0A++%3C/org.apache.syncope.common.types.ConnConfProperty%3E%0A%3C/set%3E/
@@ -618,7 +618,7 @@ under the License.
extAttrName=USERNAME intAttrName=virtualdata
intMappingType=UserVirtualSchema
mandatoryCondition=false /
- UMapping id=18 resource_name=ws-target-resource-3/
+ UMapping id=18 resource_name=ws-target-resource-timeout/
UMappingItem id=333 mapping_id=18 accountid=1 password=0
extAttrName=__NAME__ intAttrName=fullname
intMappingType=UserSchema
mandatoryCondition=true/
svn commit: r1443445 - /syncope/trunk/common/src/main/java/org/apache/syncope/common/types/SyncPolicySpec.java
Author: cschneider
Date: Thu Feb 7 12:48:25 2013
New Revision: 1443445
URL: http://svn.apache.org/viewvc?rev=1443445view=rev
Log:
SYNCOPE-258 Fixing incorrect annotations for jaxb
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/SyncPolicySpec.java
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/SyncPolicySpec.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/types/SyncPolicySpec.java?rev=1443445r1=1443444r2=1443445view=diff
==
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/SyncPolicySpec.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/SyncPolicySpec.java
Thu Feb 7 12:48:25 2013
@@ -91,8 +91,7 @@ public class SyncPolicySpec extends Abst
this.rAltSearchSchemas = rAltSearchSchemas;
}
-@XmlElementWrapper(name = roleJavaRule)
-@XmlElement(name = roleJavaRule)
+
public String getRoleJavaRule() {
return roleJavaRule;
}
@@ -101,8 +100,6 @@ public class SyncPolicySpec extends Abst
this.roleJavaRule = roleJavaRule;
}
-@XmlElementWrapper(name = userJavaRule)
-@XmlElement(name = userJavaRule)
public String getUserJavaRule() {
return userJavaRule;
}
svn commit: r1443475 - in /syncope/trunk: client/src/main/java/org/apache/syncope/client/services/proxy/ common/src/main/java/org/apache/syncope/common/services/ common/src/main/java/org/apache/syncop
Author: fmartelli
Date: Thu Feb 7 13:53:05 2013
New Revision: 1443475
URL: http://svn.apache.org/viewvc?rev=1443475view=rev
Log:
Fix for SYNCOPE-258
Added:
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/CorrelationRuleClassTO.java
- copied, changed from r1443398,
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PropagationActionClassTO.java
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/PolicyServiceProxy.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/PolicyService.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/
(props changed)
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ConflictResolutionAction.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/util/CollectionWrapper.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/PolicyRestClient.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
syncope/trunk/core/src/test/resources/content.xml
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/PolicyServiceProxy.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/PolicyServiceProxy.java?rev=1443475r1=1443474r2=1443475view=diff
==
---
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/PolicyServiceProxy.java
(original)
+++
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/PolicyServiceProxy.java
Thu Feb 7 13:53:05 2013
@@ -20,16 +20,18 @@ package org.apache.syncope.client.servic
import java.net.URI;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
-
+import java.util.Set;
import javax.ws.rs.core.Response;
-
import org.apache.syncope.common.services.PolicyService;
import org.apache.syncope.common.to.AccountPolicyTO;
+import org.apache.syncope.common.to.CorrelationRuleClassTO;
import org.apache.syncope.common.to.PasswordPolicyTO;
import org.apache.syncope.common.to.PolicyTO;
import org.apache.syncope.common.to.SyncPolicyTO;
import org.apache.syncope.common.types.PolicyType;
+import org.apache.syncope.common.util.CollectionWrapper;
import org.springframework.web.client.RestTemplate;
@SuppressWarnings(unchecked)
@@ -120,4 +122,18 @@ public class PolicyServiceProxy extends
return url;
}
}
+
+@Override
+public SetCorrelationRuleClassTO getCorrelationRuleClasses(final
PolicyType type) {
+switch (type) {
+case SYNC:
+case GLOBAL_SYNC:
+final SetString classes = new
HashSetString(Arrays.asList(getRestTemplate().getForObject(
+baseUrl + policy/correlationRuleClasses.json,
String[].class)));
+
+return CollectionWrapper.wrapCorrelationRuleClasses(classes);
+default:
+throw new IllegalArgumentException(Cannot retrieve
correlation rule classes for type + type);
+}
+}
}
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/PolicyService.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/services/PolicyService.java?rev=1443475r1=1443474r2=1443475view=diff
==
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/PolicyService.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/PolicyService.java
Thu Feb 7 13:53:05 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.common.services;
import java.util.List;
+import java.util.Set;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
@@ -26,7 +27,7 @@ import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.core.Response;
-
+import org.apache.syncope.common.to.CorrelationRuleClassTO;
import org.apache.syncope.common.to.PolicyTO;
import org.apache.syncope.common.types.PolicyType;
@@ -83,4 +84,11 @@ public interface PolicyService {
T extends PolicyTO void update(@PathParam(type) PolicyType type,
@PathParam(policyId) Long policyId,
T policyTO);
+/**
+ * @param type PolicyType (just SYNC is supported).
+ * @return Returns correlation rules java classes.
+ */
+@GET
+
svn commit: r1443482 - in /syncope/trunk/core/src/test: java/org/apache/syncope/core/rest/TaskTestITCase.java java/org/apache/syncope/core/rest/UserTestITCase.java resources/content.xml
Author: ilgrosso
Date: Thu Feb 7 13:59:04 2013
New Revision: 1443482
URL: http://svn.apache.org/viewvc?rev=1443482view=rev
Log:
[SYNCOPE-265] Making ws-target-resource-2 non propagation-primary so that
propagation failures aren't blocking
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
syncope/trunk/core/src/test/resources/content.xml
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java?rev=1443482r1=1443481r2=1443482view=diff
==
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
Thu Feb 7 13:59:04 2013
@@ -28,6 +28,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
import javax.ws.rs.core.Response;
+import org.apache.syncope.common.mod.UserMod;
import org.apache.syncope.common.search.AttributableCond;
import org.apache.syncope.common.search.AttributeCond;
import org.apache.syncope.common.search.MembershipCond;
@@ -47,7 +48,6 @@ import org.apache.syncope.common.to.Sync
import org.apache.syncope.common.to.TaskExecTO;
import org.apache.syncope.common.to.TaskTO;
import org.apache.syncope.common.to.UserTO;
-import org.apache.syncope.common.mod.UserMod;
import org.apache.syncope.common.to.SyncPolicyTO;
import org.apache.syncope.common.types.IntMappingType;
import org.apache.syncope.common.types.PolicyType;
@@ -825,7 +825,7 @@ public class TaskTestITCase extends Abst
userMod.addAttributeToBeUpdated(attributeMod(email,
s...@apache.org));
userTO = userService.update(userMod.getId(), userMod);
-
+
execSyncTask(actual.getId(), 50, false);
SyncTaskTO executed = taskService.read(TaskType.SYNCHRONIZATION,
actual.getId());
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java?rev=1443482r1=1443481r2=1443482view=diff
==
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
Thu Feb 7 13:59:04 2013
@@ -33,9 +33,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
-
import javax.ws.rs.core.Response;
-
import org.apache.syncope.common.mod.AttributeMod;
import org.apache.syncope.common.mod.MembershipMod;
import org.apache.syncope.common.mod.UserMod;
@@ -1912,7 +1910,7 @@ public class UserTestITCase extends Abst
// 4. update user, assign a propagation primary resource but don't
provide any password
UserMod userMod = new UserMod();
userMod.setId(userTO.getId());
-userMod.addResourceToBeAdded(ws-target-resource-2);
+userMod.addResourceToBeAdded(ws-target-resource-1);
userTO = userService.update(userMod.getId(), userMod);
assertNotNull(userTO);
@@ -1923,7 +1921,7 @@ public class UserTestITCase extends Abst
assertEquals(1, props.size());
PropagationStatusTO prop = props.iterator().next();
assertNotNull(prop);
-assertEquals(ws-target-resource-2, prop.getResource());
+assertEquals(ws-target-resource-1, prop.getResource());
assertEquals(PropagationTaskExecStatus.SUCCESS, prop.getStatus());
} catch (Exception e) {
LOG.error(Unexpected exception, e);
@@ -1978,5 +1976,4 @@ public class UserTestITCase extends Abst
}
return newMaxId;
}
-
}
Modified: syncope/trunk/core/src/test/resources/content.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/content.xml?rev=1443482r1=1443481r2=1443482view=diff
==
--- syncope/trunk/core/src/test/resources/content.xml (original)
+++ syncope/trunk/core/src/test/resources/content.xml Thu Feb 7 13:59:04 2013
@@ -344,7 +344,7 @@ under the License.
propagationPriority=0 propagationPrimary=1
createTraceLevel=ALL deleteTraceLevel=ALL updateTraceLevel=ALL
syncTraceLevel=ALL/
ExternalResource name=ws-target-resource-2 connector_id=100
randomPwdIfNotProvided=0 enforceMandatoryCondition=1
propagationMode=TWO_PHASES
-propagationPriority=0 propagationPrimary=1
createTraceLevel=FAILURES deleteTraceLevel=NONE
svn commit: r1443510 - in /syncope/trunk/core/src: main/java/org/apache/syncope/core/persistence/beans/ main/java/org/apache/syncope/core/persistence/validation/attrvalue/ test/java/org/apache/syncope
Author: ilgrosso
Date: Thu Feb 7 14:48:47 2013
New Revision: 1443510
URL: http://svn.apache.org/viewvc?rev=1443510view=rev
Log:
White noise: formatting
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Report.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/BasicValidator.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/ReportTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/ReportTest.java
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java?rev=1443510r1=1443509r2=1443510view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java
Thu Feb 7 14:48:47 2013
@@ -18,13 +18,14 @@
*/
package org.apache.syncope.core.persistence.beans;
+import static javax.persistence.EnumType.STRING;
+
import java.lang.reflect.Constructor;
import java.text.DecimalFormat;
import java.text.Format;
import java.text.SimpleDateFormat;
import javax.persistence.Basic;
import javax.persistence.Column;
-import static javax.persistence.EnumType.STRING;
import javax.persistence.Enumerated;
import javax.persistence.Id;
import javax.persistence.Lob;
@@ -157,7 +158,7 @@ public abstract class AbstractSchema ext
validator = (AbstractValidator)
validatorConstructor.newInstance(this);
} catch (Exception e) {
LOG.error(Could not instantiate validator of type +
getValidatorClass()
-+ , reverting to AttributeBasicValidator, e);
++ , reverting to +
BasicValidator.class.getSimpleName(), e);
}
}
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Report.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Report.java?rev=1443510r1=1443509r2=1443510view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Report.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Report.java
Thu Feb 7 14:48:47 2013
@@ -20,14 +20,12 @@ package org.apache.syncope.core.persiste
import java.util.ArrayList;
import java.util.List;
-
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.OneToMany;
-
import org.apache.syncope.common.report.ReportletConf;
import org.apache.syncope.core.persistence.validation.entity.ReportCheck;
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/BasicValidator.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/BasicValidator.java?rev=1443510r1=1443509r2=1443510view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/BasicValidator.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/BasicValidator.java
Thu Feb 7 14:48:47 2013
@@ -19,7 +19,6 @@
package org.apache.syncope.core.persistence.validation.attrvalue;
import java.util.Arrays;
-
import org.apache.syncope.common.types.AttributeSchemaType;
import org.apache.syncope.core.persistence.beans.AbstractAttrValue;
import org.apache.syncope.core.persistence.beans.AbstractSchema;
@@ -33,24 +32,21 @@ public class BasicValidator extends Abst
}
@Override
-protected void doValidate(AbstractAttrValue attributeValue) throws
InvalidAttrValueException {
-
+protected void doValidate(final AbstractAttrValue attributeValue) throws
InvalidAttrValueException {
if (AttributeSchemaType.Enum.equals(schema.getType())) {
final String[] enumeration =
schema.getEnumerationValues().split(AbstractSchema.enumValuesSeparator);
final String value = attributeValue.getStringValue();
-Boolean found = Boolean.FALSE;
-
+boolean found = false;
for (int i = 0; i enumeration.length !found; i++) {
if (enumeration[i].trim().equals(value)) {
-found =
