Is this still broken? Scott Semyan
-----Original Message----- From: Bryan Che [mailto:[EMAIL PROTECTED] Sent: Monday, April 25, 2005 12:47 PM To: Beehive Dev Subject: Re: svn commit: r164633 - in /incubator/beehive/trunk: docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_building. xml wsm/build.xml wsm/drt/build.xml Hi, Eddie and I were doing a synchronized commit on beehive and Controlhaus for this change. Unforutnately, Controlhaus svn is down right now. So, until it comes back up and Eddie is able to commit my patch, distribution builds are going to be broken. Bryan [EMAIL PROTECTED] wrote: > Author: bryanche > Date: Mon Apr 25 12:33:52 2005 > New Revision: 164633 > > URL: http://svn.apache.org/viewcvs?rev=164633&view=rev > Log: > Change wsm so that it prepends "beehive-" to its jars: > - beehive-wsm.jar > - beehive-wsm-axis.jar > - beehive-wsdl.jar > > ALERT: This change will break code that references the old jar names. > > NOTE: You will have to do an "ant clean" before updating to this > change or manually remove the file, wsm/lib/wsdltypes.jar, after you > update since this change will modify the clean target to delete > "beehive-wsdltypes.jar" instead. > > drt: pass > run.test.dist: pass > > > Modified: > incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pag eflow/pageflow_building.xml > incubator/beehive/trunk/wsm/build.xml > incubator/beehive/trunk/wsm/drt/build.xml > > Modified: > incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/p > ageflow/pageflow_building.xml > URL: > http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src > /documentation/content/xdocs/pageflow/pageflow_building.xml?rev=164633 > &r1=164632&r2=164633&view=diff > ====================================================================== > ======== > --- > incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/p > ageflow/pageflow_building.xml (original) > +++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdo > +++ cs/pageflow/pageflow_building.xml Mon Apr 25 12:33:52 2005 > @@ -253,17 +253,17 @@ > </tr> > <tr> > <td>Beehive Web Services</td> > - <td>wsdltypes.jar</td> > + <td>beehive-wsdltypes.jar</td> > <td><em>distribution</em></td> > </tr> > <tr> > <td>Beehive Web Services</td> > - <td>wsm-axis.jar</td> > + <td>beehive-wsm-axis.jar</td> > <td><em>distribution</em></td> > </tr> > <tr> > <td>Beehive Web Services</td> > - <td>wsm.jar</td> > + <td>beehive-wsm.jar</td> > <td><em>distribution</em></td> > </tr> > </table> > > Modified: incubator/beehive/trunk/wsm/build.xml > URL: > http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/build.xml?re > v=164633&r1=164632&r2=164633&view=diff > ====================================================================== > ======== > --- incubator/beehive/trunk/wsm/build.xml (original) > +++ incubator/beehive/trunk/wsm/build.xml Mon Apr 25 12:33:52 2005 > @@ -33,8 +33,8 @@ > <property name="runtime.classes" location="${classes.dir}/runtime" /> > <property name="lib.dir" location="lib" /> > <property name="ext.lib.dir" location="external" /> > - <property name="wsm.jar" location="${jars.dir}/wsm.jar" /> > - <property name="wsm-axis.jar" location="${jars.dir}/wsm-axis.jar" /> > + <property name="wsm.jar" location="${jars.dir}/beehive-wsm.jar" /> > + <property name="wsm-axis.jar" > + location="${jars.dir}/beehive-wsm-axis.jar" /> > <property name="xsd.schema.dir" location="src/runtime/schema" /> > <property name="xsd.classes.dir" location="${build.dir}/xsd-classes" /> > <property name="xsd.includes" value="*.xsd" /> @@ -51,7 +51,7 @@ > <path refid="ant-jar.dependency.path"/> > <path refid="commons-codec.dependency.path"/> > <pathelement location="${api.classes}"/> > - <pathelement location="${lib.dir}/wsdltypes.jar"/> > + <pathelement location="${lib.dir}/beehive-wsdltypes.jar"/> > <pathelement location="${lib.dir}/schematypes.jar"/> > <pathelement location="${ext.lib.dir}/jaxrpc.jar"/> > <path refid="xbean.dependency.path"/> @@ -203,7 +203,7 @@ > <target name="wsdltypes" description="Generate the xml bean types wsdl schema"> > <fileset id="xwsdl.schema.source" dir="${wsdl.schema.dir}" includes="${xsd.includes}"/> > <!-- checks whether classes have already been generated. --> > - <uptodate property="wsdltypes.uptodate" targetfile="${lib.dir}/wsdltypes.jar"> > + <uptodate property="wsdltypes.uptodate" > + targetfile="${lib.dir}/beehive-wsdltypes.jar"> > <srcfiles refid="xwsdl.schema.source"/> > </uptodate> > <antcall target="wsdltypes.generate"/> @@ -212,7 +212,7 @@ > <echo message="generate wsdl types"/> > <delete dir="${temp.wsdl.classes.dir}" /> > <build-xbean schemaDir="${wsdl.schema.dir}" classgenDir="${temp.wsdl.classes.dir}"/> > - <jar jarfile="${lib.dir}/wsdltypes.jar"> > + <jar jarfile="${lib.dir}/beehive-wsdltypes.jar"> > <fileset dir="${temp.wsdl.classes.dir}" /> > </jar> > </target> > @@ -282,7 +282,7 @@ > <!-- ==================================================================== --> > <target name="clean"> > <delete dir="${build.dir}"/> > - <delete file="${lib.dir}/wsdltypes.jar" /> > + <delete file="${lib.dir}/beehive-wsdltypes.jar" /> > <ant dir="drt" target="clean" inheritAll="false"/> > </target> > > > Modified: incubator/beehive/trunk/wsm/drt/build.xml > URL: > http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/build.xm > l?rev=164633&r1=164632&r2=164633&view=diff > ====================================================================== > ======== > --- incubator/beehive/trunk/wsm/drt/build.xml (original) > +++ incubator/beehive/trunk/wsm/drt/build.xml Mon Apr 25 12:33:52 2005 > @@ -40,10 +40,10 @@ > <path refid="commons-discovery.dependency.path"/> > <path refid="commons-logging.dependency.path"/> > > - <pathelement location="${lib.dir}/wsdltypes.jar"/> > + <pathelement location="${lib.dir}/beehive-wsdltypes.jar"/> > <pathelement location="${lib.dir}/schematypes.jar"/> > - <pathelement location="../build/jars/wsm.jar"/> > - <pathelement location="../build/jars/wsm-axis.jar"/> > + <pathelement location="../build/jars/beehive-wsm.jar"/> > + <pathelement location="../build/jars/beehive-wsm-axis.jar"/> > <fileset refid="axis.jars"/> > </path> > > >
