<projects>\r
</projects>\r
<buildSpec>\r
- <buildCommand>\r
- <name>org.eclipse.wst.common.project.facet.core.builder</name>\r
- <arguments>\r
- </arguments>\r
- </buildCommand>\r
<buildCommand>\r
<name>org.maven.ide.eclipse.maven2Builder</name>\r
<arguments>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
- <buildCommand>\r
- <name>org.eclipse.wst.validation.validationbuilder</name>\r
- <arguments>\r
- </arguments>\r
- </buildCommand>\r
</buildSpec>\r
<natures>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>\r
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>\r
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>\r
</natures>\r
</projectDescription>\r
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>\r
-<project-modules id="moduleCoreId" project-version="1.5.0">\r
-<wb-module deploy-name="org.argeo.slc.core">\r
-<wb-resource deploy-path="/" source-path="/src/main/java"/>\r
-<wb-resource deploy-path="/" source-path="/src/main/resources"/>\r
-<wb-resource deploy-path="/" source-path="/src/test/java"/>\r
-<wb-resource deploy-path="/" source-path="/src/test/resources"/>\r
-</wb-module>\r
-</project-modules>\r
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>\r
-<faceted-project>\r
- <fixed facet="jst.utility"/>\r
- <fixed facet="jst.java"/>\r
- <installed facet="jst.java" version="5.0"/>\r
- <installed facet="jst.utility" version="1.0"/>\r
-</faceted-project>\r
+++ /dev/null
-#Sun Dec 16 00:03:13 CET 2007\r
-DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;\r
-USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator;org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsf.validation.internal.JSPSemanticsValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidator;\r
-USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator;org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsf.validation.internal.JSPSemanticsValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidator;\r
-USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.1.102.v200709122200\r
-eclipse.preferences.version=1\r
public static String DEFAULT_TEST_RUN_PROPERTY = "slc.defaultTestRun";\r
\r
// SLC LOCAL PROPERTIES\r
- /** Property for the dir description (SLC local property file). */\r
- public static String DIR_DESCRIPTION_PROPERTY = "slc.dirDescription";\r
+ /** Property for the dir label (SLC local property file). */\r
+ public static String DIR_LABEL_PROPERTY = "slc.dirLabel";\r
\r
private String slcRootFileName = "slcRoot.properties";\r
private String slcLocalFileName = "slcLocal.properties";\r
/**\r
* Looks for a file named {@link #getSlcLocalFileName()} in the directory,\r
* loads it as properties file and return the value of the property\r
- * {@link #DIR_DESCRIPTION_PROPERTY}.\r
+ * {@link #DIR_LABEL_PROPERTY}.\r
*/\r
public String getDescriptionForDir(File dir) {\r
String description = dir.getName();\r
if (slcLocal.exists()) {\r
Properties properties = loadFile(slcLocal.getAbsolutePath());\r
description = properties.getProperty(\r
- SlcAntConfig.DIR_DESCRIPTION_PROPERTY, description);\r
+ SlcAntConfig.DIR_LABEL_PROPERTY, description);\r
}\r
return description;\r
}\r
import org.apache.tools.ant.BuildException;\r
import org.apache.tools.ant.Target;\r
\r
+import org.argeo.slc.ant.SlcAntException;\r
import org.argeo.slc.ant.SlcProjectHelper;\r
import org.argeo.slc.ant.spring.AbstractSpringArg;\r
import org.argeo.slc.ant.spring.AbstractSpringTask;\r
private TreeSPath path;\r
private final List<AbstractSpringArg> sAwareArgs = new Vector<AbstractSpringArg>();\r
\r
+ private StructureElementArg structureElementArg;\r
+\r
@Override\r
public void init() throws BuildException {\r
StructureRegistry registry = getRegistry();\r
}\r
\r
/**\r
- * Includes this arg in the checks for propagation of sstructure related\r
+ * Includes this arg in the checks for propagation of structure related\r
* information.\r
*/\r
protected void addSAwareArg(AbstractSpringArg arg) {\r
TreeSPath targetPath = createTargetPath(getOwningTarget());\r
TreeSPath taskPath = targetPath.createChild(getTaskName()\r
+ targetPath.listChildren(getRegistry()).size());\r
- getRegistry().register(taskPath, this);\r
+ if (structureElementArg != null)\r
+ getRegistry().register(taskPath,\r
+ structureElementArg.getStructureElement());\r
+ else\r
+ getRegistry().register(taskPath, this);\r
+\r
path = taskPath;\r
\r
// notify registered args\r
/** Actions to be executed by the implementor. */\r
protected abstract void executeActions(String mode);\r
\r
+ /** Create a reference to an external structure element. */\r
+ public StructureElementArg createStructureElement() {\r
+ if (structureElementArg != null)\r
+ throw new SlcAntException("Arg already set.");\r
+ structureElementArg = new StructureElementArg();\r
+ return structureElementArg;\r
+ }\r
+\r
/** Gets the underlying structure registry. */\r
protected StructureRegistry getRegistry() {\r
return (StructureRegistry) getProject().getReference(\r
}\r
\r
}\r
+\r
+class StructureElementArg extends AbstractSpringArg {\r
+ public StructureElement getStructureElement() {\r
+ return (StructureElement) getBeanInstance();\r
+ }\r
+}
\ No newline at end of file
StructureElement treeSElement = element;\r
elements.add(treeSElement);\r
paths.add(path);\r
- log.debug("Registered " + path + " (desc: '"\r
+ log.debug("Registered " + path + " (label: '"\r
+ treeSElement.getLabel() + "', position: "\r
+ elements.size() + ")");\r
}\r
\r
private Integer status;\r
private String message;\r
- private Throwable exception;\r
+ private Exception exception;\r
\r
public SimpleResultPart() {\r
}\r
this(status, message, null);\r
}\r
\r
- public SimpleResultPart(Integer status, String message, Throwable exception) {\r
+ public SimpleResultPart(Integer status, String message, Exception exception) {\r
this.status = status;\r
this.message = message;\r
this.exception = exception;\r
return status;\r
}\r
\r
- public Throwable getException() {\r
+ public Exception getException() {\r
return exception;\r
}\r
\r
- public void setException(Throwable exception) {\r
+ public void setException(Exception exception) {\r
this.exception = exception;\r
}\r
\r