[Smartfrog-checkins] projects/alpine/prototype/M32 build.xml,1.9,1.10

[Steve L. <st...@us...>]

Update of /cvsroot/smartfrog/projects/alpine/prototype/M32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30253/alpine/prototype/M32

Modified Files:
	build.xml 
Log Message:
accept content type with a ; encoding bit at the end

Index: build.xml
===================================================================
RCS file: /cvsroot/smartfrog/projects/alpine/prototype/M32/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** build.xml	28 Apr 2006 15:57:17 -0000	1.9
--- build.xml	3 May 2006 15:15:56 -0000	1.10
***************
*** 1,5 ****
  <?xml version="1.0"?>
  <project name="m32" default="default"
!   >
  
    <!--
--- 1,5 ----
  <?xml version="1.0"?>
  <project name="m32" default="default"
!     >
  
    <!--
***************
*** 26,30 ****
  
    <description>
!      Build file for Alpine. Needs Ant1.7
    </description>
  
--- 26,30 ----
  
    <description>
!     Build file for Alpine. Needs Ant1.7
    </description>
  
***************
*** 34,59 ****
    <property name="javac.java.version" value="1.5"/>
    <property name="root.dir" location="../../../../core"/>
!   <property name="src.dir" location="src/java" />
    <property name="build.classes.dir" location="build/classes"/>
  
!   <property name="test.src.dir" location="test/java" />
!   
    <!-- Import common stuff -->
    <import file="${root.dir}/common.xml"/>
!   
!   
    <!-- ========================================================== -->
    <!-- ========================================================== -->
    <target name="init"
!     depends="init-standard-output-dirs,use-smartfrog-tasks,use-smartfrog-testharness">
  
    </target>
  
!   
    <!-- import libs. may need proxy setup -->
    <!-- note that this is a very unstable corner of Ant; needs
         CVS_HEAD releases and will definitely change before long -->
!   <target name="m2" depends="m2-tasks" >
!   
      <m2-libraries pathID="libraries.path">
        <!--Required -->
--- 34,59 ----
    <property name="javac.java.version" value="1.5"/>
    <property name="root.dir" location="../../../../core"/>
!   <property name="src.dir" location="src/java"/>
    <property name="build.classes.dir" location="build/classes"/>
  
!   <property name="test.src.dir" location="test/java"/>
! 
    <!-- Import common stuff -->
    <import file="${root.dir}/common.xml"/>
! 
! 
    <!-- ========================================================== -->
    <!-- ========================================================== -->
    <target name="init"
!       depends="init-standard-output-dirs,use-smartfrog-tasks,use-smartfrog-testharness">
  
    </target>
  
! 
    <!-- import libs. may need proxy setup -->
    <!-- note that this is a very unstable corner of Ant; needs
         CVS_HEAD releases and will definitely change before long -->
!   <target name="m2" depends="m2-tasks">
! 
      <m2-libraries pathID="libraries.path">
        <!--Required -->
***************
*** 66,77 ****
            version="${commons-logging.version}"/>
        <dependency groupID="xerces"
!         artifactID="xercesImpl"
!         version="${xerces.version}"/>        
        <dependency groupID="xerces"
!         artifactID="xmlParserAPIs"
!         version="${xerces.version}"/>
        <dependency groupID="xom"
!         artifactID="xom"
!         version="${xom.version}"/>
  
        <!--required at compile but not runtime-->
--- 66,77 ----
            version="${commons-logging.version}"/>
        <dependency groupID="xerces"
!           artifactID="xercesImpl"
!           version="${xerces.version}"/>
        <dependency groupID="xerces"
!           artifactID="xmlParserAPIs"
!           version="${xerces.version}"/>
        <dependency groupID="xom"
!           artifactID="xom"
!           version="${xom.version}"/>
  
        <!--required at compile but not runtime-->
***************
*** 79,87 ****
            artifactID="servletapi"
            version="${servletapi.version}"
!           scope="compile"/>
        <!--optional -->
        <dependency groupID="log4j"
!         artifactID="log4j"
!         version="${log4j.version}"/>
        <dependency groupID="jaxen"
            artifactID="jaxen"
--- 79,88 ----
            artifactID="servletapi"
            version="${servletapi.version}"
!           />
!       <!--          scope="compile"-->
        <!--optional -->
        <dependency groupID="log4j"
!           artifactID="log4j"
!           version="${log4j.version}"/>
        <dependency groupID="jaxen"
            artifactID="jaxen"
***************
*** 93,99 ****
        <!--optional, for smartfrog deployment-->
        <dependency groupID="org.smartfrog"
!         artifactID="smartfrog"
!         version="${smartfrog.version}"
!         scope="compile"/>
        <dependency groupID="org.smartfrog"
            artifactID="sf-jetty"
--- 94,100 ----
        <!--optional, for smartfrog deployment-->
        <dependency groupID="org.smartfrog"
!           artifactID="smartfrog"
!           version="${smartfrog.version}"
!           scope="compile"/>
        <dependency groupID="org.smartfrog"
            artifactID="sf-jetty"
