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
Show stats Download patch file Download diff file Expand all files Collapse all files

35
build.txt
View file

@ -19,15 +19,15 @@ mvn clean install;
-- Update schemas in src -- -- Update schemas in src --
-- note; rm after auto schema creation -- note; only needed after change in eld or cel langauge.
-- note2; maybe rm/mv after auto schema creation
cd project-root/; cd project-root/;
mvn clean install; mvn clean install;
mvn -Pant-update-schema-cel package; mvn -Px4o-update-schema-cel compile;
mvn -Pant-update-schema-eld package; mvn -Px4o-update-schema-eld compile;
- Add the license as manual step in xsd files. (todo in ant task)
note: the do 'install' is because of circle plugins. note: the do 'install' is (once) because of circle plugins.
-- Run multi jvm test -- -- Run multi jvm test --
@ -53,7 +53,7 @@ src/main/build/gnu-up.sh <scm_username> <version>
cd project-root/; cd project-root/;
mvn clean install; # (installs the snapshots plugins so we can run the current eld-doc task in site phase) mvn clean install; # (installs the snapshots plugins so we can run the current eld-doc task in site phase)
MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=128m" mvn -Pbuild-site-x4o-support clean package site site:stage; MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=128m" mvn -Px4o-build-site-doc clean package site site:stage;
cp -r target/staging/x4o-* target/site/; cp -r target/staging/x4o-* target/site/;
cp -r target/site/ ~/public_html/site-x4o; cp -r target/site/ ~/public_html/site-x4o;
@ -66,10 +66,10 @@ mvn checkstyle:checkstyle
-- Check for licenses -- -- Check for licenses --
cd project-root/; cd project-root/;
mvn -Pcheck-license license:check mvn -Px4o-check-license license:check
To update all files from check output; To update all files from check output;
mvn -Pcheck-license license:format mvn -Px4o-check-license license:format
-- Check for versions-updates -- -- Check for versions-updates --
@ -78,10 +78,21 @@ mvn versions:display-plugin-updates;
mvn versions:display-dependency-updates; mvn versions:display-dependency-updates;
-- Run x4o-plugin-maven from cmd -- -- Run x4o task from cmd --
cd project-root/;
mvn clean compile;
cd x4o-driver;
mvn exec:java -Dexec.mainClass="org.x4o.xml.lang.task.X4OLanguageTaskCommandLine" -Dexec.args="-h"
mvn exec:java -Dexec.mainClass="org.x4o.xml.lang.task.X4OLanguageTaskCommandLine" -Dexec.args="-ll"
mvn exec:java -Dexec.mainClass="org.x4o.xml.lang.task.X4OLanguageTaskCommandLine" -Dexec.args="-llt"
mvn exec:java -Dexec.mainClass="org.x4o.xml.lang.task.X4OLanguageTaskCommandLine" -Dexec.args="-l eld -t eld-xsd -p http://language.x4o.org/xml/properties/eld-xsd/output/path=/tmp/test-task-cmd"
-- Run x4o-tool-maven-plugin from cmd --
cd project-root/; cd project-root/;
mvn clean install; mvn clean install;
mvn org.x4o.plugin:x4o-plugin-maven:help mvn org.x4o.tool:x4o-tool-maven-plugin:help
mvn org.x4o.plugin:x4o-plugin-maven:write-language-doc -DoutputDirectory=/tmp/doc1 mvn org.x4o.tool:x4o-tool-maven-plugin:x4o-language-task -Dverbose=true -DtaskId=eld-xsd -DlanguageName=cel -DtaskPropertyValues=http://x4o.org/properties/eld-xsd/output/path=/tmp/test-maven-cmd
mvn org.x4o.plugin:x4o-plugin-maven:write-language-doc -DoutputDirectory=/tmp/doc2 -Dlanguages={eld=ALL,swixml=1.0-2.0} -Dverbose=true

28
pom.xml
View file

