openbroad-commits

[Frank B. J. <bi...@us...>]

Update of /cvsroot/openbroad/openbroad
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29631

Modified Files:
	build.xml 
Log Message:
Added check and copy for mail and activation jar.
Changed the names of the properties in the build.property file.
The property for the deploy folder is now changes to reflect the jboss/server/all folder instead.
This is because, we then can copy the mail.jar and activation.jar from the lib folder instead.



Index: build.xml
===================================================================
RCS file: /cvsroot/openbroad/openbroad/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.xml	20 Apr 2004 16:35:16 -0000	1.3
--- build.xml	5 May 2004 06:51:49 -0000	1.4
***************
*** 96,100 ****
              <fileset file="${name}-${version}.zip"/>
              <!-- Undeploy already, so it is undeployed, when the new EAR file is deployed -->
!             <fileset dir="${deploy.dest}" includes="${name}*.ear"/>
          </delete>
      </target>
--- 96,100 ----
              <fileset file="${name}-${version}.zip"/>
              <!-- Undeploy already, so it is undeployed, when the new EAR file is deployed -->
!             <fileset dir="${prop.jbossall}/deploy" includes="${name}*.ear"/>
          </delete>
      </target>
***************
*** 158,162 ****
      
      <!-- Compile the server source. -->
!     <target depends="generate" name="servercompile">
          <javac classpathref="classpath" destdir="${builddir}">
              <src path="${srcdir}"/>
--- 158,162 ----
      
      <!-- Compile the server source. -->
!     <target depends="generate,mailactivation" name="servercompile">
          <javac classpathref="classpath" destdir="${builddir}">
              <src path="${srcdir}"/>
***************
*** 204,208 ****
      <target depends="ear" name="deploy">
          <!-- Deploy the new EAR file -->
!         <copy file="${serverdir}/${name}-${version}.ear" tofile="${deploy.dest}/${name}-${version}.ear"/>
      </target>
  
--- 204,208 ----
      <target depends="ear" name="deploy">
          <!-- Deploy the new EAR file -->
!         <copy file="${serverdir}/${name}-${version}.ear" tofile="${prop.jbossall}/deploy/${name}-${version}.ear"/>
      </target>
  
***************
*** 216,264 ****
          <taskdef classpathref="axis.libs" resource="axis-tasks.properties"/>
          
!         <echo><![CDATA[Wait ${deploy.sleep} seconds until the ear file is deployed]]></echo>
!         <sleep seconds="${deploy.sleep}"/>
          
!         <axis-wsdl2java output="${srcdir}" url="http://${deploy.server}:8080/jboss-net/services/FileListService?wsdl">
!             <mapping namespace="http://${deploy.server}:8080/jboss-net/services/FileListService" package="${package}.client.stub"/>
              <mapping namespace="http://net.jboss.org/jmx" package="${package}.client.stub"/>
              <mapping namespace="http://xml.apache.org/xml-soap" package="${package}.client.stub"/>
          </axis-wsdl2java>
!         <axis-wsdl2java output="${srcdir}" url="http://${deploy.server}:8080/jboss-net/services/TypeService?wsdl">
!             <mapping namespace="http://${deploy.server}:8080/jboss-net/services/TypeService" package="${package}.client.stub"/>
              <mapping namespace="http://net.jboss.org/jmx" package="${package}.client.stub"/>
              <mapping namespace="http://xml.apache.org/xml-soap" package="${package}.client.stub"/>
          </axis-wsdl2java>        
!         <axis-wsdl2java output="${srcdir}" url="http://${deploy.server}:8080/jboss-net/services/PlayListService?wsdl">
!             <mapping namespace="http://${deploy.server}:8080/jboss-net/services/PlayListService" package="${package}.client.stub"/>
              <mapping namespace="http://net.jboss.org/jmx" package="${package}.client.stub"/>
              <mapping namespace="http://xml.apache.org/xml-soap" package="${package}.client.stub"/>
          </axis-wsdl2java>       
!         <axis-wsdl2java output="${srcdir}" url="http://${deploy.server}:8080/jboss-net/services/UploadService?wsdl">
!             <mapping namespace="http://${deploy.server}:8080/jboss-net/services/UploadService" package="${package}.client.stub"/>
              <mapping namespace="http://net.jboss.org/jmx" package="${package}.client.stub"/>
              <mapping namespace="http://xml.apache.org/xml-soap" package="${package}.client.stub"/>
          </axis-wsdl2java>
