Author: ips
Date: Wed May 4 11:53:20 2005
New Revision: 168165
URL: http://svn.apache.org/viewcvs?rev=168165&view=rev
Log:
upgraded to XMLBeans v2
Modified:
incubator/apollo/trunk/project.xml
incubator/apollo/trunk/wsa-xbeans/maven.xml
incubator/apollo/trunk/wsa-xbeans/project.properties
incubator/apollo/trunk/wsa-xbeans/project.xml
incubator/apollo/trunk/wsrf-xbeans/maven.xml
incubator/apollo/trunk/wsrf-xbeans/project.xml
Modified: incubator/apollo/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/project.xml?rev=168165&r1=168164&r2=168165&view=diff
==============================================================================
--- incubator/apollo/trunk/project.xml (original)
+++ incubator/apollo/trunk/project.xml Wed May 4 11:53:20 2005
@@ -404,6 +404,7 @@
</properties>
</dependency>
+<!--
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
@@ -427,7 +428,32 @@
<usage>XMLBeans - used throughout code base.</usage>
</properties>
</dependency>
+-->
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>2.0.0-beta1</version>
+ <url>http://xmlbeans.apache.org/</url>
+ <properties>
+ <license>ApacheLicense-2.0.txt</license>
+ <war.bundle>true</war.bundle>
+ <usage>Needed for handling XML types in a platform agnostic
way.</usage>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>jsr173_api</artifactId>
+ <version>1.0</version>
+ <url>http://xmlbeans.apache.org/</url>
+ <properties>
+ <license>ApacheLicense-2.0.txt</license>
+ <war.bundle>true</war.bundle>
+ <usage>Needed for handling XML types in a platform agnostic
way.</usage>
+ </properties>
+ </dependency>
+
</dependencies>
<build>
Modified: incubator/apollo/trunk/wsa-xbeans/maven.xml
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/wsa-xbeans/maven.xml?rev=168165&r1=168164&r2=168165&view=diff
==============================================================================
--- incubator/apollo/trunk/wsa-xbeans/maven.xml (original)
+++ incubator/apollo/trunk/wsa-xbeans/maven.xml Wed May 4 11:53:20 2005
@@ -21,42 +21,54 @@
<goal name="generate"
description="generate XmlBeans for WSA spec types">
- <taskdef name="schemaCompiler"
- classname="org.apache.xmlbeans.impl.tool.XMLBean"
- classpathref="maven.dependency.classpath" />
-
- <j:set var="gen.src.dir" value="${maven.src.dir}/java"/>
+ <property name="gen.src.dir" location="${maven.src.dir}/java" />
<echo>Writing generated XMLBeans source files to: ${gen.src.dir}</echo>
<delete dir="${gen.src.dir}"/>
<mkdir dir="${gen.src.dir}"/>
- <j:set var="gen.classes.dir" value="${maven.build.dest}"/>
+ <property name="gen.classes.dir" location="${maven.build.dest}" />
<echo>Writing generated XMLBeans classes to: ${gen.classes.dir}</echo>
<delete dir="${gen.classes.dir}"/>
<mkdir dir="${gen.classes.dir}"/>
- <schemaCompiler
- classpathref="maven.dependency.classpath"
- srcgendir="${gen.src.dir}"
- classgendir="${gen.classes.dir}"
- download="on"
- verbose="on"
- quiet="off"
- optimize="off"
- debug="on"
- debugLevel="lines,vars,source"
- fork="off"
- ignoreDuplicatesInNamespaces=""
- includeAntRuntime="on"
- includeJavaRuntime="off"
- memoryInitialSize="32M"
- memoryMaximumSize="192M"
- failonerror="on">
+ <pathconvert refid="maven.dependency.classpath" dirsep="/"
property="cp.value" />
+
+ <!-- NOTE: fork must be enabled to circumvent XMLBeans/Maven bug! -->
+ <java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler"
+ classpathref="maven.dependency.classpath"
+ verbose="true"
+ fork="true"
+ maxmemory="256M">
+ <arg value="-cp" />
+ <arg value="${cp.value}" />
+ <!--<arg value="-debug" />-->
+ <arg value="-dl" />
+ <arg value="-d" />
+ <arg value="${gen.classes.dir}" />
+ <arg value="-src" />
+ <arg value="${gen.src.dir}" />
+ <arg value="-verbose" />
+ <arg line="${maven.src.dir}/wsdl" />
+ </java>
+
+<!--
+ <taskdef name="schemaCompiler"
+ classname="org.apache.xmlbeans.impl.tool.XMLBean"
+ classpathref="maven.dependency.classpath" />
+
+ <schemaCompiler classpathref="maven.dependency.classpath"
+ srcgendir="${gen.src.dir}"
+ classgendir="${gen.classes.dir}"
+ download="on"
+ verbose="on"
+ debug="on"
+ debugLevel="lines,vars,source"
+ failonerror="on">
- <fileset dir="${maven.src.dir}/wsdl" />
+ <fileset dir="${maven.src.dir}/wsdl" />
</schemaCompiler>
-
+-->
</goal>
<goal name="src-jar">
Modified: incubator/apollo/trunk/wsa-xbeans/project.properties
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/wsa-xbeans/project.properties?rev=168165&r1=168164&r2=168165&view=diff
==============================================================================
--- incubator/apollo/trunk/wsa-xbeans/project.properties (original)
+++ incubator/apollo/trunk/wsa-xbeans/project.properties Wed May 4 11:53:20
2005
@@ -6,8 +6,8 @@
# MAVEN CORE
##############
-# comma-spearated list of remote JAR repository URLs
-maven.repo.remote = http://www.apache.org/dist/java-repository/,
http://cvs.apache.org/repository/, http://mirrors.sunsite.dk/maven/
+# comma-separated list of remote JAR repository URLs
+maven.repo.remote = http://www.apache.org/dist/java-repository/,
http://cvs.apache.org/repository/, http://mirrors.sunsite.dk/maven/,
http://people.apache.org/~ips/maven-repo/
# JAVA PLUGIN
##############
Modified: incubator/apollo/trunk/wsa-xbeans/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/wsa-xbeans/project.xml?rev=168165&r1=168164&r2=168165&view=diff
==============================================================================
--- incubator/apollo/trunk/wsa-xbeans/project.xml (original)
+++ incubator/apollo/trunk/wsa-xbeans/project.xml Wed May 4 11:53:20 2005
@@ -48,7 +48,8 @@
</developers>
<dependencies>
-
+
+<!--
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
@@ -60,6 +61,31 @@
<usage>Needed for handling XML types in a platform agnostic
way.</usage>
</properties>
</dependency>
+-->
+
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>2.0.0-beta1</version>
+ <url>http://xmlbeans.apache.org/</url>
+ <properties>
+ <license>ApacheLicense-2.0.txt</license>
+ <war.bundle>true</war.bundle>
+ <usage>Needed for handling XML types in a platform agnostic
way.</usage>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>jsr173_api</artifactId>
+ <version>1.0</version>
+ <url>http://xmlbeans.apache.org/</url>
+ <properties>
+ <license>ApacheLicense-2.0.txt</license>
+ <war.bundle>true</war.bundle>
+ <usage>Needed for handling XML types in a platform agnostic
way.</usage>
+ </properties>
+ </dependency>
</dependencies>
Modified: incubator/apollo/trunk/wsrf-xbeans/maven.xml
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/wsrf-xbeans/maven.xml?rev=168165&r1=168164&r2=168165&view=diff
==============================================================================
--- incubator/apollo/trunk/wsrf-xbeans/maven.xml (original)
+++ incubator/apollo/trunk/wsrf-xbeans/maven.xml Wed May 4 11:53:20 2005
@@ -19,44 +19,56 @@
</postGoal>
<goal name="generate"
- description="generate XmlBeans for WSRF spec types">
+ description="generate XMLBeans for WSRF spec types">
- <taskdef name="schemaCompiler"
- classname="org.apache.xmlbeans.impl.tool.XMLBean"
- classpathref="maven.dependency.classpath" />
-
- <j:set var="gen.src.dir" value="${maven.src.dir}/java"/>
+ <property name="gen.src.dir" location="${maven.src.dir}/java" />
<echo>Writing generated XMLBeans source files to: ${gen.src.dir}</echo>
<delete dir="${gen.src.dir}"/>
<mkdir dir="${gen.src.dir}"/>
- <j:set var="gen.classes.dir" value="${maven.build.dest}"/>
+ <property name="gen.classes.dir" location="${maven.build.dest}" />
<echo>Writing generated XMLBeans classes to: ${gen.classes.dir}</echo>
<delete dir="${gen.classes.dir}"/>
<mkdir dir="${gen.classes.dir}"/>
- <schemaCompiler
- classpathref="maven.dependency.classpath"
- srcgendir="${gen.src.dir}"
- classgendir="${gen.classes.dir}"
- download="on"
- verbose="on"
- quiet="off"
- optimize="off"
- debug="on"
- debugLevel="lines,vars,source"
- fork="off"
- ignoreDuplicatesInNamespaces=""
- includeAntRuntime="on"
- includeJavaRuntime="off"
- memoryInitialSize="32M"
- memoryMaximumSize="192M"
- failonerror="on">
+ <pathconvert refid="maven.dependency.classpath" dirsep="/"
property="cp.value" />
+
+ <!-- NOTE: fork must be enabled to circumvent XMLBeans/Maven bug! -->
+ <java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler"
+ classpathref="maven.dependency.classpath"
+ verbose="true"
+ fork="true"
+ maxmemory="256M">
+ <arg value="-cp" />
+ <arg value="${cp.value}" />
+ <!--<arg value="-debug" />-->
+ <arg value="-dl" />
+ <arg value="-d" />
+ <arg value="${gen.classes.dir}" />
+ <arg value="-src" />
+ <arg value="${gen.src.dir}" />
+ <arg value="-verbose" />
+ <arg line="${maven.src.dir}/wsdl" />
+ </java>
+
+<!--
+ <taskdef name="schemaCompiler"
+ classname="org.apache.xmlbeans.impl.tool.XMLBean"
+ classpathref="maven.dependency.classpath" />
+
+ <schemaCompiler classpathref="maven.dependency.classpath"
+ srcgendir="${gen.src.dir}"
+ classgendir="${gen.classes.dir}"
+ download="on"
+ verbose="on"
+ debug="on"
+ debugLevel="lines,vars,source"
+ failonerror="on">
- <fileset dir="${maven.src.dir}/wsdl" />
+ <fileset dir="${maven.src.dir}/wsdl" />
</schemaCompiler>
-
+-->
</goal>
<goal name="src-jar">
Modified: incubator/apollo/trunk/wsrf-xbeans/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/wsrf-xbeans/project.xml?rev=168165&r1=168164&r2=168165&view=diff
==============================================================================
--- incubator/apollo/trunk/wsrf-xbeans/project.xml (original)
+++ incubator/apollo/trunk/wsrf-xbeans/project.xml Wed May 4 11:53:20 2005
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!-- Apollo JNDI-CONFIG Project Descriptor - defines Project Object Model
(POM) -->
+<!-- WSRF Spec XMLBeans - Project Object Model (POM) -->
<!-- Schema for this file is at:
http://maven.apache.org/xsd/maven-project-3.0.0.xsd -->
<!-- Reference for this file is at:
http://maven.apache.org/reference/project-descriptor.html -->
@@ -9,7 +9,7 @@
xsi:noNamespaceSchemaLocation="http://maven.apache.org/xsd/maven-project-3.0.0.xsd";>
<pomVersion>3</pomVersion>
- <name>XmlBeans for the WSRF spec types</name>
+ <name>XMLBeans for the WSRF spec types</name>
<id>wsrf-xbeans</id>
<groupId>apollo</groupId>
<currentVersion>SNAPSHOT</currentVersion>
@@ -48,28 +48,52 @@
</developers>
<dependencies>
-
+<!--
<dependency>
- <groupId>apollo</groupId>
- <artifactId>wsa-xbeans</artifactId>
- <version>SNAPSHOT</version>
- <url>http://incubator.apache.org/apollo/</url>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>1.0.4</version>
+ <url>http://xmlbeans.apache.org/</url>
<properties>
<license>ApacheLicense-2.0.txt</license>
- <usage>XMLBeans for WSA spec types</usage>
<war.bundle>true</war.bundle>
+ <usage>Needed for handling XML types in a platform agnostic
way.</usage>
</properties>
</dependency>
-
+-->
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
- <version>1.0.4</version>
+ <version>2.0.0-beta1</version>
+ <url>http://xmlbeans.apache.org/</url>
+ <properties>
+ <license>ApacheLicense-2.0.txt</license>
+ <war.bundle>true</war.bundle>
+ <usage>Needed for handling XML types in a platform agnostic
way.</usage>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>jsr173_api</artifactId>
+ <version>1.0</version>
<url>http://xmlbeans.apache.org/</url>
<properties>
<license>ApacheLicense-2.0.txt</license>
<war.bundle>true</war.bundle>
<usage>Needed for handling XML types in a platform agnostic
way.</usage>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>apollo</groupId>
+ <artifactId>wsa-xbeans</artifactId>
+ <version>SNAPSHOT</version>
+ <url>http://incubator.apache.org/apollo/</url>
+ <properties>
+ <license>ApacheLicense-2.0.txt</license>
+ <usage>XMLBeans for WSA spec types</usage>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