@ -102,6 +102,13 @@
<!-- Application lib versions --> <!-- Application lib versions -->
<jasper-el.version>6.0.20</jasper-el.version> <jasper-el.version>6.0.20</jasper-el.version>
<juel.version>2.1.0</juel.version> <juel.version>2.1.0</juel.version>
<!-- Maven plugin building -->
<maven-plugin-api.version>3.0</maven-plugin-api.version>
<maven-plugin-annotations.version>3.2</maven-plugin-annotations.version>
<maven-plugin-testing-harness.version>2.0</maven-plugin-testing-harness.version>
<plexus-utils.version>3.0.1</plexus-utils.version>
<maven-plugin-plugin.version>3.2</maven-plugin-plugin.version>
</properties> </properties>
<build> <build>
<plugins> <plugins>
@ -339,25 +346,38 @@
</reporting> </reporting>
<profiles> <profiles>
<profile> <profile>
<id>notest</id> <id>x4o-test-none</id>
<properties> <properties>
<skipTests>true</skipTests> <skipTests>true</skipTests>
</properties> </properties>
</profile> </profile>
<profile> <profile>
<id>update-schema-cel</id> <id>x4o-test-speed</id>
<properties>
<skipTests>false</skipTests>
<make-work>todo</make-work>
</properties>
</profile>
<profile>
<id>x4o-update-schema-cel</id>
<properties> <properties>
<skipTests>true</skipTests> <skipTests>true</skipTests>
</properties> </properties>
</profile> </profile>
<profile> <profile>
<id>update-schema-eld</id> <id>x4o-update-schema-eld</id>
<properties> <properties>
<skipTests>true</skipTests> <skipTests>true</skipTests>
</properties> </properties>
</profile> </profile>
<profile> <profile>
<id>check-license</id> <id>x4o-build-site-doc</id>
<properties>
<skipTests>true</skipTests>
</properties>
</profile>
<profile>
<id>x4o-check-license</id>
<properties> <properties>
<skipTests>true</skipTests> <skipTests>true</skipTests>
</properties> </properties>

2
x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdLanguageTask.java
View file