!         <axis-wsdl2java output="${srcdir}" url="http://${deploy.server}:8080/jboss-net/services/InfotypeService?wsdl">
!             <mapping namespace="http://${deploy.server}:8080/jboss-net/services/InfotypeService" package="${package}.client.stub"/>
              <mapping namespace="http://net.jboss.org/jmx" package="${package}.client.stub"/>
              <mapping namespace="http://xml.apache.org/xml-soap" package="${package}.client.stub"/>
          </axis-wsdl2java>
!         <axis-wsdl2java output="${srcdir}" url="http://${deploy.server}:8080/jboss-net/services/InfoService?wsdl">
!             <mapping namespace="http://${deploy.server}:8080/jboss-net/services/InfoService" package="${package}.client.stub"/>
              <mapping namespace="http://net.jboss.org/jmx" package="${package}.client.stub"/>
              <mapping namespace="http://xml.apache.org/xml-soap" package="${package}.client.stub"/>
          </axis-wsdl2java> 
!         <axis-wsdl2java output="${srcdir}" url="http://${deploy.server}:8080/jboss-net/services/UserService?wsdl">
!             <mapping namespace="http://${deploy.server}:8080/jboss-net/services/UserService" package="${package}.client.stub"/>
              <mapping namespace="http://net.jboss.org/jmx" package="${package}.client.stub"/>
              <mapping namespace="http://xml.apache.org/xml-soap" package="${package}.client.stub"/>
          </axis-wsdl2java>     
!         <axis-wsdl2java output="${srcdir}" url="http://${deploy.server}:8080/jboss-net/services/StreamLogService?wsdl">
!             <mapping namespace="http://${deploy.server}:8080/jboss-net/services/StreamLogService" package="${package}.client.stub"/>
              <mapping namespace="http://net.jboss.org/jmx" package="${package}.client.stub"/>
              <mapping namespace="http://xml.apache.org/xml-soap" package="${package}.client.stub"/>
          </axis-wsdl2java>
!         <axis-wsdl2java output="${srcdir}" url="http://${deploy.server}:8080/jboss-net/services/TestService?wsdl">
!             <mapping namespace="http://${deploy.server}:8080/jboss-net/services/TestService" package="${package}.client.stub"/>
              <mapping namespace="http://net.jboss.org/jmx" package="${package}.client.stub"/>
              <mapping namespace="http://xml.apache.org/xml-soap" package="${package}.client.stub"/>
--- 216,264 ----
          <taskdef classpathref="axis.libs" resource="axis-tasks.properties"/>
          
!         <echo><![CDATA[Wait ${prop.deploysleep} seconds until the ear file is deployed]]></echo>
!         <sleep seconds="${prop.deploysleep}"/>
          
!         <axis-wsdl2java output="${srcdir}" url="http://${prop.jbossserver}:8080/jboss-net/services/FileListService?wsdl">
!             <mapping namespace="http://${prop.jbossserver}:8080/jboss-net/services/FileListService" package="${package}.client.stub"/>
              <mapping namespace="http://net.jboss.org/jmx" package="${package}.client.stub"/>
              <mapping namespace="http://xml.apache.org/xml-soap" package="${package}.client.stub"/>
          </axis-wsdl2java>
!         <axis-wsdl2java output="${srcdir}" url="http://${prop.jbossserver}:8080/jboss-net/services/TypeService?wsdl">
!             <mapping namespace="http://${prop.jbossserver}:8080/jboss-net/services/TypeService" package="${package}.client.stub"/>
              <mapping namespace="http://net.jboss.org/jmx" package="${package}.client.stub"/>
              <mapping namespace="http://xml.apache.org/xml-soap" package="${package}.client.stub"/>
          </axis-wsdl2java>        
!         <axis-wsdl2java output="${srcdir}" url="http://${prop.jbossserver}:8080/jboss-net/services/PlayListService?wsdl">
!             <mapping namespace="http://${prop.jbossserver}:8080/jboss-net/services/PlayListService" package="${package}.client.stub"/>
              <mapping namespace="http://net.jboss.org/jmx" package="${package}.client.stub"/>
              <mapping namespace="http://xml.apache.org/xml-soap" package="${package}.client.stub"/>
          </axis-wsdl2java>       
!         <axis-wsdl2java output="${srcdir}" url="http://${prop.jbossserver}:8080/jboss-net/services/UploadService?wsdl">
!             <mapping namespace="http://${prop.jbossserver}:8080/jboss-net/services/UploadService" package="${package}.client.stub"/>
              <mapping namespace="http://net.jboss.org/jmx" package="${package}.client.stub"/>
              <mapping namespace="http://xml.apache.org/xml-soap" package="${package}.client.stub"/>
          </axis-wsdl2java>
