ff-attic/x4o
2
0
Fork 0
Code Issues 2 Pull requests Activity

Updated build config and profiles and added keyed error reporting for

Browse source 
tasks.
This commit is contained in:
Willem Cazander 2013-09-01 15:18:11 +02:00
parent 9775c521a4
commit 9e8067c946
15 changed files with 227 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

74
x4o-tool/x4o-tool-maven-plugin/pom.xml
View file

@ -23,26 +23,26 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>3.0</version>
<version>${maven-plugin-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.2</version>
<version>${maven-plugin-annotations.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>2.0</version>
<version>${maven-plugin-testing-harness.version}</version>
<scope>test</scope>
</dependency>
<!-- generated help mojo has a dependency to plexus-utils -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.0.1</version>
<version>${plexus-utils.version}</version>
</dependency>
</dependencies>
<build>
@ -50,7 +50,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.2</version>
<version>${maven-plugin-plugin.version}</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
@ -67,66 +67,4 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>build-site-x4o-support</id>
<build>
<plugins>
<plugin>
<groupId>org.x4o.plugin</groupId>
<artifactId>x4o-plugin-maven</artifactId>
<version>${project.version}</version>
<executions>
<execution>
<id>build-site-x4o-support</id>
<phase>pre-site</phase>
<configuration>
<languageName>cel</languageName>
<taskId>eld-xsd</taskId>
<taskPropertyValues>
<taskPropertyValue>http://language.x4o.org/xml/properties/eld-xsd/output/path=${basedir}/../../target/site/x4o-support</taskPropertyValue>
</taskPropertyValues>
<!-- TODO: add exe'ids
<outputDirectory>${basedir}/../../target/site/x4o-support</outputDirectory>
<languages>
<cel>ALL</cel>
<eld>ALL</eld>
<test>ALL</test>
<swixml>2.0-3.0</swixml>
</languages>
-->
</configuration>
<goals>
<goal>x4o-language-task</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.x4o</groupId>
<artifactId>x4o-driver</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.x4o</groupId>
<artifactId>x4o-driver</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.x4o</groupId>
<artifactId>x4o-eld-doc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>de.odysseus.juel</groupId>
<artifactId>juel</artifactId>
<version>${juel.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
</project>

14
x4o-tool/x4o-tool-maven-plugin/src/main/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojo.java
View file

@ -45,16 +45,16 @@ public class X4OLanguageTaskMojo extends AbstractMojo {
static public final String GOAL = "x4o-language-task";
@Parameter
@Parameter(property="languageName")
private String languageName = null;
@Parameter
@Parameter(property="languageVersion")
private String languageVersion = null;
@Parameter
@Parameter(property="taskId")
private String taskId = null;
@Parameter
@Parameter(property="taskPropertyValues")
private List<String> taskPropertyValues;
@Parameter(defaultValue="false",property="verbose")
@ -85,7 +85,11 @@ public class X4OLanguageTaskMojo extends AbstractMojo {
throw new MojoExecutionException("Error while running task: "+getTaskId()+" error: "+e.getMessage(),e);
}
long stopTime = System.currentTimeMillis();
getLog().info("Done "+getTaskId()+" for "+languageName+":"+languageVersion+" in "+(stopTime-startTime)+" ms.");
String ver = "";
if (languageVersion!=null) {
ver = ":"+languageVersion;
}
getLog().info("Done "+getTaskId()+" for "+languageName+ver+" in "+(stopTime-startTime)+" ms.");
}
public void execute() throws MojoExecutionException {

4
x4o-tool/x4o-tool-maven-plugin/src/test/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojoTest.java
View file

@ -62,10 +62,8 @@ public class X4OLanguageTaskMojoTest extends AbstractMojoTestCase {
Mojo mojo = lookupMojo("help",pom);
assertNotNull(mojo);
mojo.execute();
}
/*
public void testConfAllWriteDoc() throws Exception {
executeGoal(X4OLanguageTaskMojo.GOAL,"src/test/resources/junit/test-plugin-conf-all.pom");
File outputDir = new File("target/jtest/test-plugin-conf-all/doc-eld-1.0");
@ -74,7 +72,7 @@ public class X4OLanguageTaskMojoTest extends AbstractMojoTestCase {
assertEquals("Should created more then two files", true, files>2);
}
/*
public void testConfLangWriteDoc() throws Exception {
executeGoal(X4OLanguageTaskMojo.GOAL,"src/test/resources/junit/test-plugin-conf-lang.pom");
File outputDir = new File("target/jtest/test-plugin-conf-lang/cel");