You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2006/06/10 23:52:36 UTC
svn commit: r413367 - in /beehive/wsm/trunk: build-schema.xml build.xml
src/core/org/apache/beehive/wsm/util/WsmddUtils.java wsm-imports.xml
Author: ekoneil
Date: Sat Jun 10 14:52:35 2006
New Revision: 413367
URL: http://svn.apache.org/viewvc?rev=413367&view=rev
Log:
Final edits to make WSM build and support an IDE -- the build-schema.xml file is now working again.
Modified:
beehive/wsm/trunk/build-schema.xml
beehive/wsm/trunk/build.xml
beehive/wsm/trunk/src/core/org/apache/beehive/wsm/util/WsmddUtils.java
beehive/wsm/trunk/wsm-imports.xml
Modified: beehive/wsm/trunk/build-schema.xml
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/build-schema.xml?rev=413367&r1=413366&r2=413367&view=diff
==============================================================================
--- beehive/wsm/trunk/build-schema.xml (original)
+++ beehive/wsm/trunk/build-schema.xml Sat Jun 10 14:52:35 2006
@@ -1,20 +1,37 @@
<?xml version="1.0"?>
+<!--
+ Copyright 2004-2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+ -->
<project name="Beehive/WSM/Schema Build" default="build" basedir=".">
- <import file="../beehive-imports.xml"/>
+ <import file="wsm-imports.xml"/>
<property name="xsd.schema.dir" location="src/schema-wsdl"/>
<property name="api.schema.dir" location="src/api/schemas"/>
- <property name="schema.jar" location="${beehive.home}/wsm/wsm-schema.jar"/>
- <property name="schema.build.dir" location="${beehive.home}/wsm/build-schema"/>
+ <property name="schema.jar" location="wsm-schema.jar"/>
+ <property name="schema.build.dir" location="build-schema"/>
<target name="build" depends="build-schema, make-jar"/>
<target name="build-schema">
<echo message="generate"/>
- <build-xbean schemaDir="${xsd.schema.dir}" classgenDir="${schema.build.dir}"/>
- <build-xbean schemaDir="${api.schema.dir}" classgenDir="${schema.build.dir}"/>
+ <build-schemas srcdir="${xsd.schema.dir}" destdir="${schema.build.dir}"/>
+ <build-schemas srcdir="${api.schema.dir}" destdir="${schema.build.dir}"/>
</target>
<target name="make-jar">
Modified: beehive/wsm/trunk/build.xml
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/build.xml?rev=413367&r1=413366&r2=413367&view=diff
==============================================================================
--- beehive/wsm/trunk/build.xml (original)
+++ beehive/wsm/trunk/build.xml Sat Jun 10 14:52:35 2006
@@ -357,21 +357,6 @@
<ant dir="test" target="test" inheritAll="false"/>
</target>
- <macrodef name="build-schemas">
- <attribute name="srcdir" description="The directory containing XML Schemas or XMLBeans xsdconfig files to build"/>
- <attribute name="destdir" description="The directory to use for files generated during an XSD build"/>
- <sequential>
- <taskdef name="xmlbeanbuild"
- classname="org.apache.xmlbeans.impl.tool.XMLBean"
- classpathref="xbean.dependency.path"/>
-
- <xmlbeanbuild classpathref="xbean.dependency.path"
- schema="@{srcdir}"
- classgendir="@{destdir}"
- failonerror="true"/>
- </sequential>
- </macrodef>
-
<macrodef name="m2-install-jar" description="Install a resource in a Maven 2 repository">
<attribute name="resource"/>
<sequential>
Modified: beehive/wsm/trunk/src/core/org/apache/beehive/wsm/util/WsmddUtils.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/core/org/apache/beehive/wsm/util/WsmddUtils.java?rev=413367&r1=413366&r2=413367&view=diff
==============================================================================
--- beehive/wsm/trunk/src/core/org/apache/beehive/wsm/util/WsmddUtils.java (original)
+++ beehive/wsm/trunk/src/core/org/apache/beehive/wsm/util/WsmddUtils.java Sat Jun 10 14:52:35 2006
@@ -382,7 +382,7 @@
return _buf.toString();
}
- private final void startLine(Object value) {
+ private void startLine(Object value) {
_buf.append(INDENTS[_indentLevel]);
_buf.append(value);
}
Modified: beehive/wsm/trunk/wsm-imports.xml
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/wsm-imports.xml?rev=413367&r1=413366&r2=413367&view=diff
==============================================================================
--- beehive/wsm/trunk/wsm-imports.xml (original)
+++ beehive/wsm/trunk/wsm-imports.xml Sat Jun 10 14:52:35 2006
@@ -89,4 +89,19 @@
<fileset refid="log4j.fileset"/>
</path>
+ <macrodef name="build-schemas">
+ <attribute name="srcdir" description="The directory containing XML Schemas or XMLBeans xsdconfig files to build"/>
+ <attribute name="destdir" description="The directory to use for files generated during an XSD build"/>
+ <sequential>
+ <taskdef name="xmlbeanbuild"
+ classname="org.apache.xmlbeans.impl.tool.XMLBean"
+ classpathref="xbean.dependency.path"/>
+
+ <xmlbeanbuild classpathref="xbean.dependency.path"
+ schema="@{srcdir}"
+ classgendir="@{destdir}"
+ failonerror="true"/>
+ </sequential>
+ </macrodef>
+
</project>