!         <axis-wsdl2java output="${srcdir}" url="http://${prop.jbossserver}:8080/jboss-net/services/InfotypeService?wsdl">
!             <mapping namespace="http://${prop.jbossserver}:8080/jboss-net/services/InfotypeService" package="${package}.client.stub"/>
              <mapping namespace="http://net.jboss.org/jmx" package="${package}.client.stub"/>
              <mapping namespace="http://xml.apache.org/xml-soap" package="${package}.client.stub"/>
          </axis-wsdl2java>
!         <axis-wsdl2java output="${srcdir}" url="http://${prop.jbossserver}:8080/jboss-net/services/InfoService?wsdl">
!             <mapping namespace="http://${prop.jbossserver}:8080/jboss-net/services/InfoService" package="${package}.client.stub"/>
              <mapping namespace="http://net.jboss.org/jmx" package="${package}.client.stub"/>
              <mapping namespace="http://xml.apache.org/xml-soap" package="${package}.client.stub"/>
          </axis-wsdl2java> 
!         <axis-wsdl2java output="${srcdir}" url="http://${prop.jbossserver}:8080/jboss-net/services/UserService?wsdl">
!             <mapping namespace="http://${prop.jbossserver}:8080/jboss-net/services/UserService" package="${package}.client.stub"/>
              <mapping namespace="http://net.jboss.org/jmx" package="${package}.client.stub"/>
              <mapping namespace="http://xml.apache.org/xml-soap" package="${package}.client.stub"/>
          </axis-wsdl2java>     
!         <axis-wsdl2java output="${srcdir}" url="http://${prop.jbossserver}:8080/jboss-net/services/StreamLogService?wsdl">
!             <mapping namespace="http://${prop.jbossserver}:8080/jboss-net/services/StreamLogService" package="${package}.client.stub"/>
              <mapping namespace="http://net.jboss.org/jmx" package="${package}.client.stub"/>
              <mapping namespace="http://xml.apache.org/xml-soap" package="${package}.client.stub"/>
          </axis-wsdl2java>
!         <axis-wsdl2java output="${srcdir}" url="http://${prop.jbossserver}:8080/jboss-net/services/TestService?wsdl">
!             <mapping namespace="http://${prop.jbossserver}:8080/jboss-net/services/TestService" package="${package}.client.stub"/>
              <mapping namespace="http://net.jboss.org/jmx" package="${package}.client.stub"/>
              <mapping namespace="http://xml.apache.org/xml-soap" package="${package}.client.stub"/>
***************
*** 267,271 ****
      
      <!-- Compile the client source. -->
!     <target depends="generate,stub,javalayer" name="clientcompile">
          <javac classpathref="classpath" destdir="${builddir}">
              <src path="${srcdir}"/>
--- 267,271 ----
      
      <!-- Compile the client source. -->
!     <target depends="generate,stub,javalayer,mailactivation" name="clientcompile">
          <javac classpathref="classpath" destdir="${builddir}">
              <src path="${srcdir}"/>
***************
*** 410,415 ****
           ******************************************************************* -->
      
!     <!-- Do certain checks for libs -->
      <target name="checks">
          <!-- Check for xdoclet -->
          <condition property="check.xdoclet">
--- 410,418 ----
           ******************************************************************* -->
      
!     <!-- HERE we check, to see if we already have the libs or we should      -->
!     <!-- download them.                                                      -->
      <target name="checks">
+         <property file="build.properties"/>
+     
          <!-- Check for xdoclet -->
          <condition property="check.xdoclet">
***************
*** 424,428 ****
              <available file="xdoclet-${xdoclet.ver}/${jbossnet.jarfile}" type="file"/>
          </condition>
!         <!-- Check for axis.zip -->
          <condition property="check.axis">
              <and>
--- 427,431 ----
              <available file="xdoclet-${xdoclet.ver}/${jbossnet.jarfile}" type="file"/>
          </condition>
!         <!-- Check for axis jars -->
          <condition property="check.axis">
              <and>
***************
*** 441,447 ****
              <available file="${libdir}/jl0.4.jar" type="file"/>
          </condition>
          <!-- Check for deploy property file -->
          <condition property="check.buildprop">
!             <available file="build.properties" type="file"/>
          </condition>
      </target>
--- 444,462 ----
              <available file="${libdir}/jl0.4.jar" type="file"/>
          </condition>
