Changed main code artifact from x4o-core to x4o-driver.

This commit is contained in:
Willem Cazander 2013-04-08 23:02:19 +02:00
parent 9ea83fdd1a
commit 9aa15198c9
250 changed files with 42 additions and 54 deletions

View file

@ -46,7 +46,7 @@
<maven>3.0.1</maven> <maven>3.0.1</maven>
</prerequisites> </prerequisites>
<modules> <modules>
<module>x4o-core</module> <module>x4o-driver</module>
<module>x4o-elddoc</module> <module>x4o-elddoc</module>
<module>x4o-meta</module> <module>x4o-meta</module>
<module>x4o-plugin</module> <module>x4o-plugin</module>

View file

@ -38,10 +38,10 @@ This license uses year range format to list the copyrightable years.
For testing reasons the following files can't contain there own For testing reasons the following files can't contain there own
license in the header so they are explicit listed here; license in the header so they are explicit listed here;
./x4o-core/src/test/resources/tests/empty-xml/empty-real.xml ./x4o-driver/src/test/resources/tests/empty-xml/empty-real.xml
./x4o-core/src/test/resources/tests/empty-xml/empty-test.xml ./x4o-driver/src/test/resources/tests/empty-xml/empty-test.xml
./x4o-core/src/test/resources/tests/empty-xml/empty-x4o.xml ./x4o-driver/src/test/resources/tests/empty-xml/empty-x4o.xml
./x4o-core/src/test/resources/tests/empty-xml/empty-xml.xml ./x4o-driver/src/test/resources/tests/empty-xml/empty-xml.xml
The text files in the above listing fall all under The text files in the above listing fall all under
the license terms described in the license.txt file. the license terms described in the license.txt file.

View file

@ -39,11 +39,10 @@ cd `dirname $0`/../../..;
# Copy to one new dir. # Copy to one new dir.
mkdir -p target/gnu-up/$2; mkdir -p target/gnu-up/$2;
cp x4o-core/target/x4o-core-*.jar target/gnu-up/$2; cp x4o-driver/target/x4o-driver-*.jar target/gnu-up/$2;
cp x4o-elddoc/target/x4o-elddoc-*.jar target/gnu-up/$2; cp x4o-elddoc/target/x4o-elddoc-*.jar target/gnu-up/$2;
cp x4o-meta/target/x4o-meta-*.jar target/gnu-up/$2; cp x4o-meta/target/x4o-meta-*.jar target/gnu-up/$2;
cp x4o-plugin/x4o-plugin-ant-elddoc/target/x4o-plugin-ant-elddoc-*.jar target/gnu-up/$2; cp x4o-plugin/x4o-plugin-ant/target/x4o-plugin-ant-*.jar target/gnu-up/$2;
cp x4o-plugin/x4o-plugin-ant-schema/target/x4o-plugin-ant-schema-*.jar target/gnu-up/$2;
# Sign per file we want to upload. # Sign per file we want to upload.
for FILE in `ls target/gnu-up/$2/*`; do for FILE in `ls target/gnu-up/$2/*`; do

View file

@ -28,8 +28,8 @@ Downloading
+-- +--
<dependency> <dependency>
<groupId>org.x4o</groupId> <groupId>org.x4o</groupId>
<artifactId>x4o-core</artifactId> <artifactId>x4o-driver</artifactId>
<version>0.8.5-SNAPSHOT</version> <version>0.8.6-SNAPSHOT</version>
</dependency> </dependency>
+-- +--

View file

@ -28,7 +28,7 @@ Load Modules
So every extension library has its own modules definition file. So every extension library has its own modules definition file.
All options are allowed in multiple forms and order. All options are allowed in multiple forms and order.
The xsd file can be found in the x4o-core project classpath 'META-INF/language/modules-1.0.xsd'. The xsd file can be found in the x4o-driver project classpath 'META-INF/language/modules-1.0.xsd'.
+-- +--
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>

View file

