Set default timeout to 60s

git-svn-id: https://svn.argeo.org/slc/trunk@5966 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/modules/org.argeo.slc.agent/META-INF/spring/agent.xml b/modules/org.argeo.slc.agent/META-INF/spring/agent.xml
index 38cc1d4e1a06eb9724908690f25b164fd3613ef9..64d61ef60d579f9c5a977ed31bd34f3bdfcd073e 100644 (file)
--- a/modules/org.argeo.slc.agent/META-INF/spring/agent.xml
+++ b/modules/org.argeo.slc.agent/META-INF/spring/agent.xml
@@ -11,16 +11,20 @@
                <property name="bundlesManager" ref="bundlesManager" />\r
        </bean>\r
 \r
-       <bean id="bundlesManager" class="org.argeo.slc.osgi.BundlesManager" />\r
+       <bean id="bundlesManager" class="org.argeo.slc.osgi.BundlesManager">\r
+       <property name="defaultTimeout" value=""/>\r
+       </bean>\r
 \r
        <!-- Logging -->\r
-<!--   <bean id="log4Notification" class="org.argeo.slc.log4j.SlcExecutionAppender" -->\r
-<!--           init-method="init" destroy-method="destroy"> -->\r
-<!--           <property name="disabled" value="${slc.agent.log4Notification.disabled}" /> -->\r
-<!--           <property name="level" value="${slc.agent.log4Notification.level}" /> -->\r
-<!--           <property name="onlyExecutionThread" -->\r
-<!--                   value="${slc.agent.log4Notification.onlyExecutionThread}" /> -->\r
-<!--   </bean> -->\r
+       <!-- <bean id="log4Notification" class="org.argeo.slc.log4j.SlcExecutionAppender" -->\r
+       <!-- init-method="init" destroy-method="destroy"> -->\r
+       <!-- <property name="disabled" value="${slc.agent.log4Notification.disabled}" \r
+               /> -->\r
+       <!-- <property name="level" value="${slc.agent.log4Notification.level}" \r
+               /> -->\r
+       <!-- <property name="onlyExecutionThread" -->\r
+       <!-- value="${slc.agent.log4Notification.onlyExecutionThread}" /> -->\r
+       <!-- </bean> -->\r
 \r
 \r
 </beans>
\ No newline at end of file

diff --git a/modules/org.argeo.slc.agent/agent.properties b/modules/org.argeo.slc.agent/agent.properties
index d4cea2e2cc23e5dce191c9b04073621522c2ee4a..ae0950c6c0b6e05b97310c53acdb24b30ce4997a 100644 (file)
--- a/modules/org.argeo.slc.agent/agent.properties
+++ b/modules/org.argeo.slc.agent/agent.properties
@@ -1,7 +1,8 @@
+slc.agent.osgi.defaultTimeout=60000
 
 # Disable LOG4J notification to the process
-slc.agent.log4Notification.disabled=false
+#slc.agent.log4Notification.disabled=false
 # Notification level
-slc.agent.log4Notification.level=
+#slc.agent.log4Notification.level=
 # Do not log sub threads (those started by the process)
-slc.agent.log4Notification.onlyExecutionThread=false
+#slc.agent.log4Notification.onlyExecutionThread=false