Author: jkaputin
Date: Mon Oct  2 14:43:05 2006
New Revision: 452230

URL: http://svn.apache.org/viewvc?view=rev&rev=452230
Log:
Changed WSDL4J dependency to 1.6.1. Changed ANT build to

create a source archive and include License and Notice

files in meta-inf directory of all JARs. Changed the M6

release notes to reflect the library dependencies 

updated to match Axis2 1.1.

Modified:
    incubator/woden/branches/M6/build.properties
    incubator/woden/branches/M6/build.xml
    incubator/woden/branches/M6/release-notes.html

Modified: incubator/woden/branches/M6/build.properties
URL: 
http://svn.apache.org/viewvc/incubator/woden/branches/M6/build.properties?view=diff&rev=452230&r1=452229&r2=452230
==============================================================================
--- incubator/woden/branches/M6/build.properties (original)
+++ incubator/woden/branches/M6/build.properties Mon Oct  2 14:43:05 2006
@@ -25,8 +25,8 @@
 AntURL               = 
http://www.apache.org/dist/ant/binaries/apache-ant-1.6.5-bin.zip

 AntFile              = apache-ant-1.6.5-bin.zip

 AntJar               = ant.jar

-WSDL4JURL            = 
http://surfnet.dl.sourceforge.net/sourceforge/wsdl4j/wsdl4j-bin-1.5.3.zip

-WSDL4JFile           = wsdl4j-bin-1.5.3.zip

+WSDL4JURL            = 
http://surfnet.dl.sourceforge.net/sourceforge/wsdl4j/wsdl4j-bin-1.6.1.zip

+WSDL4JFile           = wsdl4j-bin-1.6.1.zip

 AxiomApiURL          = 
http://www.apache.org/dist/java-repository/ws-commons/jars/axiom-api-1.1.1.jar

 AxiomApiFile         = axiom-api-1.1.1.jar

 AxiomImplURL         = 
http://www.apache.org/dist/java-repository/ws-commons/jars/axiom-impl-1.1.1.jar


Modified: incubator/woden/branches/M6/build.xml
URL: 
http://svn.apache.org/viewvc/incubator/woden/branches/M6/build.xml?view=diff&rev=452230&r1=452229&r2=452230
==============================================================================
--- incubator/woden/branches/M6/build.xml (original)
+++ incubator/woden/branches/M6/build.xml Mon Oct  2 14:43:05 2006
@@ -251,6 +251,15 @@
                        </fileset>

                </copy>

 

+               <!-- Copy the LICENSE and NOTICE files. -->

+               <mkdir dir="${build.classes}/meta-inf" />

+               <copy todir="${build.classes}/meta-inf">

+                       <fileset dir="${build.home}">

+                               <include name="LICENSE" />

+                               <include name="NOTICE" />

+                       </fileset>

+               </copy>

+

                <jar destfile="${build.output}/${impl.name}.jar" 
basedir="${build.classes}" />

        </target>

 

@@ -275,6 +284,15 @@
                        </fileset>

                </copy>

 

+               <!-- Copy the LICENSE and NOTICE files. -->

+               <mkdir dir="${build.classes.api}/meta-inf" />

+               <copy todir="${build.classes.api}/meta-inf">

+                       <fileset dir="${build.home}">

+                               <include name="LICENSE" />

+                               <include name="NOTICE" />

+                       </fileset>

+               </copy>

+

                <jar destfile="${build.output}/${api.name}.jar" 
basedir="${build.classes.api}" />

        </target>

 

@@ -292,6 +310,15 @@
                        </fileset>

                </copy>

 

+               <!-- Copy the LICENSE and NOTICE files. -->

+               <mkdir dir="${build.classes.ant}/meta-inf" />

+               <copy todir="${build.classes.ant}/meta-inf">

+                       <fileset dir="${build.home}">

+                               <include name="LICENSE" />

+                               <include name="NOTICE" />

+                       </fileset>

+               </copy>

+

                <jar destfile="${build.output}/${ant.name}.jar" 
basedir="${build.classes.ant}" />

        </target>

 

@@ -319,6 +346,15 @@
                        </fileset>

                </copy>

 

+               <!-- Copy the LICENSE and NOTICE files. -->

+               <mkdir dir="${build.classes.test}/meta-inf" />

+               <copy todir="${build.classes.test}/meta-inf">

+                       <fileset dir="${build.home}">

+                               <include name="LICENSE" />

+                               <include name="NOTICE" />

+                       </fileset>

+               </copy>

+

                <jar destfile="${build.output}/${test.name}.jar" 
basedir="${build.classes.test}" />

        </target>

 