***************
*** 111,117 ****
            scope="test"/>
        <dependency groupID="junit"
!         artifactID="junit"
!         version="${junit.version}"
!         scope="test"/>
        <dependency groupID="org.smartfrog"
            artifactID="sf-testharness"
--- 112,118 ----
            scope="test"/>
        <dependency groupID="junit"
!           artifactID="junit"
!           version="${junit.version}"
!           scope="test"/>
        <dependency groupID="org.smartfrog"
            artifactID="sf-testharness"
***************
*** 119,132 ****
            scope="test"/>
      </m2-libraries>
!   </target>  
!     
!   
!    <!-- inline creation of a minimal pom
!       This sets it up with all the dependencies. We strip out some unwanted baggage from
!       dependencies, like junit, dom4j and jdom. Dirty pom files stop here :)
!    -->
!    <target name="m2-make-pom" depends="m2-init" unless="project.haspom">
!      <echo message="Creating Pom ${target.pom}" level="verbose"/>
!      <echoxml file="${target.pom}">
        <project>
          <modelVersion>4.0.0</modelVersion>
--- 120,133 ----
            scope="test"/>
      </m2-libraries>
!   </target>
! 
! 
!   <!-- inline creation of a minimal pom
!      This sets it up with all the dependencies. We strip out some unwanted baggage from
!      dependencies, like junit, dom4j and jdom. Dirty pom files stop here :)
!   -->
!   <target name="m2-make-pom" depends="m2-init" unless="project.haspom">
!     <echo message="Creating Pom ${target.pom}" level="verbose"/>
!     <echoxml file="${target.pom}">
        <project>
          <modelVersion>4.0.0</modelVersion>
***************
*** 156,160 ****
              <version>${commons-logging.version}</version>
            </dependency>
! <!--          <dependency>
              <groupId>xalan</groupId>
              <artifactId>xalan</artifactId>
--- 157,161 ----
              <version>${commons-logging.version}</version>
            </dependency>
!           <!--          <dependency>
              <groupId>xalan</groupId>
              <artifactId>xalan</artifactId>
***************
*** 177,180 ****
--- 178,186 ----
            </dependency>
            <dependency>
+             <groupId>servletapi</groupId>
+             <artifactId>servletapi</artifactId>
+             <version>${servletapi.version}</version>
+           </dependency>
+           <dependency>
              <groupId>xom</groupId>
              <artifactId>xom</artifactId>
***************
*** 208,212 ****
    <!-- ========================================================== -->
    <target name="declare-compile.classpath"
!     depends="declare-base.compile.classpath,m2">
      <path id="compile.classpath">
        <path refid="base.compile.classpath"/>
--- 214,218 ----
    <!-- ========================================================== -->
    <target name="declare-compile.classpath"
!       depends="declare-base.compile.classpath,m2">
      <path id="compile.classpath">
        <path refid="base.compile.classpath"/>
***************
*** 215,225 ****
      <property name="compile.classpath.value" refid="exec.classpath"/>
      <echo level="verbose">compile.classpath=${compile.classpath.value}</echo>
!   </target> 
!   
    <!-- this is the classpath for running the daemon -->
!   
!   <target name="declare-run.classpath" depends="init" >  
      <path id="run.classpath">
!        <path refid="smartfrog.classpath"/>
      </path>
      <sf-tourl property="run.classpath.value">
--- 221,231 ----
      <property name="compile.classpath.value" refid="exec.classpath"/>
      <echo level="verbose">compile.classpath=${compile.classpath.value}</echo>
!   </target>
! 
    <!-- this is the classpath for running the daemon -->
! 
!   <target name="declare-run.classpath" depends="init">
      <path id="run.classpath">
!       <path refid="smartfrog.classpath"/>
      </path>
      <sf-tourl property="run.classpath.value">
***************
*** 227,244 ****
      </sf-tourl>
      <echo level="verbose">
!         run.classpath=
!         ${run.classpath.value}</echo>    
!   </target>  
!   
!   <target name="declare-exec.classpath" depends="declare-compile.classpath" >  
      <path id="exec.classpath">
        <path refid="compile.classpath"/>
        <pathelement location="${target.jar}"/>
!     </path>    
      <property name="exec.classpath.value" refid="exec.classpath"/>
      <echo level="verbose">exec.classpath=${exec.classpath.value}</echo>
!   </target>  
!   
!   <target name="declare-tests.run.classpath" depends="declare-tests.compile.classpath" >  
      <path id="tests.run.classpath">
        <path refid="tests.compile.classpath"/>
--- 233,250 ----
      </sf-tourl>
      <echo level="verbose">
!       run.classpath=
!       ${run.classpath.value}</echo>
!   </target>
! 
!   <target name="declare-exec.classpath" depends="declare-compile.classpath">
      <path id="exec.classpath">
        <path refid="compile.classpath"/>
        <pathelement location="${target.jar}"/>
!     </path>
      <property name="exec.classpath.value" refid="exec.classpath"/>
      <echo level="verbose">exec.classpath=${exec.classpath.value}</echo>
