[Commits] (bcm) rework build file to only unpack tarballs when
necessary. remove extraneous
commits at osafoundation.org
commits at osafoundation.org
Tue Feb 8 07:40:10 PST 2005
Commit by: bcm
Modified files:
server/build.xml 1.1 1.2
server/etc/tomcat-users.xml None 1.1
server/etc/Domain.xml 1.1 1.2
server/etc/chandler.xml 1.1 1.2
server/etc/server.xml 1.1 1.2
Log message:
rework build file to only unpack tarballs when necessary. remove extraneous
users from slide domain file. add tomcat-users config file that allows the
root user to log into the manager app. locate the webapp in the distribution's
root dir instead of the webapps dir, so tomcat only loads the webapp once
instead of twice.
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/build.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/etc/tomcat-users.xml?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/etc/Domain.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/etc/chandler.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/etc/server.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
Index: server/etc/chandler.xml
diff -u server/etc/chandler.xml:1.1 server/etc/chandler.xml:1.2
--- server/etc/chandler.xml:1.1 Mon Feb 7 16:00:35 2005
+++ server/etc/chandler.xml Tue Feb 8 07:40:08 2005
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<Context path="/" debug="0" privileged="true" useNaming="true"
- docBase="chandler">
+ docBase="../../chandler">
<Realm className="org.apache.catalina.realm.JAASRealm"
appName="chandler_login"
userClassNames="org.apache.slide.jaas.spi.SlidePrincipal"
Index: server/etc/Domain.xml
diff -u server/etc/Domain.xml:1.1 server/etc/Domain.xml:1.2
--- server/etc/Domain.xml:1.1 Mon Feb 7 16:00:35 2005
+++ server/etc/Domain.xml Tue Feb 8 07:40:08 2005
@@ -101,41 +101,17 @@
<!-- /users -->
<objectnode classname="org.apache.slide.structure.SubjectNode" uri="/users">
<permission action="all" subject="self" inheritable="true"/>
- <permission action="all" subject="/roles/projector" inheritable="true"/>
<permission action="all" subject="unauthenticated" inheritable="true" negative="true"/>
<!-- /users/root represents the administrator -->
<objectnode classname="org.apache.slide.structure.SubjectNode" uri="/users/root">
<revision>
- <property namespace="http://jakarta.apache.org/slide/" name="password">root</property>
- </revision>
- </objectnode>
- <!-- /users/john and /users/john2 represent authenticated users -->
- <objectnode classname="org.apache.slide.structure.SubjectNode" uri="/users/john">
- <revision>
- <property namespace="http://jakarta.apache.org/slide/" name="password">john</property>
- </revision>
- </objectnode>
- <objectnode classname="org.apache.slide.structure.SubjectNode" uri="/users/john2">
- <revision>
- <property namespace="http://jakarta.apache.org/slide/" name="password">john2</property>
- </revision>
- </objectnode>
- <!-- /users/guest represents an authenticated or unauthenticated guest user -->
- <objectnode classname="org.apache.slide.structure.SubjectNode" uri="/users/guest">
- <revision>
- <property namespace="http://jakarta.apache.org/slide/" name="password">guest</property>
- </revision>
- </objectnode>
- <objectnode classname="org.apache.slide.structure.SubjectNode" uri="/users/projector">
- <revision>
- <property namespace="http://jakarta.apache.org/slide/" name="password">projector</property>
+ <property namespace="http://jakarta.apache.org/slide/" name="password">chsrv</property>
</revision>
</objectnode>
</objectnode>
<!-- /roles -->
<objectnode classname="org.apache.slide.structure.SubjectNode" uri="/roles">
<permission action="all" subject="self" inheritable="true"/>
- <permission action="all" subject="/roles/projector" inheritable="true"/>
<permission action="all" subject="unauthenticated" inheritable="true" negative="true"/>
<objectnode classname="org.apache.slide.structure.SubjectNode" uri="/roles/root">
<revision>
@@ -144,17 +120,7 @@
</objectnode>
<objectnode classname="org.apache.slide.structure.SubjectNode" uri="/roles/user">
<revision>
- <property name="group-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/users/john</D:href><D:href xmlns:D='DAV:'>/users/john2</D:href><D:href xmlns:D='DAV:'>/users/root</D:href><D:href xmlns:D='DAV:'>/users/projector</D:href>]]></property>
- </revision>
- </objectnode>
- <objectnode classname="org.apache.slide.structure.SubjectNode" uri="/roles/guest">
- <revision>
- <property name="group-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/users/guest</D:href>]]></property>
- </revision>
- </objectnode>
- <objectnode classname="org.apache.slide.structure.SubjectNode" uri="/roles/projector">
- <revision>
- <property name="group-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/users/root</D:href><D:href xmlns:D='DAV:'>/users/projector</D:href>]]></property>
+ <property name="group-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/users/root</D:href>]]></property>
</revision>
</objectnode>
</objectnode>
@@ -216,13 +182,6 @@
<permission action="/actions/write" subject="/roles/user" inheritable="true"/>
<permission action="/actions/read-acl" subject="owner" inheritable="true"/>
</objectnode>
- <objectnode classname="org.apache.slide.structure.SubjectNode" uri="/projector">
- <permission action="all" subject="unauthenticated" inheritable="true"/>
- <permission action="/actions/write" subject="/roles/projector" inheritable="true"/>
- <permission action="/actions/read-acl" subject="owner" inheritable="true"/>
- <objectnode classname="org.apache.slide.structure.SubjectNode" uri="/projector/work">
- </objectnode>
- </objectnode>
<!-- DeltaV: default history and workspace paths -->
<objectnode classname="org.apache.slide.structure.SubjectNode" uri="/history">
<permission action="all" subject="unauthenticated" inheritable="true"/>
Index: server/etc/server.xml
diff -u server/etc/server.xml:1.1 server/etc/server.xml:1.2
--- server/etc/server.xml:1.1 Mon Feb 7 16:00:35 2005
+++ server/etc/server.xml Tue Feb 8 07:40:08 2005
@@ -21,7 +21,7 @@
<Logger className="org.apache.catalina.logger.FileLogger" />
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
resourceName="UserDatabase" />
- <Host name="localhost" appBase="webapps" />
+ <Host name="localhost" appBase="webapps" autoDeploy="false" />
</Engine>
</Service>
</Server>
Index: server/build.xml
diff -u server/build.xml:1.1 server/build.xml:1.2
--- server/build.xml:1.1 Mon Feb 7 16:00:34 2005
+++ server/build.xml Tue Feb 8 07:40:07 2005
@@ -28,13 +28,17 @@
<!-- RELEASE TARGETS -->
- <target name="prepare" description="set up the dist environment">
- <mkdir dir="${chsrv.dist.version}"/>
- </target>
-
- <target name="unpack-tomcat" description="unpack the Tomcat tarball">
+ <target name="unpack-tomcat" unless="tomcat.unpacked"
+ description="unpack the Tomcat tarball">
<untar src="${ext.tomcat.tarball}" dest="${chsrv.tmp}"
compression="gzip"/>
+ </target>
+
+ <target name="configure-tomcat"
+ description="install and configure Tomcat">
+ <available property="tomcat.unpacked"
+ file="${chsrv.tmp}/${ext.tomcat.package}"/>
+ <antcall target="unpack-tomcat"/>
<copy todir="${chsrv.dist.version}/tomcat">
<fileset dir="${chsrv.tmp}/${ext.tomcat.package}">
<exclude name="**/conf/Catalina/localhost/admin.xml"/>
@@ -44,14 +48,13 @@
<!-- XXX can't figure out the right pattern to use to not copy
this dir in the first place -->
<delete dir="${chsrv.dist.version}/tomcat/webapps"/>
- </target>
-
- <target name="configure-tomcat" depends="unpack-tomcat"
- description="install and configure Tomcat">
+ <mkdir dir="${chsrv.dist.version}/tomcat/webapps"/>
<copy todir="${chsrv.dist.version}/tomcat/conf/Catalina/localhost"
file="${chsrv.etc}/chandler.xml"/>
<copy todir="${chsrv.dist.version}/tomcat/conf" overwrite="true"
file="${chsrv.etc}/server.xml"/>
+ <copy todir="${chsrv.dist.version}/tomcat/conf" overwrite="true"
+ file="${chsrv.etc}/tomcat-users.xml"/>
<chmod perm="755">
<fileset dir="${chsrv.dist.version}/tomcat/bin">
<include name="*.sh"/>
@@ -59,20 +62,24 @@
</chmod>
</target>
- <target name="unpack-slide" description="unpack the Slide tarball">
+ <target name="unpack-slide" unless="slide.unpacked"
+ description="unpack the Slide tarball">
<untar src="${ext.slide.tarball}" dest="${chsrv.tmp}"
compression="gzip"/>
</target>
- <target name="configure-slide" depends="unpack-slide"
+ <target name="configure-slide"
description="install and configure Slide within Tomcat">
+ <available property="slide.unpacked"
+ file="${chsrv.tmp}/${ext.slide.package}"/>
+ <antcall target="unpack-slide"/>
<unwar src="${chsrv.tmp}/${ext.slide.package}/slide/webapp/slide.war"
- dest="${chsrv.dist.version}/tomcat/webapps/chandler"/>
- <copy todir="${chsrv.dist.version}/tomcat/webapps/chandler/WEB-INF"
+ dest="${chsrv.dist.version}/chandler"/>
+ <copy todir="${chsrv.dist.version}/chandler/WEB-INF"
file="${chsrv.etc}/web.xml"/>
- <delete file="${chsrv.dist.version}/tomcat/webapps/chandler/Domain.xml"/>
- <copy todir="${chsrv.dist.version}/tomcat/webapps/chandler/WEB-INF"
+ <copy todir="${chsrv.dist.version}/chandler/WEB-INF"
file="${chsrv.etc}/Domain.xml"/>
+ <delete file="${chsrv.dist.version}/chandler/Domain.xml"/>
</target>
<target name="configure" depends="configure-tomcat,configure-slide"
@@ -85,7 +92,7 @@
</target>
<target name="dist" description="package a dist"
- depends="prepare,configure">
+ depends="configure">
<tar destfile="${chsrv.dist.version}.tar.gz"
compression="gzip" longfile="gnu">
<tarfileset dir="${chsrv.dist.version}"
@@ -93,7 +100,14 @@
</tar>
</target>
- <target name="clean" description="clean out the dist directory">
+ <target name="clean"
+ description="removed the packed and unpacked dist files">
+ <delete file="${chsrv.dist.version}.tar.gz"/>
+ <delete dir="${chsrv.dist.version}"/>
+ </target>
+
+ <target name="full-clean"
+ description="remove the dist directory and unpacked dependencies">
<delete dir="${chsrv.dist}"/>
<delete dir="${chsrv.tmp}/${ext.tomcat.package}"/>
<delete dir="${chsrv.tmp}/${ext.slide.package}"/>
More information about the Commits
mailing list