+         <!-- Check for mail and activation libs -->
+         <condition property="check.mailactivation">
+             <and>
+                 <available file="${libdir}/activation.jar" type="file"/>
+                 <available file="${libdir}/mail.jar" type="file"/>
+             </and>
+         </condition>
          <!-- Check for deploy property file -->
          <condition property="check.buildprop">
!             <and>
!                 <available file="build.properties" type="file"/>
!                 <isset property="prop.jbossall" />
!                 <isset property="prop.jbossserver" />
!                 <isset property="prop.deploysleep" />
!             </and>
          </condition>
      </target>
***************
*** 517,521 ****
      <!-- Get jl0.4.jar if not present -->
      <target depends="checks" name="javalayer" unless="check.javalayer">
!         <input addproperty="javalayer.get" validargs="Yes,No">It doesn't look like you've got JavaLayer xdoclet module! Download it?</input>
          
          <condition property="javalayer.abort">
--- 532,536 ----
      <!-- Get jl0.4.jar if not present -->
      <target depends="checks" name="javalayer" unless="check.javalayer">
!         <input addproperty="javalayer.get" validargs="Yes,No">It doesn't look like you've got JavaLayer! Download it?</input>
          
          <condition property="javalayer.abort">
***************
*** 524,528 ****
          
          <!-- jl0.4.jar is needed, so abort build if not present. -->
!         <fail if="javalayer.abort"><![CDATA[JavaLayer xdoclet needed
          You need JavaLayer to build this project. 
          Get it from http://www.javazoom.net]]></fail>
--- 539,543 ----
          
          <!-- jl0.4.jar is needed, so abort build if not present. -->
!         <fail if="javalayer.abort"><![CDATA[JavaLayer needed
          You need JavaLayer to build this project. 
          Get it from http://www.javazoom.net]]></fail>
***************
*** 535,550 ****
      </target>
      
!     <!-- Ask for deploy properties if they are not present. -->
      <target depends="checks" name="buildprop" unless="check.buildprop">
!         <input addproperty="deployprop.dest">Please enter the full path to jboss's deploy folder:</input>
!         <input addproperty="deployprop.server">Please enter the hostname for the jboss server:</input>
!         <input addproperty="deployprop.sleep">
              Please enter number of seconds, the build should wait until the EAR file is deployed on the server:
          </input>
          
          
!         <echo file="build.properties"><![CDATA[deploy.dest=${deployprop.dest}
! deploy.server=${deployprop.server}
! deploy.sleep=${deployprop.sleep}]]></echo>
      </target>
      
--- 550,582 ----
      </target>
      
!     <!-- Get mail and activation jar files -->
!     <target depends="checks,buildprop" name="mailactivation" unless="check.mailactivation">
!         <input addproperty="mailactivation.get" validargs="Yes,No">It doesn't look like you've got the mail and activation jar files! Download it?</input>
!         
!         <condition property="mailactivation.abort">
!             <equals arg1="No" arg2="${mailactivation.get}"/>
!         </condition>
!         
!         <!-- mail and activation jar is needed, so abort build if not present. -->
!         <fail if="mailactivation.abort"><![CDATA[mail and activation needed
!         You need the mail and activation jars to build this project. 
!         Get it from http://www.javazoom.net]]></fail>
!         
!         <copy file="${prop.jbossall}/lib/activation.jar" tofile="${libdir}/activation.jar"/>
!         <copy file="${prop.jbossall}/lib/mail.jar" tofile="${libdir}/mail.jar"/>
!     </target>
!     
!     <!-- Ask for properties if they are not present. -->
      <target depends="checks" name="buildprop" unless="check.buildprop">
!         <input addproperty="prop.jbossall">Please enter the full path to jboss's ALL folder:</input>
!         <input addproperty="prop.jbossserver">Please enter the hostname for the jboss server:</input>
!         <input addproperty="prop.deploysleep">
              Please enter number of seconds, the build should wait until the EAR file is deployed on the server:
          </input>
          
          
!         <echo file="build.properties"><![CDATA[prop.jbossall=${prop.jbossall}
! prop.jbossserver=${prop.jbossserver}
! prop.deploysleep=${prop.deploysleep}]]></echo>
      </target>
      
***************
*** 552,556 ****
      
      <!-- *******************************************************************
!          * EXTRA TARGETS WHICH CAN BE USED BY NEEDS.
           ******************************************************************* -->
      
--- 584,588 ----
      
      <!-- *******************************************************************
!          * EXTRA TARGETS WHICH CAN BE USED WHEN NEEDED.
           ******************************************************************* -->