[Exist-commits] eXist-1.0 .classpath,1.18,1.19 build.properties,1.18,1.19 build.xml,1.46,1.47

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7226

Modified Files:
	.classpath build.properties build.xml 
Log Message:
Added XmldbRealm for Tomcat

Index: .classpath
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/.classpath,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** .classpath	23 Feb 2004 09:36:04 -0000	1.18
--- .classpath	24 Apr 2004 13:45:53 -0000	1.19
***************
*** 60,63 ****
--- 60,64 ----
  	<classpathentry kind="lib" path="lib/core/javax.servlet.jar"/>
  	<classpathentry kind="lib" path="lib/endorsed/xerces-2.6.1.jar"/>
+ 	<classpathentry kind="lib" path="/home/wolf/Java/jakarta-tomcat-5.0.19/server/lib/catalina.jar"/>
  	<classpathentry kind="output" path="build/classes"/>
  </classpath>

Index: build.xml
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/build.xml,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** build.xml	23 Apr 2004 13:07:46 -0000	1.46
--- build.xml	24 Apr 2004 13:45:53 -0000	1.47
***************
*** 31,36 ****
  	<property name="xmldb.src" value="undefined"/> 
  	
!     <property name="dist.dir" value="${dist}/${project.name}-${project.version}"/>
  	<available file="${xmldb.src}" type="dir" property="has.xmldb.src"/>
  
      <path id="classpath.core">
--- 31,39 ----
  	<property name="xmldb.src" value="undefined"/> 
  	
! 	<property name="dist.dir" value="${dist}/${project.name}-${project.version}"/>
! 
  	<available file="${xmldb.src}" type="dir" property="has.xmldb.src"/>
+ 	
+ 	<available file="${catalina.home}/server/lib" property="catalina.present"/>
  
      <path id="classpath.core">
***************
*** 49,53 ****
          <pathelement path="exist.jar"/>
  		<pathelement path="exist-optional.jar"/>
!         <pathelement path="${java.class.path}"/>
      </path>
  
--- 52,56 ----
          <pathelement path="exist.jar"/>
  		<pathelement path="exist-optional.jar"/>
! 		<pathelement path="${java.class.path}"/>
      </path>
  
***************
*** 98,101 ****
--- 101,106 ----
  			destdir="${build.classes}" encoding="UTF-8"
  			optimize="${build.optimize}" srcdir="${src}" target="1.4">
+ 			<include name="org/**"/>
+ 			<exclude name="org/exist/http/realm/**"/>
              <classpath>
                  <path refid="classpath.core"/>
***************
*** 104,108 ****
          </javac>
      </target>
!     
      <!-- =================================================================== -->
      <!-- Run antlr parser generator										   -->
--- 109,134 ----
          </javac>
      </target>
! 
! 	<!-- =================================================================== -->
! 	<!-- Compile the Tomcat realm                                            -->
!     <!-- =================================================================== -->
! 	<target name="compile-tomcat-realm" if="catalina.present">
! 		<echo message="Compiling Tomcat Realm"/>
! 		<javac debug="${build.debug}" deprecation="${build.deprecation}" 
! 			destdir="${build.classes}" encoding="UTF-8"
! 			optimize="${build.optimize}" srcdir="${src}" target="1.4">
! 			<include name="org/exist/http/realm/**"/>
! 			<classpath>
! 				<path refid="classpath.core"/>
! 				<fileset dir="${catalina.home}/server/lib">
! 					<include name="*.jar"/>
! 				</fileset>
! 				<fileset dir="${catalina.home}/common/lib">
! 					<include name="*.jar"/>
! 				</fileset>
! 			</classpath>
! 		</javac>
! 	</target>
! 
      <!-- =================================================================== -->
      <!-- Run antlr parser generator										   -->
***************
*** 150,154 ****
      <!-- Create jar file          										   -->
      <!-- =================================================================== -->
!     <target name="jar" depends="compile">
  		<copy file="${src}/CatalogManager.properties" todir="${build.classes}"/>
  	    <copy todir="${build.classes}/org/exist/client">
--- 176,180 ----
      <!-- Create jar file          										   -->
      <!-- =================================================================== -->
!     <target name="jar" depends="compile, compile-tomcat-realm">
  		<copy file="${src}/CatalogManager.properties" todir="${build.classes}"/>
  	    <copy todir="${build.classes}/org/exist/client">

Index: build.properties
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/build.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** build.properties	23 Apr 2004 13:07:46 -0000	1.18
--- build.properties	24 Apr 2004 13:45:53 -0000	1.19
***************
*** 25,26 ****
--- 25,29 ----
  # sources of the XML:DB API. Needed for javadoc
  xmldb.src = /home/wolf/Java/xmldb/xapi/src/api
+ 
+ # Tomcat home directory. Required for building the XmldbRealm
+ catalina.home = /home/wolf/Java/jakarta-tomcat-5.0.19