@ -349,5 +349,5 @@ public class BorderConverter extends AbstractStringObjectConverter {
* Source * Source
This example is found in the x4o-core source package in the test java and resouces path. This example is found in the x4o-driver source package in the test java and resouces path.

View file

@ -52,17 +52,17 @@ parser.parse(...);
Generate the xsd files while all the language extensions are loaded in the classpath. Generate the xsd files while all the language extensions are loaded in the classpath.
Use the embedded java program in the x4o-core; Use the embedded java program in the x4o-driver;
+-- +--
java -cp '...jar:x4o-core.jar' org.x4o.xml.eld.xsd.X4OLanguageEldXsdWriter -path /tmp -class org.foo.bar.TestParserSupport java -cp '...jar:x4o-driver.jar' org.x4o.xml.eld.xsd.X4OWriteLanguageSchemaExecutor -p /tmp -l test
+-- +--
Or use the ant task in the x4o-plugin-ant-schema; Or use the ant task in the x4o-plugin-ant;
+-- +--
<taskdef name="eldXsdWriter" classname="org.x4o.plugin.ant.eld.xsd.EldXsdWriterTask"/> <taskdef name="writeLanguageSchema" classname="org.x4o.plugin.ant.X4OWriteLanguageSchemaTask" classpathref="maven.plugin.classpath"/>
<eldXsdWriter destdir="/tmp" supportclass="org.foo.bar.TestParserSupport"/> <writeLanguageSchema destdir="/tmp" language="eld"/>
+-- +--
Use validating parser Use validating parser

View file

@ -23,13 +23,13 @@
Usage Usage
X4O had multiple modules the one which is most used is x4o-core which implements the full x4o framework. X4O had multiple modules the one which is most used is x4o-driver which implements the full x4o framework.
* X4O maven modules * X4O maven modules
* x4o = project base. * x4o = project base.
* x4o-core = Main x4o library. * x4o-driver = Main x4o library.
* x4o-elddoc = X4O Eld documentation support. * x4o-elddoc = X4O Eld documentation support.
@ -37,7 +37,7 @@ Usage
* x4o-plugin = X4O external plugins. * x4o-plugin = X4O external plugins.
* x4o-plugin-ant-elddoc = Ant x4o elddoc task. * x4o-plugin-ant = X4O Ant plugins for schema and documentation task.
* x4o-plugin-ant-schema = Ant x4o schema task. * x4o-plugin-ant-schema = Ant x4o schema task.
@ -49,8 +49,8 @@ Usage
+-- +--
<dependency> <dependency>
<groupId>org.x4o</groupId> <groupId>org.x4o</groupId>
<artifactId>x4o-core</artifactId> <artifactId>x4o-driver</artifactId>
<version>0.8.5-SNAPSHOT</version> <version>0.8.6-SNAPSHOT</version>
</dependency> </dependency>
+-- +--

View file

@ -9,7 +9,6 @@
- redo eld/default converters config - redo eld/default converters config
- tag aliases - tag aliases
- maven plugin - maven plugin
- code split in api/impl ?
- lang-el-beans.xml loading - lang-el-beans.xml loading
- Add XML schema tags to ELD - Add XML schema tags to ELD
- Auto generate schemas from eld - Auto generate schemas from eld
@ -29,7 +28,7 @@
- event listeners on all DOM tree element operations - event listeners on all DOM tree element operations
- custom and merga'ble parse phases for speed - custom and merga'ble parse phases for speed
- make element tree jdom api compatible - make element tree jdom api compatible
- change phase enum to generic (text) phases. - (DONE) change phase enum to generic (text) phases.
- Test if possible to use threadpool for executing phases - Test if possible to use threadpool for executing phases
-- TODO for version 1.0 -- -- TODO for version 1.0 --
@ -39,17 +38,6 @@
- doc eld and x4o lang files - doc eld and x4o lang files
- Create xslt eld to html converter - Create xslt eld to html converter
- split into multiple maven projects - split into multiple maven projects
- x4o
- x4o-api
- x4o-core
- x4o-meta
- x4o-plugin
- x4o-plugin-ant-schema
- x4o-plugin-ant-elddoc
- x4o-plugin-mvn-schema
- x4o-plugin-mvn-elddoc
- x4o-plugin-ide-eclipse-editor
- x4o-plugin-ide-eclipse-catalog
##CODE ##CODE
- Add (super) tag for extending tags of other namespace - Add (super) tag for extending tags of other namespace

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>x4o-core</name> <name>x4o-driver</name>
<comment>x4o-core</comment> <comment>x4o-driver</comment>
<projects> <projects>
</projects> </projects>
<buildSpec> <buildSpec>

View file

@ -5,10 +5,10 @@
<groupId>org.x4o</groupId> <groupId>org.x4o</groupId>
<version>0.8.5-SNAPSHOT</version> <version>0.8.5-SNAPSHOT</version>
</parent> </parent>
<artifactId>x4o-core</artifactId> <artifactId>x4o-driver</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>x4o-core</name> <name>x4o-driver</name>
<description>x4o-core</description> <description>x4o-driver</description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.tomcat</groupId> <groupId>org.apache.tomcat</groupId>

Some files were not shown because too many files have changed in this diff Show more