!   </target>
! 
!   <target name="declare-tests.run.classpath" depends="declare-tests.compile.classpath">
      <path id="tests.run.classpath">
        <path refid="tests.compile.classpath"/>
***************
*** 247,252 ****
      <property name="tests.run.classpath.value" refid="tests.run.classpath"/>
      <echo level="verbose">tests.run.classpath=${tests.run.classpath.value}</echo>
!   </target>  
!   
    <!-- ========================================================== -->
    <!-- create a distro. 
--- 253,258 ----
      <property name="tests.run.classpath.value" refid="tests.run.classpath"/>
      <echo level="verbose">tests.run.classpath=${tests.run.classpath.value}</echo>
!   </target>
! 
    <!-- ========================================================== -->
    <!-- create a distro. 
***************
*** 254,262 ****
    <!-- ========================================================== -->
    <target name="dist" depends="package,package-tests"
!     description="create a distribution">
  
-   </target>    
-     
-   
    <!-- ========================================================== -->
    <!-- set up any properties for deployment -->
--- 260,268 ----
    <!-- ========================================================== -->
    <target name="dist" depends="package,package-tests"
!       description="create a distribution">
! 
!   </target>
! 
  
    <!-- ========================================================== -->
    <!-- set up any properties for deployment -->
***************
*** 266,270 ****
      <property name="application.name" value="alpine"/>
      <property name="deploy.sf"
!       value="alpine.sf"/>
      <property name="default.ini" location="test/files/default.ini"/>
      <property name="default.sf" location="test/files/default.sf"/>
--- 272,276 ----
      <property name="application.name" value="alpine"/>
      <property name="deploy.sf"
!         value="alpine.sf"/>
      <property name="default.ini" location="test/files/default.ini"/>
      <property name="default.sf" location="test/files/default.sf"/>
***************
*** 275,306 ****
    <!-- ========================================================== -->
    <target name="init-codebase" depends="init-deploy-properties,dist"
!     description="set up the codebase property">
      <sf-tourl property="codebase">
        <fileset file="${target.jar}"/>
        <fileset file="${test.jar}"/>
!       <path refid="libraries.path" />
        <path refid="compile.classpath"/>
      </sf-tourl>
      <echo>
!         deploying to ${deploy.host}
!         codebase=${codebase}</echo>
    </target>
!   
    <!-- ========================================================== -->
    <!-- deploy; requires a host -->
    <!-- ========================================================== -->
    <target name="deploy" depends="init-codebase,init-deploy-properties"
!     description="deploy">
  
      <sf-deploy classpathref="run.classpath"
!       logStackTraces="true"
!       host="${deploy.host}"
!       timeout="30000"
!       >
        <codebase url="${codebase}"/>
  
        <application name="${application.name}">
!               sfCodeBase PROPERTY org.smartfrog.codebase;
!               #include "/${deploy.sf}"
        </application>
      </sf-deploy>
--- 281,312 ----
    <!-- ========================================================== -->
    <target name="init-codebase" depends="init-deploy-properties,dist"
!       description="set up the codebase property">
      <sf-tourl property="codebase">
        <fileset file="${target.jar}"/>
        <fileset file="${test.jar}"/>
!       <path refid="libraries.path"/>
        <path refid="compile.classpath"/>
      </sf-tourl>
      <echo>
!       deploying to ${deploy.host}
!       codebase=${codebase}</echo>
    </target>
! 
    <!-- ========================================================== -->
    <!-- deploy; requires a host -->
    <!-- ========================================================== -->
    <target name="deploy" depends="init-codebase,init-deploy-properties"
!       description="deploy">
  
      <sf-deploy classpathref="run.classpath"
!         logStackTraces="true"
!         host="${deploy.host}"
!         timeout="30000"
!         >
        <codebase url="${codebase}"/>
  
        <application name="${application.name}">
!         sfCodeBase PROPERTY org.smartfrog.codebase;
!         #include "/${deploy.sf}"
        </application>
      </sf-deploy>
***************
*** 308,320 ****
  
    <target name="undeploy" depends="init-deploy-properties"
!     description="deploy">
  
      <sf-undeploy classpathref="run.classpath"
!       logStackTraces="true"
!       host="${deploy.host}"
!       timeout="30000"
!       application="${application.name}"/>
    </target>
!     
  
    <!-- ========================================================== -->
--- 314,326 ----
  
    <target name="undeploy" depends="init-deploy-properties"
!       description="deploy">
  
      <sf-undeploy classpathref="run.classpath"
!         logStackTraces="true"
!         host="${deploy.host}"
!         timeout="30000"
!         application="${application.name}"/>
    </target>
! 
  
    <!-- ========================================================== -->
***************
*** 323,327 ****
  
  
- 
    <!-- =================================================================== -->
    <!-- system tests -->
--- 329,332 ----
***************
*** 372,375 ****
  
  
!  <target name="all" depends="dist,unit-tests,installed" />
  </project>
--- 377,380 ----
  
  
!   <target name="all" depends="dist,unit-tests,installed"/>
  </project>