@ -50,7 +50,7 @@ public class EldXsdLanguageTask extends AbstractX4OLanguageTask {
/** /**
* Executes this language task. * Executes this language task.
*/ */
public X4OLanguageTaskExecutor createTaskExecutor(final PropertyConfig config) { protected X4OLanguageTaskExecutor createTaskExecutorChecked(final PropertyConfig config) {
return new X4OLanguageTaskExecutor() { return new X4OLanguageTaskExecutor() {
public void execute(X4OLanguage language) throws X4OLanguageTaskException { public void execute(X4OLanguage language) throws X4OLanguageTaskException {
try { try {

6
x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/PropertyConfig.java
View file

@ -211,15 +211,15 @@ public final class PropertyConfig implements Cloneable {
return getPropertyKeysRequired().contains(key); return getPropertyKeysRequired().contains(key);
} }
public final Collection<String> getPropertyKeysRequired() { public final List<String> getPropertyKeysRequired() {
return findPropertyKeysRequired(false); return findPropertyKeysRequired(false);
} }
public final Collection<String> getPropertyKeysRequiredValues() { public final List<String> getPropertyKeysRequiredValues() {
return findPropertyKeysRequired(true); return findPropertyKeysRequired(true);
} }
private final Collection<String> findPropertyKeysRequired(boolean checkValue) { private final List<String> findPropertyKeysRequired(boolean checkValue) {
List<String> result = new ArrayList<String>(10); List<String> result = new ArrayList<String>(10);
for (String key:getPropertyKeys()) { for (String key:getPropertyKeys()) {
PropertyConfigItem item = getPropertyConfigItem(key); PropertyConfigItem item = getPropertyConfigItem(key);

30
x4o-driver/src/main/java/org/x4o/xml/lang/task/AbstractX4OLanguageTask.java
View file

@ -22,6 +22,8 @@
*/ */
package org.x4o.xml.lang.task; package org.x4o.xml.lang.task;
import java.util.List;
import org.x4o.xml.io.sax.ext.PropertyConfig; import org.x4o.xml.io.sax.ext.PropertyConfig;
/** /**
@ -48,6 +50,34 @@ public abstract class AbstractX4OLanguageTask implements X4OLanguageTask {
this.propertyConfig=propertyConfig; this.propertyConfig=propertyConfig;
} }
protected abstract X4OLanguageTaskExecutor createTaskExecutorChecked(PropertyConfig config);
/**
* @see org.x4o.xml.lang.task.X4OLanguageTask#createTaskExecutor(org.x4o.xml.io.sax.ext.PropertyConfig)
*/
public X4OLanguageTaskExecutor createTaskExecutor(PropertyConfig config) {
return createTaskExecutorChecked(checkConfig(config));
}
private PropertyConfig checkConfig(PropertyConfig config) {
List<String> keys = config.getPropertyKeysRequiredValues();
if (keys.isEmpty()) {
return config;
}
StringBuffer buf = new StringBuffer(100);
buf.append("Error missing value(s) for key(s) {");
for (int i=0;i<keys.size();i++) {
buf.append('"');
buf.append(keys.get(i));
buf.append('"');
if (i<keys.size()-1) {
buf.append(',');
}
buf.append('}');
}
throw new IllegalArgumentException(buf.toString());
}
/** /**
* @see org.x4o.xml.lang.task.X4OLanguageTask#createTaskConfig() * @see org.x4o.xml.lang.task.X4OLanguageTask#createTaskConfig()
*/ */

15
x4o-driver/src/main/resources/META-INF/cel/cel-core-1.0.xsd
View file

@ -24,19 +24,16 @@
--> -->
<!-- ==================================================================== --> <!-- ==================================================================== -->
<!-- ===== Automatic generated schema for language: cel ===== --> <!-- ===== Automatic generated schema for language: cel ===== -->
<!-- ==================================================================== --> <!-- ==================================================================== -->
<!-- <!--
ID: cel-module Id: cel-module
ProviderName: Core Element Languag Module ProviderName: Core Element Languag Module
ProviderHost: cel.x4o.org ProviderHost: cel.x4o.org
Namespaces: 2 Namespaces: 2
Uri: http://cel.x4o.org/xml/ns/cel-core Uri: http://cel.x4o.org/xml/ns/cel-core
Uri schema: http://cel.x4o.org/xml/ns/cel-core-1.0.xsd Uri schema http://cel.x4o.org/xml/ns/cel-core-1.0.xsd
Created on: Sat Aug 24 22:02:08 CEST 2013 Created on: Sun Sep 01 12:08:48 CEST 2013
--> -->
<schema xmlns="http://www.w3.org/2001/XMLSchema" <schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:this="http://cel.x4o.org/xml/ns/cel-core" xmlns:this="http://cel.x4o.org/xml/ns/cel-core"
@ -49,9 +46,9 @@
</choice> </choice>
<attribute name="required" type="boolean"/> <attribute name="required" type="boolean"/>
<attribute name="defaultValue" type="string"/> <attribute name="defaultValue" type="string"/>
<attribute name="objectConverter" type="string"/>
<attribute name="runResolveEL" type="boolean"/> <attribute name="runResolveEL" type="boolean"/>
<attribute name="runConverters" type="boolean"/> <attribute name="runConverters" type="boolean"/>
<attribute name="objectConverter" type="string"/>
<attribute name="runBeanValue" type="boolean"/> <attribute name="runBeanValue" type="boolean"/>
<attribute name="writeOrder" type="integer"/> <attribute name="writeOrder" type="integer"/>
<attribute name="description" type="string"/> <attribute name="description" type="string"/>
@ -75,12 +72,12 @@
</choice> </choice>
<attribute name="uri" type="string" use="required"/> <attribute name="uri" type="string" use="required"/>
<attribute name="name" type="string"/> <attribute name="name" type="string"/>
<attribute name="prefixMapping" type="string"/>
<attribute name="schemaUri" type="string"/> <attribute name="schemaUri" type="string"/>
<attribute name="schemaResource" type="string"/> <attribute name="schemaResource" type="string"/>
<attribute name="languageRoot" type="boolean"/> <attribute name="languageRoot" type="boolean"/>
<attribute name="schemaPrefix" type="string"/> <attribute name="schemaPrefix" type="string"/>
<attribute name="elementNamespaceInstanceProvider" type="string"/> <attribute name="elementNamespaceInstanceProvider" type="string"/>
<attribute name="prefixMapping" type="string"/>
<attribute name="description" type="string"/> <attribute name="description" type="string"/>
<attribute name="id" type="string"/> <attribute name="id" type="string"/>
</complexType> </complexType>
@ -108,10 +105,10 @@
</choice> </choice>
<attribute name="objectClass" type="string"/> <attribute name="objectClass" type="string"/>
<attribute name="elementClass" type="string"/> <attribute name="elementClass" type="string"/>
<attribute name="schemaContentMixed" type="boolean"/>
<attribute name="autoAttributes" type="boolean"/> <attribute name="autoAttributes" type="boolean"/>
<attribute name="schemaContentBase" type="string"/> <attribute name="schemaContentBase" type="string"/>
<attribute name="schemaContentComplex" type="boolean"/> <attribute name="schemaContentComplex" type="boolean"/>
<attribute name="schemaContentMixed" type="boolean"/>
<attribute name="description" type="string"/> <attribute name="description" type="string"/>
<attribute name="id" type="string"/> <attribute name="id" type="string"/>
</complexType> </complexType>

9
x4o-driver/src/main/resources/META-INF/cel/cel-root-1.0.xsd
View file

@ -24,19 +24,16 @@
--> -->
<!-- ==================================================================== --> <!-- ==================================================================== -->
<!-- ===== Automatic generated schema for language: cel ===== --> <!-- ===== Automatic generated schema for language: cel ===== -->
<!-- ==================================================================== --> <!-- ==================================================================== -->
<!-- <!--
ID: cel-module Id: cel-module
ProviderName: Core Element Languag Module ProviderName: Core Element Languag Module
ProviderHost: cel.x4o.org ProviderHost: cel.x4o.org
Namespaces: 2 Namespaces: 2
Uri: http://cel.x4o.org/xml/ns/cel-root Uri: http://cel.x4o.org/xml/ns/cel-root
Uri schema: http://cel.x4o.org/xml/ns/cel-root-1.0.xsd Uri schema http://cel.x4o.org/xml/ns/cel-root-1.0.xsd
Created on: Sat Aug 24 22:02:08 CEST 2013 Created on: Sun Sep 01 12:08:48 CEST 2013
--> -->
<schema xmlns="http://www.w3.org/2001/XMLSchema" <schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:cel-core="http://cel.x4o.org/xml/ns/cel-core" xmlns:cel-core="http://cel.x4o.org/xml/ns/cel-core"

9
x4o-driver/src/main/resources/META-INF/eld/eld-conv-1.0.xsd
View file

@ -24,19 +24,16 @@
--> -->
<!-- ==================================================================== --> <!-- ==================================================================== -->
<!-- ===== Automatic generated schema for language: eld ===== --> <!-- ===== Automatic generated schema for language: eld ===== -->
<!-- ==================================================================== --> <!-- ==================================================================== -->
<!-- <!--
ID: eld-module Id: eld-module
ProviderName: Element Language Definition ProviderName: Element Language Definition
ProviderHost: eld.x4o.org ProviderHost: eld.x4o.org
Namespaces: 3 Namespaces: 3
Uri: http://eld.x4o.org/xml/ns/eld-conv Uri: http://eld.x4o.org/xml/ns/eld-conv
Uri schema: http://eld.x4o.org/xml/ns/eld-conv-0.8.xsd Uri schema http://eld.x4o.org/xml/ns/eld-conv-0.8.xsd
Created on: Sat Aug 24 21:57:18 CEST 2013 Created on: Sun Sep 01 12:13:10 CEST 2013
--> -->
<schema xmlns="http://www.w3.org/2001/XMLSchema" <schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:this="http://eld.x4o.org/xml/ns/eld-conv" xmlns:this="http://eld.x4o.org/xml/ns/eld-conv"

21
x4o-driver/src/main/resources/META-INF/eld/eld-lang-1.0.xsd
View file

@ -24,19 +24,16 @@
--> -->
<!-- ==================================================================== --> <!-- ==================================================================== -->
<!-- ===== Automatic generated schema for language: eld ===== --> <!-- ===== Automatic generated schema for language: eld ===== -->
<!-- ==================================================================== --> <!-- ==================================================================== -->
<!-- <!--
ID: eld-module Id: eld-module
ProviderName: Element Language Definition ProviderName: Element Language Definition
ProviderHost: eld.x4o.org ProviderHost: eld.x4o.org
Namespaces: 3 Namespaces: 3
Uri: http://eld.x4o.org/xml/ns/eld-lang Uri: http://eld.x4o.org/xml/ns/eld-lang
Uri schema: http://eld.x4o.org/xml/ns/eld-lang-0.8.xsd Uri schema http://eld.x4o.org/xml/ns/eld-lang-0.8.xsd
Created on: Sat Aug 24 21:57:18 CEST 2013 Created on: Sun Sep 01 12:13:10 CEST 2013
--> -->
<schema xmlns="http://www.w3.org/2001/XMLSchema" <schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:conv="http://eld.x4o.org/xml/ns/eld-conv" xmlns:conv="http://eld.x4o.org/xml/ns/eld-conv"
@ -68,9 +65,9 @@
</attribute> </attribute>
<attribute name="name" type="string"/> <attribute name="name" type="string"/>
<attribute name="required" type="boolean"/> <attribute name="required" type="boolean"/>
<attribute name="runResolveEL" type="boolean"/>
<attribute name="defaultValue" type="string"/> <attribute name="defaultValue" type="string"/>
<attribute name="objectConverter" type="string"/> <attribute name="objectConverter" type="string"/>
<attribute name="runResolveEL" type="boolean"/>
<attribute name="runConverters" type="boolean"/> <attribute name="runConverters" type="boolean"/>
<attribute name="runBeanValue" type="boolean"/> <attribute name="runBeanValue" type="boolean"/>
<attribute name="writeOrder" type="integer"/> <attribute name="writeOrder" type="integer"/>
@ -110,13 +107,13 @@
</annotation> </annotation>
</attribute> </attribute>
<attribute name="name" type="string"/> <attribute name="name" type="string"/>
<attribute name="languageRoot" type="boolean"/> <attribute name="elementNamespaceInstanceProvider" type="string"/>
<attribute name="schemaPrefix" type="string"/>
<attribute name="prefixMapping" type="string"/> <attribute name="prefixMapping" type="string"/>
<attribute name="uri" type="string"/>
<attribute name="schemaUri" type="string"/> <attribute name="schemaUri" type="string"/>
<attribute name="schemaResource" type="string"/> <attribute name="schemaResource" type="string"/>
<attribute name="elementNamespaceInstanceProvider" type="string"/> <attribute name="languageRoot" type="boolean"/>
<attribute name="uri" type="string"/> <attribute name="schemaPrefix" type="string"/>
<attribute name="description" type="string"/> <attribute name="description" type="string"/>
</complexType> </complexType>
<complexType name="descriptionType"> <complexType name="descriptionType">
@ -177,10 +174,10 @@
<documentation xml:lang="en">An custom element class to config object.</documentation> <documentation xml:lang="en">An custom element class to config object.</documentation>
</annotation> </annotation>
</attribute> </attribute>
<attribute name="schemaContentMixed" type="boolean"/>
<attribute name="autoAttributes" type="boolean"/> <attribute name="autoAttributes" type="boolean"/>
<attribute name="schemaContentBase" type="string"/> <attribute name="schemaContentBase" type="string"/>
<attribute name="schemaContentComplex" type="boolean"/> <attribute name="schemaContentComplex" type="boolean"/>
<attribute name="schemaContentMixed" type="boolean"/>
<attribute name="description" type="string"/> <attribute name="description" type="string"/>
</complexType> </complexType>
<complexType name="attributeAliasType"> <complexType name="attributeAliasType">

9
x4o-driver/src/main/resources/META-INF/eld/eld-root-1.0.xsd
View file

@ -24,19 +24,16 @@
--> -->
<!-- ==================================================================== --> <!-- ==================================================================== -->
<!-- ===== Automatic generated schema for language: eld ===== --> <!-- ===== Automatic generated schema for language: eld ===== -->
<!-- ==================================================================== --> <!-- ==================================================================== -->
<!-- <!--
ID: eld-module Id: eld-module
ProviderName: Element Language Definition ProviderName: Element Language Definition
ProviderHost: eld.x4o.org ProviderHost: eld.x4o.org
Namespaces: 3 Namespaces: 3
Uri: http://eld.x4o.org/xml/ns/eld-root Uri: http://eld.x4o.org/xml/ns/eld-root
Uri schema: http://eld.x4o.org/xml/ns/eld-root-1.0.xsd Uri schema http://eld.x4o.org/xml/ns/eld-root-1.0.xsd
Created on: Sat Aug 24 21:57:18 CEST 2013 Created on: Sun Sep 01 12:13:10 CEST 2013
--> -->
<schema xmlns="http://www.w3.org/2001/XMLSchema" <schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:conv="http://eld.x4o.org/xml/ns/eld-conv" xmlns:conv="http://eld.x4o.org/xml/ns/eld-conv"

2
x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocLanguageTask.java
View file

@ -48,7 +48,7 @@ public class EldDocLanguageTask extends AbstractX4OLanguageTask {
/** /**
* Executes this language task. * Executes this language task.
*/ */
public X4OLanguageTaskExecutor createTaskExecutor(final PropertyConfig config) { protected X4OLanguageTaskExecutor createTaskExecutorChecked(final PropertyConfig config) {
return new X4OLanguageTaskExecutor() { return new X4OLanguageTaskExecutor() {
public void execute(X4OLanguage language) throws X4OLanguageTaskException { public void execute(X4OLanguage language) throws X4OLanguageTaskException {
try { try {

88
x4o-tool/x4o-tool-ant-plugin/pom.xml
View file

@ -71,7 +71,7 @@
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>ant-update-schema-cel</id> <id>x4o-update-schema-cel</id>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -80,13 +80,17 @@
<version>${maven-antrun-plugin.version}</version> <version>${maven-antrun-plugin.version}</version>
<executions> <executions>
<execution> <execution>
<id>update-schema-cel-ant</id> <id>x4o-update-schema-cel-run-ant</id>
<phase>generate-resources</phase> <phase>generate-resources</phase>
<configuration> <configuration>
<target> <target>
<property name="coredir" value="${basedir}/../../x4o-driver/src/main/resources/META-INF" /> <property name="coredir" value="${basedir}/../../x4o-driver/src/main/resources/META-INF" />
<taskdef name="writeLanguageSchema" classname="org.x4o.plugin.ant.X4OWriteLanguageSchemaTask" classpathref="maven.plugin.classpath" /> <property name="licesefile" value="${basedir}/../../license.txt"/>
<writeLanguageSchema destdir="${coredir}/cel" languageName="cel" /> <taskdef name="x4oTask" classname="org.x4o.tool.ant.plugin.X4OTask" classpathref="maven.plugin.classpath"/>
<x4oTask languageName="cel" taskId="eld-xsd">
<x4oTaskProperty key="http://x4o.org/properties/eld-xsd/output/path" value="${coredir}/cel"/>
<x4oTaskProperty key="http://x4o.org/properties/eld-xsd/prolog/licence-file" value="${licesefile}"/>
</x4oTask>
</target> </target>
</configuration> </configuration>
<goals> <goals>
@ -96,8 +100,8 @@
</executions> </executions>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.x4o.plugin</groupId> <groupId>org.x4o.tool</groupId>
<artifactId>x4o-plugin-ant</artifactId> <artifactId>x4o-tool-ant-plugin</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
@ -106,7 +110,7 @@
</build> </build>
</profile> </profile>
<profile> <profile>
<id>ant-update-schema-eld</id> <id>x4o-update-schema-eld</id>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -115,13 +119,17 @@
<version>${maven-antrun-plugin.version}</version> <version>${maven-antrun-plugin.version}</version>
<executions> <executions>
<execution> <execution>
<id>update-schema-eld-ant</id> <id>x4o-update-schema-eld-run-ant</id>
<phase>generate-resources</phase> <phase>generate-resources</phase>
<configuration> <configuration>
<target> <target>
<property name="coredir" value="${basedir}/../../x4o-driver/src/main/resources/META-INF" /> <property name="coredir" value="${basedir}/../../x4o-driver/src/main/resources/META-INF" />
<taskdef name="writeLanguageSchema" classname="org.x4o.plugin.ant.X4OWriteLanguageSchemaTask" classpathref="maven.plugin.classpath" /> <property name="licesefile" value="${basedir}/../../license.txt"/>
<writeLanguageSchema destdir="${coredir}/eld" languageName="eld" /> <taskdef name="x4oTask" classname="org.x4o.tool.ant.plugin.X4OTask" classpathref="maven.plugin.classpath"/>
<x4oTask languageName="eld" taskId="eld-xsd">
<x4oTaskProperty key="http://x4o.org/properties/eld-xsd/output/path" value="${coredir}/eld"/>
<x4oTaskProperty key="http://x4o.org/properties/eld-xsd/prolog/licence-file" value="${licesefile}"/>
</x4oTask>
</target> </target>
</configuration> </configuration>
<goals> <goals>
@ -131,8 +139,8 @@
</executions> </executions>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.x4o.plugin</groupId> <groupId>org.x4o.tool</groupId>
<artifactId>x4o-plugin-ant</artifactId> <artifactId>x4o-tool-ant-plugin</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
@ -141,7 +149,7 @@
</build> </build>
</profile> </profile>
<profile> <profile>
<id>ant-site-elddoc</id> <id>x4o-build-site-doc</id>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -150,22 +158,46 @@
<version>${maven-antrun-plugin.version}</version> <version>${maven-antrun-plugin.version}</version>
<executions> <executions>
<execution> <execution>
<id>site-elddoc-ant</id> <id>x4o-build-site-doc-run-ant</id>
<phase>pre-site</phase> <phase>pre-site</phase>
<configuration> <configuration>
<target> <target>
<property name="coredir" value="${basedir}/../../target/site/elddocs" /> <property name="coredir" value="${basedir}/../../target/site/x4o-support" />
<mkdir dir="${coredir}/cel" /> <taskdef name="x4oTask" classname="org.x4o.tool.ant.plugin.X4OTask" classpathref="maven.plugin.classpath"/>
<mkdir dir="${coredir}/eld" />
<mkdir dir="${coredir}/junit-test" /> <x4oTask languageName="cel" taskId="eld-doc">
<mkdir dir="${coredir}/junit-swixml2" /> <x4oTaskProperty key="http://x4o.org/properties/eld-doc/output/path" value="${coredir}/doc-cel-1.0"/>
<mkdir dir="${coredir}/junit-swixml3" /> <x4oTaskProperty key="http://x4o.org/properties/eld-doc/javadoc/link" value="http://docs.oracle.com/javase/7/docs/api/"/>
<taskdef name="writeLanguageDoc" classname="org.x4o.plugin.ant.X4OWriteLanguageDocTask" classpathref="maven.plugin.classpath" /> </x4oTask>
<writeLanguageDoc destdir="${coredir}/cel" languageName="cel" /> <x4oTask languageName="eld" taskId="eld-doc">
<writeLanguageDoc destdir="${coredir}/eld" languageName="eld" /> <x4oTaskProperty key="http://x4o.org/properties/eld-doc/output/path" value="${coredir}/doc-eld-1.0"/>
<writeLanguageDoc destdir="${coredir}/junit-test" languageName="test" /> <x4oTaskProperty key="http://x4o.org/properties/eld-doc/javadoc/link" value="http://docs.oracle.com/javase/7/docs/api/"/>
<writeLanguageDoc destdir="${coredir}/junit-swixml2" languageName="swixml" languageVersion="2.0" /> </x4oTask>
<writeLanguageDoc destdir="${coredir}/junit-swixml3" languageName="swixml" /> <x4oTask languageName="test" taskId="eld-doc">
<x4oTaskProperty key="http://x4o.org/properties/eld-doc/output/path" value="${coredir}/doc-test-1.0"/>
</x4oTask>
<x4oTask languageName="swixml" taskId="eld-doc" languageVersion="2.0">
<x4oTaskProperty key="http://x4o.org/properties/eld-doc/output/path" value="${coredir}/doc-swixml-2.0"/>
</x4oTask>
<x4oTask languageName="swixml" taskId="eld-doc">
<x4oTaskProperty key="http://x4o.org/properties/eld-doc/output/path" value="${coredir}/doc-swixml-3.0"/>
</x4oTask>
<x4oTask languageName="cel" taskId="eld-xsd">
<x4oTaskProperty key="http://x4o.org/properties/eld-xsd/output/path" value="${coredir}/xsd-cel-1.0"/>
</x4oTask>
<x4oTask languageName="eld" taskId="eld-xsd">
<x4oTaskProperty key="http://x4o.org/properties/eld-xsd/output/path" value="${coredir}/xsd-eld-1.0"/>
</x4oTask>
<x4oTask languageName="test" taskId="eld-xsd">
<x4oTaskProperty key="http://x4o.org/properties/eld-xsd/output/path" value="${coredir}/xsd-test-1.0"/>
</x4oTask>
<x4oTask languageName="swixml" taskId="eld-xsd" languageVersion="2.0">
<x4oTaskProperty key="http://x4o.org/properties/eld-xsd/output/path" value="${coredir}/xsd-swixml-2.0"/>
</x4oTask>
<x4oTask languageName="swixml" taskId="eld-xsd">
<x4oTaskProperty key="http://x4o.org/properties/eld-xsd/output/path" value="${coredir}/xsd-swixml-3.0"/>
</x4oTask>
</target> </target>
</configuration> </configuration>
<goals> <goals>
@ -175,8 +207,8 @@
</executions> </executions>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.x4o.plugin</groupId> <groupId>org.x4o.tool</groupId>
<artifactId>x4o-plugin-ant</artifactId> <artifactId>x4o-tool-ant-plugin</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>

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

@ -23,26 +23,26 @@
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId> <artifactId>maven-plugin-api</artifactId>
<version>3.0</version> <version>${maven-plugin-api.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.plugin-tools</groupId> <groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId> <artifactId>maven-plugin-annotations</artifactId>
<version>3.2</version> <version>${maven-plugin-annotations.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.plugin-testing</groupId> <groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId> <artifactId>maven-plugin-testing-harness</artifactId>
<version>2.0</version> <version>${maven-plugin-testing-harness.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- generated help mojo has a dependency to plexus-utils --> <!-- generated help mojo has a dependency to plexus-utils -->
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId> <artifactId>plexus-utils</artifactId>
<version>3.0.1</version> <version>${plexus-utils.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@ -50,7 +50,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId> <artifactId>maven-plugin-plugin</artifactId>
<version>3.2</version> <version>${maven-plugin-plugin.version}</version>
<configuration> <configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration> </configuration>
@ -67,66 +67,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </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"; static public final String GOAL = "x4o-language-task";
@Parameter @Parameter(property="languageName")
private String languageName = null; private String languageName = null;
@Parameter @Parameter(property="languageVersion")
private String languageVersion = null; private String languageVersion = null;
@Parameter @Parameter(property="taskId")
private String taskId = null; private String taskId = null;
@Parameter @Parameter(property="taskPropertyValues")
private List<String> taskPropertyValues; private List<String> taskPropertyValues;
@Parameter(defaultValue="false",property="verbose") @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); throw new MojoExecutionException("Error while running task: "+getTaskId()+" error: "+e.getMessage(),e);
} }
long stopTime = System.currentTimeMillis(); 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 { 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); Mojo mojo = lookupMojo("help",pom);
assertNotNull(mojo); assertNotNull(mojo);
mojo.execute(); mojo.execute();
} }
/*
public void testConfAllWriteDoc() throws Exception { public void testConfAllWriteDoc() throws Exception {
executeGoal(X4OLanguageTaskMojo.GOAL,"src/test/resources/junit/test-plugin-conf-all.pom"); 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"); 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); assertEquals("Should created more then two files", true, files>2);
} }
/*
public void testConfLangWriteDoc() throws Exception { public void testConfLangWriteDoc() throws Exception {
executeGoal(X4OLanguageTaskMojo.GOAL,"src/test/resources/junit/test-plugin-conf-lang.pom"); executeGoal(X4OLanguageTaskMojo.GOAL,"src/test/resources/junit/test-plugin-conf-lang.pom");
File outputDir = new File("target/jtest/test-plugin-conf-lang/cel"); File outputDir = new File("target/jtest/test-plugin-conf-lang/cel");