import org.argeo.slc.core.structure.tree.TreeSRegistry;
import org.argeo.slc.logging.Log4jUtils;
import org.argeo.slc.runtime.SlcExecutionOutput;
+import org.springframework.beans.factory.BeanFactoryUtils;
import org.springframework.beans.factory.ListableBeanFactory;
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
ListableBeanFactory context = (ListableBeanFactory) project
.getReference(AntConstants.REF_ROOT_CONTEXT);
// Register build listeners
- Map<String, BuildListener> listeners = context.getBeansOfType(
- BuildListener.class, false, true);
+ Map<String, BuildListener> listeners = BeanFactoryUtils
+ .beansOfTypeIncludingAncestors(context, BuildListener.class,
+ false, false);
for (BuildListener listener : listeners.values()) {
project.addBuildListener(listener);
}
if (slcExecution != null) {\r
if (currentStepNotified) {\r
slcExecution.getSteps().add(\r
- new SlcExecutionStep("LOG", event.getMessage()));\r
+ new SlcExecutionStep(event.getMessage()));\r
notifyStep(slcExecution, slcExecution.currentStep());\r
currentStepNotified = true;\r
} else {\r
if (logTaskStartFinish)\r
msg = "Task " + event.getTask().getTaskName() + " started";\r
\r
- slcExecution.getSteps().add(new SlcExecutionStep("LOG", msg));\r
+ slcExecution.getSteps().add(new SlcExecutionStep(msg));\r
\r
currentStepNotified = false;\r
}\r
\r
protected void addLogStep(BuildEvent event, String msg) {\r
SlcExecution slcExecution = getSlcExecution(event);\r
- slcExecution.getSteps().add(new SlcExecutionStep("LOG", msg));\r
+ slcExecution.getSteps().add(new SlcExecutionStep(msg));\r
\r
notifyStep(slcExecution, slcExecution.currentStep());\r
currentStepNotified = true;\r
SlcExecution slcExecution = getSlcExecution(project);\r
if (currentStepNotified) {\r
slcExecution.getSteps().add(\r
- new SlcExecutionStep("LOG", event.getMessage().toString()));\r
+ new SlcExecutionStep(event.getMessage().toString()));\r
currentStepNotified = false;\r
} else {\r
slcExecution.currentStep().addLog(event.getMessage().toString());\r
slcExecution.setUuid(UUID.randomUUID().toString());
slcExecution.getAttributes().put(AntConstants.EXECATTR_ANT_FILE,
scriptPath);
+ slcExecution.setUser("user");
slcApp.execute(slcExecution, null, null, null);
}
import org.springframework.ws.soap.client.SoapFaultClientException;\r
import org.springframework.xml.transform.StringResult;\r
import org.w3c.dom.Node;\r
+import org.w3c.dom.Text;\r
\r
import org.apache.commons.logging.Log;\r
import org.apache.commons.logging.LogFactory;\r
log\r
.error("WS root cause: "\r
+ e.getSoapFault().getFaultStringOrReason());\r
- StringBuffer stack = new StringBuffer("");\r
- SoapFaultDetail detail = e.getSoapFault().getFaultDetail();\r
- if (detail != null) {\r
- Iterator<SoapFaultDetailElement> it = (Iterator<SoapFaultDetailElement>) detail\r
- .getDetailEntries();\r
- while (it.hasNext()) {\r
- SoapFaultDetailElement elem = it.next();\r
- if (elem.getName().getLocalPart().equals("StackElement")) {\r
- Source source = elem.getSource();\r
- if (source instanceof DOMSource) {\r
- Node node = ((DOMSource) source).getNode();\r
- stack.append(node.getTextContent()).append('\n');\r
+ if (log.isTraceEnabled()) {\r
+ StringBuffer stack = new StringBuffer("");\r
+ SoapFaultDetail detail = e.getSoapFault().getFaultDetail();\r
+ if (detail != null) {\r
+ Iterator<SoapFaultDetailElement> it = (Iterator<SoapFaultDetailElement>) detail\r
+ .getDetailEntries();\r
+ while (it.hasNext()) {\r
+ SoapFaultDetailElement elem = it.next();\r
+ if (elem.getName().getLocalPart().equals("StackElement")) {\r
+ Source source = elem.getSource();\r
+ if (source instanceof DOMSource) {\r
+ Node node = ((DOMSource) source).getNode();\r
+ // stack.append(node.getTextContent()).append('\n');\r
+ stack\r
+ .append(\r
+ node.getChildNodes().item(0)\r
+ .getNodeValue()).append(\r
+ '\n');\r
+ }\r
}\r
}\r
- }\r
\r
- if (stack.length() > 0 && log.isTraceEnabled())\r
- log.error("WS root cause stack: " + stack);\r
+ if (stack.length() > 0)\r
+ log.error("WS root cause stack: " + stack);\r
+ }\r
}\r
}\r
\r