User: gropi   
  Date: 02/04/18 12:43:28

  Modified:    src/examples/build build.xml
  Log:
  Make "interest" example work again with these versions:
  JBoss 2.4.5RC1, 2.4.5_Tomcat-4.0.3, 2.4.5_Jetty-4.0.0
  JBoss 3.0.0RC1, 3.0.0RC1_Jetty
  
  Revision  Changes    Path
  3.1       +27 -3     manual/src/examples/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/manual/src/examples/build/build.xml,v
  retrieving revision 3.0
  retrieving revision 3.1
  diff -u -r3.0 -r3.1
  --- build.xml 18 Nov 2001 20:10:42 -0000      3.0
  +++ build.xml 18 Apr 2002 19:43:28 -0000      3.1
  @@ -21,6 +21,15 @@
       <property name="src.resources" value="${basedir}/resources"/>
       <property name="build.dir" value="${basedir}/build-examples"/>
       <property name="dist.dir" value="${basedir}/../../dist-examples"/>
  + 
  +    <target name="validate-deploy">
  +        <!-- Look for the deployment dir. Differs between 2.x and 3.x 
  +         -->
  +        <!-- First look for JBoss 2.x -->
  +        <available property="deploy.dir" value="${jboss.dist}/deploy" 
file="${jboss.dist}/deploy" type="dir"/>
  +        <!-- Then check for JBoss 3.x (will override previous one if found) -->
  +        <available property="deploy.dir" 
value="${jboss.dist}/server/default/deploy" file="${jboss.dist}/server/default/deploy" 
type="dir"/>
  +    </target>
   
       <target name="validate-servlet">
           <!-- Override with your web server servlet jar location. 
  @@ -31,6 +40,8 @@
           <available property="servlet.jar" 
value="${env.JBOSS_DIST}/../jetty/lib/javax.servlet.jar" 
file="${env.JBOSS_DIST}/../jetty/lib/javax.servlet.jar"/>
           <available property="servlet.jar" 
value="${env.JBOSS_DIST}/../catalina/common/lib/servlet.jar" 
file="${env.JBOSS_DIST}/../catalina/common/lib/servlet.jar"/>
           <available property="servlet.jar" 
value="${env.JBOSS_DIST}/../catalina/common/lib/servlet.jar" 
file="${env.TOMCAT_HOME}/lib/servlet.jar"/>
  +        <!-- JBoss 3.0.x -->
  +        <available property="servlet.jar" 
value="${env.JBOSS_DIST}/lib/javax.servlet.jar" 
file="${env.JBOSS_DIST}/lib/javax.servlet.jar"/>
           <property name="servlet.jar" value="COULD_NOT_FIND_SERVLET_JAR"/>
   
           <path id="base.path_22">
  @@ -49,16 +60,29 @@
               <pathelement location="${jboss.dist}/client/jnp-client.jar"/>
               <pathelement location="${servlet.jar}"/>
           </path>
  +        <path id="base.path_30">
  +            <pathelement location="${jboss.dist}/client/jboss-j2ee.jar"/>
  +            <pathelement location="${jboss.dist}/client/jboss-common-client.jar"/>
  +            <pathelement location="${jboss.dist}/client/log4j.jar"/>
  +            <pathelement location="${jboss.dist}/client/jbosssx-client.jar"/>
  +            <pathelement location="${jboss.dist}/client/jboss-client.jar"/>
  +            <pathelement location="${jboss.dist}/client/jnp-client.jar"/>
  +            <pathelement location="${servlet.jar}"/>
  +        </path>
  +
       </target>
   
  -    <target name="validate-jboss" depends="validate-servlet">
  +    <target name="validate-jboss" depends="validate-servlet,validate-deploy">
  +        <!-- JBoss 2.2.x -->
           <available property="classpath_id" value="base.path_22" 
file="${jboss.dist}/client/ejb.jar" />
  +        <!-- JBoss 2.4.x -->
           <available property="classpath_id" value="base.path_24" 
file="${jboss.dist}/client/jboss-j2ee.jar" />
  -
  +        <!-- JBoss 3.0.x -->
  +        <available property="classpath_id" value="base.path_30" 
file="${jboss.dist}/client/jboss-common-client.jar" />
       </target>
       
       <target name="fail_if_not_valid" unless="classpath_id">
  -        <fail message="jboss.dist=${jboss.dist} is not a valid JBOSS_DIST 
directory. If using a bundled JBoss version set JBOSS_DIST to the jboss/ subdir."/>
  +        <fail message="jboss.dist=${jboss.dist} is not a valid JBOSS_DIST 
directory. Please make sure the JBOSS_DIST environment variable is set properly. If 
you are using a bundled JBoss 2.x version please set JBOSS_DIST to the jboss/ 
subdir."/>
       </target>
       
       <target name="init" depends="validate-jboss,fail_if_not_valid">
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to