Author: fmartelli
Date: Wed Jan 23 15:18:45 2013
New Revision: 1437457
URL: http://svn.apache.org/viewvc?rev=1437457&view=rev
Log:
SYNCOPE-279 fixed
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnInstanceTO.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage_it.properties
syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ConnInstanceLoader.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ConnInstance.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/ConnectorFacadeProxy.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ConnInstanceDataBinder.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java
syncope/trunk/core/src/main/resources/content.xml
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/ConnInstanceTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/ConnInstanceTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java
syncope/trunk/core/src/test/resources/content.xml
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnInstanceTO.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnInstanceTO.java?rev=1437457&r1=1437456&r2=1437457&view=diff
==============================================================================
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnInstanceTO.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnInstanceTO.java
Wed Jan 23 15:18:45 2013
@@ -24,16 +24,14 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
import org.apache.syncope.common.AbstractBaseBean;
import org.apache.syncope.common.types.ConnConfProperty;
import org.apache.syncope.common.types.ConnectorCapability;
+import org.codehaus.jackson.annotate.JsonIgnore;
@XmlRootElement(name = "connector")
@XmlType
@@ -55,6 +53,8 @@ public class ConnInstanceTO extends Abst
private String displayName;
+ private Integer connRequestTimeout;
+
public ConnInstanceTO() {
super();
@@ -164,4 +164,22 @@ public class ConnInstanceTO extends Abst
public void setDisplayName(String displayName) {
this.displayName = displayName;
}
+
+ /**
+ * Get connector request timeout. It is not applied in case of sync, full
reconciliation and search.
+ *
+ * @return timeout.
+ */
+ public Integer getConnRequestTimeout() {
+ return connRequestTimeout;
+ }
+
+ /**
+ * Set connector request timeout. It is not applied in case of sync, full
reconciliation and search.
+ *
+ * @param timeout.
+ */
+ public void setConnRequestTimeout(Integer connRequestTimeout) {
+ this.connRequestTimeout = connRequestTimeout;
+ }
}
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java?rev=1437457&r1=1437456&r2=1437457&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
Wed Jan 23 15:18:45 2013
@@ -26,7 +26,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.syncope.common.to.ConnBundleTO;
import org.apache.syncope.common.to.ConnInstanceTO;
@@ -107,6 +106,7 @@ public class ConnectorModalPage extends
: connectorTO.getCapabilities());
final IModel<List<ConnectorCapability>> capabilities = new
LoadableDetachableModel<List<ConnectorCapability>>() {
+
private static final long serialVersionUID = 5275935387613157437L;
@Override
@@ -164,8 +164,14 @@ public class ConnectorModalPage extends
version.addRequiredLabel();
version.getField().setOutputMarkupId(true);
+ final AjaxTextFieldPanel connRequestTimeout = new AjaxTextFieldPanel(
+ "connRequestTimeout",
+ "connRequestTimeout",
+ new PropertyModel<String>(connectorTO, "connRequestTimeout"));
+
final ListView<ConnConfProperty> view = new ListView<ConnConfProperty>(
"connectorProperties", new
PropertyModel<List<ConnConfProperty>>(this, "properties")) {
+
private static final long serialVersionUID = 9101744072914090143L;
@Override
@@ -250,7 +256,7 @@ public class ConnectorModalPage extends
final AjaxCheckBoxPanel overridable = new
AjaxCheckBoxPanel("connPropAttrOverridable",
"connPropAttrOverridable", new
PropertyModel<Boolean>(property, "overridable"));
-
+
item.add(overridable);
connectorTO.addConfiguration(property);
}
@@ -259,6 +265,7 @@ public class ConnectorModalPage extends
view.setOutputMarkupId(true);
bundleName.getField().add(new
AjaxFormComponentUpdatingBehavior("onchange") {
+
private static final long serialVersionUID = -1107858522700306810L;
@Override
@@ -279,6 +286,7 @@ public class ConnectorModalPage extends
});
version.getField().add(new
AjaxFormComponentUpdatingBehavior("onchange") {
+
private static final long serialVersionUID = -1107858522700306810L;
@Override
@@ -296,6 +304,7 @@ public class ConnectorModalPage extends
});
final AjaxLink<String> check = new IndicatingAjaxLink<String>("check",
new ResourceModel("check")) {
+
private static final long serialVersionUID = -7978723352517770644L;
@Override
@@ -314,6 +323,7 @@ public class ConnectorModalPage extends
};
final AjaxButton submit = new IndicatingAjaxButton("apply", new
Model<String>(getString("submit"))) {
+
private static final long serialVersionUID = -958724007591692537L;
@Override
@@ -333,7 +343,7 @@ public class ConnectorModalPage extends
if (connectorTO.getId() == 0) {
restClient.create(conn);
} else {
- restClient.update(conn);
+ restClient.update(conn);
}
((Resources) callerPageRef.getPage()).setModalResult(true);
@@ -354,6 +364,7 @@ public class ConnectorModalPage extends
};
final IndicatingAjaxButton cancel = new IndicatingAjaxButton("cancel",
new ResourceModel("cancel")) {
+
private static final long serialVersionUID = -958724007591692537L;
@Override
@@ -374,7 +385,8 @@ public class ConnectorModalPage extends
MetaDataRoleAuthorizationStrategy.authorize(submit, ENABLE, roles);
- capabilitiesPalette = new
CheckBoxMultipleChoice<ConnectorCapability>("capabilitiesPalette", new
PropertyModel<List<ConnectorCapability>>(this,
+ capabilitiesPalette = new
CheckBoxMultipleChoice<ConnectorCapability>("capabilitiesPalette",
+ new PropertyModel<List<ConnectorCapability>>(this,
"selectedCapabilities"), capabilities);
final Form<ConnInstanceTO> connectorForm = new
Form<ConnInstanceTO>("form");
@@ -396,6 +408,7 @@ public class ConnectorModalPage extends
connectorForm.add(bundleName);
connectorForm.add(displayName);
connectorForm.add(version);
+ connectorForm.add(connRequestTimeout);
connectorForm.add(capabilitiesPalette);
connectorForm.add(submit);
connectorForm.add(cancel);
@@ -433,7 +446,7 @@ public class ConnectorModalPage extends
propertyTO.setSchema(key);
if (connTO.getId() != 0 &&
connTO.getConfigurationMap().containsKey(key.getName())) {
propertyTO.setValues(connTO.getConfigurationMap().get(key.getName()).getValues());
-
propertyTO.setOverridable(connTO.getConfigurationMap().get(key.getName()).isOverridable());
+
propertyTO.setOverridable(connTO.getConfigurationMap().get(key.getName()).isOverridable());
}
props.add(propertyTO);
}
Modified:
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.html
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.html?rev=1437457&r1=1437456&r2=1437457&view=diff
==============================================================================
---
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.html
(original)
+++
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.html
Wed Jan 23 15:18:45 2013
@@ -67,6 +67,14 @@ under the License.
<span wicket:id="version">[version]</span>
</div>
</div>
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="connRequestTimeout"><wicket:message
key="connRequestTimeout"/></label>
+ </div>
+ <div class="tablecolumn_field short_dynamicsize">
+ <span wicket:id="connRequestTimeout">[connRequestTimeout]</span>
+ </div>
+ </div>
</div>
<!-- inside the container in order to re-process javascript -->
<script type="text/javascript">
Modified:
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.properties
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.properties?rev=1437457&r1=1437456&r2=1437457&view=diff
==============================================================================
---
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.properties
(original)
+++
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.properties
Wed Jan 23 15:18:45 2013
@@ -20,6 +20,7 @@ tab3=Capabilities
displayName=Display name
bundleName=Bundle name
version=Version
+connRequestTimeout=Request timeout (in seconds)
action=Action
edit=Edit
edit_attribute=Edit attribute
Modified:
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage_it.properties
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage_it.properties?rev=1437457&r1=1437456&r2=1437457&view=diff
==============================================================================
---
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage_it.properties
(original)
+++
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage_it.properties
Wed Jan 23 15:18:45 2013
@@ -19,6 +19,7 @@ tab2=Configurazione
tab3=Capabilities
bundleName=Bundle name
version=Versione
+connRequestTimeout=Timeout richiesta (in secondi)
action=Azione
edit=Edit
edit_attribute=Edit attribute
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ConnInstanceLoader.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ConnInstanceLoader.java?rev=1437457&r1=1437456&r2=1437457&view=diff
==============================================================================
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ConnInstanceLoader.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ConnInstanceLoader.java
Wed Jan 23 15:18:45 2013
@@ -20,7 +20,6 @@ package org.apache.syncope.core.init;
import java.util.Locale;
import java.util.Set;
-
import org.apache.commons.lang.SerializationUtils;
import org.apache.syncope.common.types.ConnConfProperty;
import org.apache.syncope.core.persistence.beans.ConnInstance;
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ConnInstance.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ConnInstance.java?rev=1437457&r1=1437456&r2=1437457&view=diff
==============================================================================
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ConnInstance.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ConnInstance.java
Wed Jan 23 15:18:45 2013
@@ -23,7 +23,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.ElementCollection;
@@ -34,7 +33,6 @@ import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.Lob;
import javax.persistence.OneToMany;
-
import org.apache.syncope.common.types.ConnConfProperty;
import org.apache.syncope.common.types.ConnectorCapability;
import org.apache.syncope.core.util.XMLSerializer;
@@ -44,6 +42,8 @@ public class ConnInstance extends Abstra
private static final long serialVersionUID = -2294708794497208872L;
+ private static final int DEFAULT_TIMEOUT = 10;
+
@Id
private Long id;
@@ -88,9 +88,16 @@ public class ConnInstance extends Abstra
/**
* External resources associated to the connector.
*/
- @OneToMany(cascade = { CascadeType.ALL }, mappedBy = "connector")
+ @OneToMany(cascade = {CascadeType.ALL}, mappedBy = "connector")
private List<ExternalResource> resources;
+ /**
+ * Connector request timeout. It is not applied in case of sync, full
reconciliation and search.
+ * DEFAULT_TIMEOUT is the default value to be used in case of unspecified
timeout.
+ */
+ @Column
+ private Integer connRequestTimeout = DEFAULT_TIMEOUT;
+
public ConnInstance() {
super();
capabilities = new HashSet<ConnectorCapability>();
@@ -182,4 +189,15 @@ public class ConnInstance extends Abstra
this.capabilities.addAll(capabilities);
}
}
+
+ public Integer getConnRequestTimeout() {
+ // DEFAULT_TIMEOUT will be returned in case of null timeout:
+ // * instances created by the content loader
+ // * or with a timeout nullified explicitely
+ return connRequestTimeout == null ? DEFAULT_TIMEOUT :
connRequestTimeout;
+ }
+
+ public void setConnRequestTimeout(Integer connRequestTimeout) {
+ this.connRequestTimeout = connRequestTimeout;
+ }
}
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/ConnectorFacadeProxy.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/ConnectorFacadeProxy.java?rev=1437457&r1=1437456&r2=1437457&view=diff
==============================================================================
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/ConnectorFacadeProxy.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/ConnectorFacadeProxy.java
Wed Jan 23 15:18:45 2013
@@ -33,7 +33,6 @@ import org.apache.syncope.common.types.P
import org.apache.syncope.common.types.ResourceOperation;
import org.apache.syncope.core.persistence.beans.AbstractMappingItem;
import org.apache.syncope.core.persistence.beans.ConnInstance;
-import org.apache.syncope.core.persistence.dao.ConfDAO;
import org.apache.syncope.core.persistence.dao.MissingConfKeyException;
import org.apache.syncope.core.propagation.SyncopeConnector;
import org.apache.syncope.core.propagation.TimeoutException;
@@ -89,23 +88,9 @@ public class ConnectorFacadeProxy implem
*/
private final ConnInstance activeConnInstance;
- private int timeout;
-
@Autowired
private AsyncConnectorFacade asyncFacade;
- @Autowired
- private ConfDAO confDAO;
-
- @Autowired
- private void setTimeout() {
- try {
- timeout =
Integer.parseInt(confDAO.find("connectorRequest.timeout", "60").getValue());
- } catch (Throwable t) {
- timeout = 60;
- }
- }
-
/**
* Use the passed connector instance to build a ConnectorFacade that will
be used to make all wrapped calls.
*
@@ -198,7 +183,7 @@ public class ConnectorFacadeProxy implem
final Future<Uid> future = asyncFacade.create(connector,
objectClass, attrs, options);
try {
- result = future.get(timeout, TimeUnit.SECONDS);
+ result =
future.get(activeConnInstance.getConnRequestTimeout(), TimeUnit.SECONDS);
} catch (java.util.concurrent.TimeoutException e) {
future.cancel(true);
throw new TimeoutException("Request timeout");
@@ -236,7 +221,7 @@ public class ConnectorFacadeProxy implem
final Future<Uid> future = asyncFacade.update(connector,
objectClass, uid, attrs, options);
try {
- result = future.get(timeout, TimeUnit.SECONDS);
+ result =
future.get(activeConnInstance.getConnRequestTimeout(), TimeUnit.SECONDS);
} catch (java.util.concurrent.TimeoutException e) {
future.cancel(true);
throw new TimeoutException("Request timeout");
@@ -273,7 +258,7 @@ public class ConnectorFacadeProxy implem
final Future<Uid> future = asyncFacade.delete(connector,
objectClass, uid, options);
try {
- future.get(timeout, TimeUnit.SECONDS);
+ future.get(activeConnInstance.getConnRequestTimeout(),
TimeUnit.SECONDS);
} catch (java.util.concurrent.TimeoutException e) {
future.cancel(true);
throw new TimeoutException("Request timeout");
@@ -317,7 +302,7 @@ public class ConnectorFacadeProxy implem
final Future<SyncToken> future =
asyncFacade.getLatestSyncToken(connector, objectClass);
try {
- result = future.get(timeout, TimeUnit.SECONDS);
+ result =
future.get(activeConnInstance.getConnRequestTimeout(), TimeUnit.SECONDS);
} catch (java.util.concurrent.TimeoutException e) {
future.cancel(true);
throw new TimeoutException("Request timeout");
@@ -389,7 +374,7 @@ public class ConnectorFacadeProxy implem
}
try {
- return future == null ? null : future.get(timeout,
TimeUnit.SECONDS);
+ return future == null ? null :
future.get(activeConnInstance.getConnRequestTimeout(), TimeUnit.SECONDS);
} catch (java.util.concurrent.TimeoutException e) {
future.cancel(true);
throw new TimeoutException("Request timeout");
@@ -454,7 +439,7 @@ public class ConnectorFacadeProxy implem
final Future<Attribute> future =
asyncFacade.getObjectAttribute(connector, objectClass, uid, options,
attributeName);
try {
- return future.get(timeout, TimeUnit.SECONDS);
+ return future.get(activeConnInstance.getConnRequestTimeout(),
TimeUnit.SECONDS);
} catch (java.util.concurrent.TimeoutException e) {
future.cancel(true);
throw new TimeoutException("Request timeout");
@@ -476,7 +461,7 @@ public class ConnectorFacadeProxy implem
final OperationOptions options) {
final Future<Set<Attribute>> future =
asyncFacade.getObjectAttributes(connector, objectClass, uid, options);
try {
- return future.get(timeout, TimeUnit.SECONDS);
+ return future.get(activeConnInstance.getConnRequestTimeout(),
TimeUnit.SECONDS);
} catch (java.util.concurrent.TimeoutException e) {
future.cancel(true);
throw new TimeoutException("Request timeout");
@@ -497,7 +482,7 @@ public class ConnectorFacadeProxy implem
public Set<String> getSchema(final boolean showall) {
final Future<Set<String>> future = asyncFacade.getSchema(connector,
showall);
try {
- return future.get(timeout, TimeUnit.SECONDS);
+ return future.get(activeConnInstance.getConnRequestTimeout(),
TimeUnit.SECONDS);
} catch (java.util.concurrent.TimeoutException e) {
future.cancel(true);
throw new TimeoutException("Request timeout");
@@ -518,7 +503,7 @@ public class ConnectorFacadeProxy implem
public void validate() {
final Future<String> future = asyncFacade.test(connector);
try {
- future.get(timeout, TimeUnit.SECONDS);
+ future.get(activeConnInstance.getConnRequestTimeout(),
TimeUnit.SECONDS);
} catch (java.util.concurrent.TimeoutException e) {
future.cancel(true);
throw new TimeoutException("Request timeout");
@@ -539,7 +524,7 @@ public class ConnectorFacadeProxy implem
public void test() {
final Future<String> future = asyncFacade.test(connector);
try {
- future.get(timeout, TimeUnit.SECONDS);
+ future.get(activeConnInstance.getConnRequestTimeout(),
TimeUnit.SECONDS);
} catch (java.util.concurrent.TimeoutException e) {
future.cancel(true);
throw new TimeoutException("Request timeout");
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ConnInstanceDataBinder.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ConnInstanceDataBinder.java?rev=1437457&r1=1437456&r2=1437457&view=diff
==============================================================================
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ConnInstanceDataBinder.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ConnInstanceDataBinder.java
Wed Jan 23 15:18:45 2013
@@ -124,6 +124,10 @@ public class ConnInstanceDataBinder {
if (connInstanceTO.getDisplayName() != null) {
connInstance.setDisplayName(connInstanceTO.getDisplayName());
}
+
+ if (connInstanceTO.getConnRequestTimeout() != null) {
+
connInstance.setConnRequestTimeout(connInstanceTO.getConnRequestTimeout());
+ }
connInstance.setCapabilities(connInstanceTO.getCapabilities());
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java?rev=1437457&r1=1437456&r2=1437457&view=diff
==============================================================================
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java
Wed Jan 23 15:18:45 2013
@@ -85,7 +85,6 @@ import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.context.SecurityContextHolder;
public class SyncopeSyncResultHandler implements SyncResultsHandler {
@@ -247,7 +246,6 @@ public class SyncopeSyncResultHandler im
@Override
public boolean handle(final SyncDelta delta) {
try {
- LOG.error("AAAAAAAAAAAAAAAAAAAAAAAAAAAA in handle {}",
SecurityContextHolder.getContext().getAuthentication());
results.addAll(doHandle(delta));
return true;
} catch (JobExecutionException e) {
@@ -545,7 +543,8 @@ public class SyncopeSyncResultHandler im
}
protected List<SyncResult> update(SyncDelta delta, final List<Long>
subjects, final AttributableUtil attrUtil,
- final boolean dryRun) throws JobExecutionException {
+ final boolean dryRun)
+ throws JobExecutionException {
if (!syncTask.isPerformUpdate()) {
LOG.debug("SyncTask not configured for update");
@@ -636,7 +635,8 @@ public class SyncopeSyncResultHandler im
}
protected List<SyncResult> delete(SyncDelta delta, final List<Long>
subjects, final AttributableUtil attrUtil,
- final boolean dryRun) throws JobExecutionException {
+ final boolean dryRun)
+ throws JobExecutionException {
if (!syncTask.isPerformDelete()) {
LOG.debug("SyncTask not configured for delete");
@@ -714,7 +714,8 @@ public class SyncopeSyncResultHandler im
* @return list of synchronization results
* @throws JobExecutionException in case of synchronization failure.
*/
- protected final List<SyncResult> doHandle(final SyncDelta delta) throws
JobExecutionException {
+ protected final List<SyncResult> doHandle(final SyncDelta delta)
+ throws JobExecutionException {
final List<SyncResult> results = new ArrayList<SyncResult>();
LOG.debug("Process {} for {} as {}",
Modified: syncope/trunk/core/src/main/resources/content.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/content.xml?rev=1437457&r1=1437456&r2=1437457&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/content.xml (original)
+++ syncope/trunk/core/src/main/resources/content.xml Wed Jan 23 15:18:45 2013
@@ -30,7 +30,6 @@ under the License.
<SyncopeConf confKey="token.length" confValue="256"/>
<SyncopeConf confKey="token.expireTime" confValue="60"/>
<SyncopeConf confKey="createRequest.allowed" confValue="true"/>
- <SyncopeConf confKey="connectorRequest.timeout" confValue="10"/>
<Policy DTYPE="SyncPolicy" id="1" description="Global Sync Policy"
type="GLOBAL_SYNC"
specification="%3Corg.apache.syncope.common.types.SyncPolicySpec%2F%3E"/>
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/ConnInstanceTest.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/ConnInstanceTest.java?rev=1437457&r1=1437456&r2=1437457&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/ConnInstanceTest.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/ConnInstanceTest.java
Wed Jan 23 15:18:45 2013
@@ -18,17 +18,12 @@
*/
package org.apache.syncope.core.persistence.dao;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
import org.apache.syncope.common.types.ConnConfPropSchema;
import org.apache.syncope.common.types.ConnConfProperty;
import org.apache.syncope.core.persistence.beans.ConnInstance;
@@ -79,6 +74,8 @@ public class ConnInstanceTest extends Ab
connectorInstance.setDisplayName("New");
+ connectorInstance.setConnRequestTimeout(60);
+
// set the connector configuration using PropertyTO
Set<ConnConfProperty> conf = new HashSet<ConnConfProperty>();
@@ -121,6 +118,8 @@ public class ConnInstanceTest extends Ab
assertEquals("New", actual.getDisplayName());
+ assertEquals(new Integer(60), actual.getConnRequestTimeout());
+
conf = connectorInstance.getConfiguration();
assertFalse(conf.isEmpty());
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/ConnInstanceTest.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/ConnInstanceTest.java?rev=1437457&r1=1437456&r2=1437457&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/ConnInstanceTest.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/ConnInstanceTest.java
Wed Jan 23 15:18:45 2013
@@ -18,14 +18,9 @@
*/
package org.apache.syncope.core.persistence.relationships;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import java.util.List;
-
import org.apache.syncope.common.types.ConnectorCapability;
import org.apache.syncope.core.persistence.beans.ConnInstance;
import org.apache.syncope.core.persistence.beans.ExternalResource;
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java?rev=1437457&r1=1437456&r2=1437457&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java
Wed Jan 23 15:18:45 2013
@@ -18,11 +18,7 @@
*/
package org.apache.syncope.core.rest;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import java.io.IOException;
import java.io.InputStream;
@@ -32,9 +28,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-
import javax.ws.rs.core.Response;
-
import org.apache.syncope.common.to.ConnBundleTO;
import org.apache.syncope.common.to.ConnInstanceTO;
import org.apache.syncope.common.to.MappingItemTO;
@@ -64,7 +58,8 @@ public class ConnInstanceTestITCase exte
private static String bundlesDirectory;
@BeforeClass
- public static void init() throws IOException {
+ public static void init()
+ throws IOException {
Properties props = new Properties();
InputStream propStream = null;
try {
@@ -106,6 +101,8 @@ public class ConnInstanceTestITCase exte
connectorTO.setDisplayName("Display name");
+ connectorTO.setConnRequestTimeout(15);
+
// set the connector configuration using PropertyTO
Set<ConnConfProperty> conf = new HashSet<ConnConfProperty>();
@@ -146,6 +143,7 @@ public class ConnInstanceTestITCase exte
assertEquals(actual.getConnectorName(),
connectorTO.getConnectorName());
assertEquals(actual.getVersion(), connectorTO.getVersion());
assertEquals("Display name", actual.getDisplayName());
+ assertEquals(new Integer(15), actual.getConnRequestTimeout());
assertEquals(connectorTO.getCapabilities(), actual.getCapabilities());
Throwable t = null;
@@ -200,6 +198,8 @@ public class ConnInstanceTestITCase exte
// set bundle name
connectorTO.setBundleName("org.connid.bundles.soap");
+
+ connectorTO.setConnRequestTimeout(20);
// set the connector configuration using PropertyTO
Set<ConnConfProperty> conf = new HashSet<ConnConfProperty>();
@@ -237,6 +237,7 @@ public class ConnInstanceTestITCase exte
assertEquals(actual.getBundleName(), connectorTO.getBundleName());
assertEquals(actual.getConnectorName(),
connectorTO.getConnectorName());
assertEquals(actual.getVersion(), connectorTO.getVersion());
+ assertEquals(new Integer(20), actual.getConnRequestTimeout());
}
@Test
@@ -565,8 +566,7 @@ public class ConnInstanceTestITCase exte
keyColumnSchema.setRequired(true);
ConnConfProperty servicename = new ConnConfProperty();
servicename.setSchema(keyColumnSchema);
- servicename
-
.setValues(Collections.singletonList("org.connid.bundles.soap.provisioning.interfaces.Provisioning"));
+
servicename.setValues(Collections.singletonList("org.connid.bundles.soap.provisioning.interfaces.Provisioning"));
servicename.setOverridable(false);
conf.add(endpoint);
Modified: syncope/trunk/core/src/test/resources/content.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/content.xml?rev=1437457&r1=1437456&r2=1437457&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/content.xml (original)
+++ syncope/trunk/core/src/test/resources/content.xml Wed Jan 23 15:18:45 2013
@@ -30,7 +30,6 @@ under the License.
<SyncopeConf confKey="token.length" confValue="256"/>
<SyncopeConf confKey="token.expireTime" confValue="60"/>
<SyncopeConf confKey="createRequest.allowed" confValue="true"/>
- <SyncopeConf confKey="connectorRequest.timeout" confValue="10"/>
<!-- sample policies -->
<Policy DTYPE="SyncPolicy" id="1" description="sync policy 1"
type="GLOBAL_SYNC"
specification="%3Corg.apache.syncope.common.types.SyncPolicySpec%2F%3E"/>
@@ -275,6 +274,7 @@ under the License.
bundleName="org.connid.bundles.soap"
connectorName="org.connid.bundles.soap.WebServiceConnector"
version="${connid.soap.version}"
+ connRequestTimeout="10"
xmlConfiguration="%3Cset%3E%0A++%3Corg.apache.syncope.common.types.ConnConfProperty%3E%0A++++%3Cschema%3E%0A++++++%3Cname%3Eservicename%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%3Eorg.connid.bundles.soap.provisioning.interfaces.Provisioning%3C/java.lang.String%3E%0A%3C/values%3E%0A++++%3Coverridable%3Efalse%3C/overridable%3E%0A++%3C/org.apache.syncope.common.types.ConnConfProperty%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/wssample/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/s
et%3E"/>
<ConnInstance_capabilities ConnInstance_id="102"
capabilities="ONE_PHASE_CREATE"/>
<ConnInstance_capabilities ConnInstance_id="102"
capabilities="ONE_PHASE_UPDATE"/>