@@ -459,6 +495,7 @@
 

                <antcall target="createZip" />

                <antcall target="createTarGzBz2" />

+               <antcall target="createSrcZip"/>

        </target>

 

        <!-- Builds a zip of the distributable dir -->

@@ -480,6 +517,24 @@
                <delete file="${build.output}/${archive.name}-${buildId}.tar" />

        </target>

 

+       <!-- Builds a zip of the distributable dir -->

+       <!-- This target is not meant to be called on its own -->

+       <target name="createSrcZip" depends="init">

+               <zip 
destfile="${build.output}/${archive.name}-${buildId}-src.zip">

+                   <zipfileset dir="${build.home}/src" 
prefix="${archive.root.prefix}-${buildId}/src"/>

+                   <zipfileset dir="${build.home}/test" 
prefix="${archive.root.prefix}-${buildId}/test"/>

+                   <zipfileset dir="${build.home}/ant-test" 
prefix="${archive.root.prefix}-${buildId}/ant-test"/>

+                   <zipfileset dir="${build.home}/eclipseplugin" 
prefix="${archive.root.prefix}-${buildId}/eclipseplugin"/>

+                   <zipfileset dir="${build.home}" 
prefix="${archive.root.prefix}-${buildId}">

+                       <include name="LICENSE*"/>

+                       <include name="NOTICE"/>

+                       <include name="README"/>

+                       <include name="build.*"/>

+                       <include name="release-notes.html"/>

+                   </zipfileset>

+               </zip>

+       </target>

+

        <!-- Create checksums for the zip and tar.gz files -->

        <target name="createChecksums">

                <checksum file="${build.output}/${archive.name}-${buildId}.zip" 
/>

@@ -488,6 +543,8 @@
                <checksum 
file="${build.output}/${archive.name}-${buildId}.tar.gz" algorithm="SHA" 
fileext=".sha1" />

                <checksum 
file="${build.output}/${archive.name}-${buildId}.tar.bz2" />

                <checksum 
file="${build.output}/${archive.name}-${buildId}.tar.bz2" algorithm="SHA" 
fileext=".sha1" />

+               <checksum 
file="${build.output}/${archive.name}-${buildId}-src.zip" />

+               <checksum 
file="${build.output}/${archive.name}-${buildId}-src.zip" algorithm="SHA" 
fileext=".sha1" />

        </target>

 

        <!-- A clean target to be run before builds. -->


Modified: incubator/woden/branches/M6/release-notes.html
URL: 
http://svn.apache.org/viewvc/incubator/woden/branches/M6/release-notes.html?view=diff&rev=452230&r1=452229&r2=452230
==============================================================================
--- incubator/woden/branches/M6/release-notes.html (original)
+++ incubator/woden/branches/M6/release-notes.html Mon Oct  2 14:43:05 2006
@@ -73,7 +73,7 @@
 <h2>Current Release Structure</h2>

 

 <p>

-       The distribution contains three Woden jar files described below:<br />

+       The binary distribution contains three Woden jar files described 
below:<br />

        <ul>

                <li>

                        woden-api.jar - Contains only the public Woden API (not 
yet final). 

@@ -88,13 +88,13 @@
                        woden-ant.jar - Contains the Ant task ValidateWSDL20.

                </li>

        </ul>

-       Woden depends on the following libraries and these are included in the 
distribution:

+       Woden depends on the following libraries and these are included in the 
binary distribution:

        <ul>

            <li>

             Apache WS Commons XmlSchema 1.1 (for representing schemas in the 
Woden API)

            </li>

            <li>

-            Apache Xerces 2.8.0 (used by XmlSchema and by the DOM 
implementation of Woden)

+            Apache Xerces 2.8.1 (used by XmlSchema and by the DOM 
implementation of Woden)

            </li>

            <li>

             Apache WS Commons AXIOM 1.1

@@ -103,12 +103,15 @@
             Apache Commons Logging API 1.1 (used by the AXIOM implementation 
of Woden)

            </li>

            <li>

-               StAX 1.0.1 API and the Woodstox 2.9.3 implementation  (used by 
the AXIOM implementation of Woden)

+               StAX 1.0.1 API and the Woodstox 3.0.1 implementation  (used by 
the AXIOM implementation of Woden)

            </li>

            <li>

-               WSDL4J 1.52 (used by the standalone WSDL 1.1 conversion program)

+               WSDL4J 1.6.1 (used by the standalone WSDL 1.1 conversion 
program)

            </li>

        </ul>

+       The source distribution contains all of the Woden source code; the API 
source, the implementation source and

+       the Ant tasks source. It does not contain the dependent libraries, but 
the build.properties file specifies

+       where they can be obtained from. 

 </p>

        

 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to