svn commit: r1443594 - in /syncope/trunk: client/src/main/java/org/apache/syncope/client/services/proxy/ common/src/main/java/org/apache/syncope/common/services/ core/src/main/java/org/apache/syncope/
Author: cschneider Date: Thu Feb 7 16:26:43 2013 New Revision: 1443594 URL: http://svn.apache.org/viewvc?rev=1443594&view=rev Log: SYNCOPE-231 Fixing some more issues with the jaxrs services Added: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/CXFPatchedAuthenticator.java (with props) Modified: syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/SpringServiceProxy.java syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConfigurationService.java syncope/trunk/core/src/main/java/org/apache/syncope/core/services/ConfigurationServiceImpl.java syncope/trunk/core/src/main/java/org/apache/syncope/core/services/ReportServiceImpl.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ReportTestITCase.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/ConfigurationTestITCaseJAXRS.java Modified: syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/SpringServiceProxy.java URL: http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/SpringServiceProxy.java?rev=1443594&r1=1443593&r2=1443594&view=diff == --- syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/SpringServiceProxy.java (original) +++ syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/SpringServiceProxy.java Thu Feb 7 16:26:43 2013 @@ -74,13 +74,11 @@ public abstract class SpringServiceProxy if (httpResponse.getStatusLine().getStatusCode() == HttpStatus.SC_OK) { HttpEntity entity = httpResponse.getEntity(); response = Response.ok(entity.getContent(), entity.getContentType().getValue()). -location(getMethod.getURI()). header(SyncopeConstants.CONTENT_DISPOSITION_HEADER, httpResponse.getLastHeader(SyncopeConstants.CONTENT_DISPOSITION_HEADER).getValue()). build(); } else { response = Response.noContent().status(httpResponse.getStatusLine().getStatusCode()). -location(getMethod.getURI()). build(); } Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConfigurationService.java URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConfigurationService.java?rev=1443594&r1=1443593&r2=1443594&view=diff == --- syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConfigurationService.java (original) +++ syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConfigurationService.java Thu Feb 7 16:26:43 2013 @@ -47,7 +47,7 @@ public interface ConfigurationService { * @return Returns configuration as an downloadable content.xml database export file. */ @GET -@Path("dbDump") +@Path("all/export") Response dbExport(); /** Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/services/ConfigurationServiceImpl.java URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/services/ConfigurationServiceImpl.java?rev=1443594&r1=1443593&r2=1443594&view=diff == --- syncope/trunk/core/src/main/java/org/apache/syncope/core/services/ConfigurationServiceImpl.java (original) +++ syncope/trunk/core/src/main/java/org/apache/syncope/core/services/ConfigurationServiceImpl.java Thu Feb 7 16:26:43 2013 @@ -20,12 +20,16 @@ package org.apache.syncope.core.services import java.io.IOException; import java.io.OutputStream; +import java.io.PrintStream; import java.net.URI; import java.util.List; import java.util.Set; + +import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.StreamingOutput; import javax.ws.rs.core.UriInfo; + import org.apache.syncope.common.SyncopeConstants; import org.apache.syncope.common.services.ConfigurationService; import org.apache.syncope.common.to.ConfigurationTO; @@ -33,6 +37,7 @@ import org.apache.syncope.common.to.Mail import org.apache.syncope.common.to.ValidatorTO; import org.apache.syncope.common.util.CollectionWrapper; import org.apache.syncope.core.rest.controller.ConfigurationController; +import org.apache.syncope.core.util.ImportExport; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -53,13 +58,21 @@ public class Configur
svn commit: r1443553 - in /syncope/trunk: console/src/main/resources/logback.xml core/src/main/resources/audit.xml core/src/main/resources/logback.xml
Author: ilgrosso Date: Thu Feb 7 15:27:23 2013 New Revision: 1443553 URL: http://svn.apache.org/viewvc?rev=1443553&view=rev Log: Cleaning up logback files Modified: syncope/trunk/console/src/main/resources/logback.xml syncope/trunk/core/src/main/resources/audit.xml syncope/trunk/core/src/main/resources/logback.xml Modified: syncope/trunk/console/src/main/resources/logback.xml URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/logback.xml?rev=1443553&r1=1443552&r2=1443553&view=diff == --- syncope/trunk/console/src/main/resources/logback.xml (original) +++ syncope/trunk/console/src/main/resources/logback.xml Thu Feb 7 15:27:23 2013 @@ -16,7 +16,6 @@ software distributed under the License i KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - --> @@ -31,18 +30,6 @@ under the License. - -${log.directory}/console-test.log -true - - ${log.directory}/console-test.log.%d{-MM-dd} - 30 - - - %d{HH:mm:ss.SSS} %-5level %logger - %msg%n - - - @@ -53,11 +40,6 @@ under the License. - - - - - @@ -70,7 +52,7 @@ under the License. - + @@ -78,4 +60,3 @@ under the License. - Modified: syncope/trunk/core/src/main/resources/audit.xml URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/audit.xml?rev=1443553&r1=1443552&r2=1443553&view=diff == --- syncope/trunk/core/src/main/resources/audit.xml (original) +++ syncope/trunk/core/src/main/resources/audit.xml Thu Feb 7 15:27:23 2013 @@ -36,4 +36,4 @@ under the License. - \ No newline at end of file + Modified: syncope/trunk/core/src/main/resources/logback.xml URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/logback.xml?rev=1443553&r1=1443552&r2=1443553&view=diff == --- syncope/trunk/core/src/main/resources/logback.xml (original) +++ syncope/trunk/core/src/main/resources/logback.xml Thu Feb 7 15:27:23 2013 @@ -69,18 +69,6 @@ under the License. - -${log.directory}/core-test.log -true - - ${log.directory}/core-test.log.%d{-MM-dd} - 30 - - - %d{HH:mm:ss.SSS} %-5level %logger - %msg%n - - - @@ -131,26 +119,14 @@ under the License. - - - - - - - - - - - - @@ -158,7 +134,7 @@ under the License. - +
svn commit: r1443511 - /syncope/trunk/pom.xml
Author: ilgrosso Date: Thu Feb 7 14:49:06 2013 New Revision: 1443511 URL: http://svn.apache.org/viewvc?rev=1443511&view=rev Log: Upgrading SOAP connector bundle to 1.2.5 Modified: syncope/trunk/pom.xml Modified: syncope/trunk/pom.xml URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1443511&r1=1443510&r2=1443511&view=diff == --- syncope/trunk/pom.xml (original) +++ syncope/trunk/pom.xml Thu Feb 7 14:49:06 2013 @@ -278,7 +278,7 @@ under the License. 1.2 1.3.2 -1.2.4 +1.2.5 2.1.4 0.5 1.3.4
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=1443510&view=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=1443510&r1=1443509&r2=1443510&view=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=1443510&r1=1443509&r2=1443510&view=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=1443510&r1=1443509&r2=1443510&view=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)) { -
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=1443482&view=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=1443482&r1=1443481&r2=1443482&view=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=1443482&r1=1443481&r2=1443482&view=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=1443482&r1=1443481&r2=1443482&view=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"/> +randomPwdIfNotProvided="0" propagationPriority="0" propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" syncTraceLevel="ALL"/> +randomPwdIfNotProvided="0" propagat
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=1443475&view=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=1443475&r1=1443474&r2=1443475&view=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 Set getCorrelationRuleClasses(final PolicyType type) { +switch (type) { +case SYNC: +case GLOBAL_SYNC: +final Set classes = new HashSet(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=1443475&r1=1443474&r2=1443475&view=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 { 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 +@Path("correlationRuleClasses") +Set getCo
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=1443445&view=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=1443445&r1=1443444&r2=1443445&view=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: 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=1443410&view=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=1443410&r1=1443409&r2=1443410&view=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=1443410&r1=1443409&r2=1443410&view=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"/> - @@ -618,7 +618,7 @@ under the License. extAttrName="USERNAME" intAttrName="virtualdata" intMappingType="UserVirtualSchema" mandatoryCondition="false" /> - +
svn commit: r1443403 - in /syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console: pages/ConnectorModalPage.java pages/panels/ResourceConnConfPanel.java pages/panels/StatusPanel.java
Author: ilgrosso Date: Thu Feb 7 10:59:12 2013 New Revision: 1443403 URL: http://svn.apache.org/viewvc?rev=1443403&view=rev Log: Backporting fix for connector check done for SYNCOPE-265 on trunk Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/StatusPanel.java syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java Modified: syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java?rev=1443403&r1=1443402&r2=1443403&view=diff == --- syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java (original) +++ syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java Thu Feb 7 10:59:12 2013 @@ -25,6 +25,20 @@ import java.util.EnumSet; import java.util.HashSet; import java.util.List; import org.apache.commons.lang.StringUtils; +import org.apache.syncope.client.to.ConnBundleTO; +import org.apache.syncope.client.to.ConnInstanceTO; +import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException; +import org.apache.syncope.console.rest.ConnectorRestClient; +import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel; +import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel; +import org.apache.syncope.console.wicket.markup.html.form.AjaxNumberFieldPanel; +import org.apache.syncope.console.wicket.markup.html.form.AjaxPasswordFieldPanel; +import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; +import org.apache.syncope.console.wicket.markup.html.form.FieldPanel; +import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel; +import org.apache.syncope.types.ConnConfPropSchema; +import org.apache.syncope.types.ConnConfProperty; +import org.apache.syncope.types.ConnectorCapability; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; @@ -51,20 +65,6 @@ import org.apache.wicket.model.PropertyM import org.apache.wicket.model.ResourceModel; import org.apache.wicket.spring.injection.annot.SpringBean; import org.springframework.util.ClassUtils; -import org.apache.syncope.client.to.ConnBundleTO; -import org.apache.syncope.client.to.ConnInstanceTO; -import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException; -import org.apache.syncope.console.rest.ConnectorRestClient; -import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel; -import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel; -import org.apache.syncope.console.wicket.markup.html.form.AjaxNumberFieldPanel; -import org.apache.syncope.console.wicket.markup.html.form.AjaxPasswordFieldPanel; -import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; -import org.apache.syncope.console.wicket.markup.html.form.FieldPanel; -import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel; -import org.apache.syncope.types.ConnConfPropSchema; -import org.apache.syncope.types.ConnConfProperty; -import org.apache.syncope.types.ConnectorCapability; /** * Modal window with Connector form. @@ -104,15 +104,16 @@ public class ConnectorModalPage extends ? EnumSet.noneOf(ConnectorCapability.class) : connectorTO.getCapabilities()); -final IModel> capabilities = new LoadableDetachableModel>() { +final IModel> capabilities = +new LoadableDetachableModel>() { -private static final long serialVersionUID = 5275935387613157437L; +private static final long serialVersionUID = 5275935387613157437L; -@Override -protected List load() { -return Arrays.asList(ConnectorCapability.values()); -} -}; +@Override +protected List load() { +return Arrays.asList(ConnectorCapability.values()); +} +}; final IModel> bundles = new LoadableDetachableModel>() { @@ -322,7 +323,7 @@ public class ConnectorModalPage extends connectorTO.setBundleName(bundleTO.getBundleName()); connectorTO.setVersion(bundleTO.getVersion()); -if (restClient.check(connectorTO).booleanValue()) { +if (restCl
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=1443362&view=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=1443362&r1=1443361&r2=1443362&view=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=1443362&r1=1443361&r2=1443362&view=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=1443362&r1=1443361&r2=1443362&view=diff ==
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=1443356&view=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=1443356&r1=1443355&r2=1443356&view=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=1443356&r1=1443355&r2=1443356&view=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 sospen