You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by oz...@apache.org on 2004/10/06 15:35:03 UTC
cvs commit: jakarta-slide/src/conf/webapp jaas.config
ozeigermann 2004/10/06 06:35:03
Modified: . Tag: SLIDE_2_1_RELEASE_BRANCH
build.properties.sample build.xml
Added: src/conf/catalina Tag: SLIDE_2_1_RELEASE_BRANCH
tomcat-jaas-server.patch startup-jaas.bat.patch
startup-jaas.sh.patch
src/conf/webapp Tag: SLIDE_2_1_RELEASE_BRANCH jaas.config
Log:
Added new target to create and deploy a war with JAAS authentication
Revision Changes Path
No revision
No revision
1.1.2.1 +18 -0 jakarta-slide/src/conf/catalina/Attic/tomcat-jaas-server.patch
1.1.2.1 +11 -0 jakarta-slide/src/conf/catalina/Attic/startup-jaas.bat.patch
1.1.2.1 +9 -0 jakarta-slide/src/conf/catalina/Attic/startup-jaas.sh.patch
No revision
No revision
1.21.2.3 +4 -1 jakarta-slide/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-slide/build.properties.sample,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -u -r1.21.2.2 -r1.21.2.3
--- build.properties.sample 28 Sep 2004 13:19:53 -0000 1.21.2.2
+++ build.properties.sample 6 Oct 2004 13:35:02 -0000 1.21.2.3
@@ -46,5 +46,8 @@
catalina.server.lib=${catalina.dist}/server/lib
catalina.common.lib=${catalina.dist}/common/lib
catalina.jar=${catalina.server.lib}/catalina.jar
+# for 5.0.28
+jmx.jar=${catalina.dist}/bin/jmx.jar
+# for earlier versions
jmx.jar=${catalina.common.lib}/jmx.jar
1.229.2.8 +49 -2 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.229.2.7
retrieving revision 1.229.2.8
diff -u -r1.229.2.7 -r1.229.2.8
--- build.xml 6 Oct 2004 11:24:22 -0000 1.229.2.7
+++ build.xml 6 Oct 2004 13:35:02 -0000 1.229.2.8
@@ -438,6 +438,53 @@
</war>
</target>
<!-- =================================================================== -->
+ <!-- Build a Slide distribution packaged as a JAAS web application -->
+ <!-- =================================================================== -->
+ <target name="webapp-jaas-dist" depends="dist" description="Creates a web archive (war) with JAAS authentication">
+ <filter token="AUTH" value=""/>
+ <copy todir="${slide.dist}/slide/conf" filtering="true" overwrite="yes">
+ <fileset dir="src/conf/webapp">
+ <include name="web.xml"/>
+ <include name="slide.properties"/>
+ <include name="log4j.properties"/>
+ </fileset>
+ </copy>
+ <war warfile="${webapp.dist}/slide.war" webxml="${slide.dist}/slide/conf/web.xml">
+ <fileset dir="src/conf/webapp">
+ <include name="**/Domain.xml"/>
+ </fileset>
+ <lib dir="${slide.dist}/slide/lib"/>
+ <fileset dir=".">
+ <include name="README"/>
+ <include name="LICENSE"/>
+ <include name="NOTICE"/>
+ <include name="${release-notes}"/>
+ </fileset>
+ <zipfileset dir="src/conf/schema" prefix="db-schema" />
+ </war>
+ <war warfile="${webapp.dist}/slide-doc.war" webxml="src/conf/webapp/webdoc.xml">
+ <fileset dir="${slide.dist}/doc">
+ </fileset>
+ </war>
+ </target>
+ <!-- =================================================================== -->
+ <!-- Deploy Slide as a web application with JAAS authentication to -->
+ <!-- Tomcat 5.0.28 and later -->
+ <!-- This target requires Tomcat 5.0.28 -->
+ <!-- =================================================================== -->
+ <target name="jaas-deploy-tomcat-5" depends="webapp-jaas-dist" description="Deploys Slide as a web application with JAAS authentication to Tomcat 5" if="catalina.present">
+ <copy file="${slide.dist}/slide/webapp/slide-doc.war" todir="${catalina.dist}/webapps" overwrite="yes"/>
+ <copy file="${slide.dist}/slide/webapp/slide.war" todir="${catalina.dist}/webapps" overwrite="yes"/>
+ <!-- jaas config -->
+ <copy file="src/conf/webapp/jaas.config" todir="${catalina.dist}/conf/" overwrite="yes"/>
+ <!-- patch server.xml -->
+ <patch originalfile="${catalina.dist}/conf/server.xml" patchfile="src/conf/catalina/tomcat-jaas-server.patch"/>
+ <!-- patch startup -->
+ <patch originalfile="${catalina.dist}/bin/startup.bat" patchfile="src/conf/catalina/startup-jaas.bat.patch"/>
+ <patch originalfile="${catalina.dist}/bin/startup.sh" patchfile="src/conf/catalina/startup-jaas.sh.patch"/>
+ <!--ant antfile="build.xml" dir="projector" target="tomcat-install"/-->
+ </target>
+ <!-- =================================================================== -->
<!-- Build Catalina related components -->
<!-- This target requires Tomcat 4 or 5 -->
<!-- =================================================================== -->
@@ -473,7 +520,7 @@
<!-- Installs Slide with Tomcat 5.x using Tomcat authentication -->
<!-- This target requires Tomcat 5.x -->
<!-- =================================================================== -->
- <target name="tomcat-5-install" depends="tomcat-install" if="catalina.present" description="Modifies Tomcat 4.x installation to include Slide">
+ <target name="tomcat-5-install" depends="tomcat-install" if="catalina.present" description="Modifies Tomcat 5.x installation to include Slide">
<copy todir="${slide.dist}/slide/catalina-conf" overwrite="yes">
<fileset dir="src/conf/catalina">
<include name="tomcat-5-server.patch"/>
@@ -521,7 +568,7 @@
<fileset dir="src/conf/schema"/>
</copy>
- <!-- also copy general information into Slide directory -->
+ <!-- also copy general information into Slide directory -->
<copy todir="${catalina.dist}/slide" overwrite="yes">
<fileset dir=".">
<include name="README"/>
No revision
No revision
1.1.2.1 +4 -0 jakarta-slide/src/conf/webapp/Attic/jaas.config
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org
Re: cvs commit: jakarta-slide/src/conf/webapp jaas.config
Posted by Oliver Zeigermann <ol...@zeigermann.de>.
OK, here is the new target. I still do not know how to change this to
make it work with the Projector bundle.
Daniel, could you take care of it, please?
Oliver
ozeigermann@apache.org schrieb:
> ozeigermann 2004/10/06 06:35:03
>
> Modified: . Tag: SLIDE_2_1_RELEASE_BRANCH
> build.properties.sample build.xml
> Added: src/conf/catalina Tag: SLIDE_2_1_RELEASE_BRANCH
> tomcat-jaas-server.patch startup-jaas.bat.patch
> startup-jaas.sh.patch
> src/conf/webapp Tag: SLIDE_2_1_RELEASE_BRANCH jaas.config
> Log:
> Added new target to create and deploy a war with JAAS authentication
>
> Revision Changes Path
> No revision
> No revision
> 1.1.2.1 +18 -0 jakarta-slide/src/conf/catalina/Attic/tomcat-jaas-server.patch
>
>
>
>
> 1.1.2.1 +11 -0 jakarta-slide/src/conf/catalina/Attic/startup-jaas.bat.patch
>
>
>
>
> 1.1.2.1 +9 -0 jakarta-slide/src/conf/catalina/Attic/startup-jaas.sh.patch
>
>
>
>
> No revision
> No revision
> 1.21.2.3 +4 -1 jakarta-slide/build.properties.sample
>
> Index: build.properties.sample
> ===================================================================
> RCS file: /home/cvs/jakarta-slide/build.properties.sample,v
> retrieving revision 1.21.2.2
> retrieving revision 1.21.2.3
> diff -u -r1.21.2.2 -r1.21.2.3
> --- build.properties.sample 28 Sep 2004 13:19:53 -0000 1.21.2.2
> +++ build.properties.sample 6 Oct 2004 13:35:02 -0000 1.21.2.3
> @@ -46,5 +46,8 @@
> catalina.server.lib=${catalina.dist}/server/lib
> catalina.common.lib=${catalina.dist}/common/lib
> catalina.jar=${catalina.server.lib}/catalina.jar
> +# for 5.0.28
> +jmx.jar=${catalina.dist}/bin/jmx.jar
> +# for earlier versions
> jmx.jar=${catalina.common.lib}/jmx.jar
>
>
>
>
> 1.229.2.8 +49 -2 jakarta-slide/build.xml
>
> Index: build.xml
> ===================================================================
> RCS file: /home/cvs/jakarta-slide/build.xml,v
> retrieving revision 1.229.2.7
> retrieving revision 1.229.2.8
> diff -u -r1.229.2.7 -r1.229.2.8
> --- build.xml 6 Oct 2004 11:24:22 -0000 1.229.2.7
> +++ build.xml 6 Oct 2004 13:35:02 -0000 1.229.2.8
> @@ -438,6 +438,53 @@
> </war>
> </target>
> <!-- =================================================================== -->
> + <!-- Build a Slide distribution packaged as a JAAS web application -->
> + <!-- =================================================================== -->
> + <target name="webapp-jaas-dist" depends="dist" description="Creates a web archive (war) with JAAS authentication">
> + <filter token="AUTH" value=""/>
> + <copy todir="${slide.dist}/slide/conf" filtering="true" overwrite="yes">
> + <fileset dir="src/conf/webapp">
> + <include name="web.xml"/>
> + <include name="slide.properties"/>
> + <include name="log4j.properties"/>
> + </fileset>
> + </copy>
> + <war warfile="${webapp.dist}/slide.war" webxml="${slide.dist}/slide/conf/web.xml">
> + <fileset dir="src/conf/webapp">
> + <include name="**/Domain.xml"/>
> + </fileset>
> + <lib dir="${slide.dist}/slide/lib"/>
> + <fileset dir=".">
> + <include name="README"/>
> + <include name="LICENSE"/>
> + <include name="NOTICE"/>
> + <include name="${release-notes}"/>
> + </fileset>
> + <zipfileset dir="src/conf/schema" prefix="db-schema" />
> + </war>
> + <war warfile="${webapp.dist}/slide-doc.war" webxml="src/conf/webapp/webdoc.xml">
> + <fileset dir="${slide.dist}/doc">
> + </fileset>
> + </war>
> + </target>
> + <!-- =================================================================== -->
> + <!-- Deploy Slide as a web application with JAAS authentication to -->
> + <!-- Tomcat 5.0.28 and later -->
> + <!-- This target requires Tomcat 5.0.28 -->
> + <!-- =================================================================== -->
> + <target name="jaas-deploy-tomcat-5" depends="webapp-jaas-dist" description="Deploys Slide as a web application with JAAS authentication to Tomcat 5" if="catalina.present">
> + <copy file="${slide.dist}/slide/webapp/slide-doc.war" todir="${catalina.dist}/webapps" overwrite="yes"/>
> + <copy file="${slide.dist}/slide/webapp/slide.war" todir="${catalina.dist}/webapps" overwrite="yes"/>
> + <!-- jaas config -->
> + <copy file="src/conf/webapp/jaas.config" todir="${catalina.dist}/conf/" overwrite="yes"/>
> + <!-- patch server.xml -->
> + <patch originalfile="${catalina.dist}/conf/server.xml" patchfile="src/conf/catalina/tomcat-jaas-server.patch"/>
> + <!-- patch startup -->
> + <patch originalfile="${catalina.dist}/bin/startup.bat" patchfile="src/conf/catalina/startup-jaas.bat.patch"/>
> + <patch originalfile="${catalina.dist}/bin/startup.sh" patchfile="src/conf/catalina/startup-jaas.sh.patch"/>
> + <!--ant antfile="build.xml" dir="projector" target="tomcat-install"/-->
> + </target>
> + <!-- =================================================================== -->
> <!-- Build Catalina related components -->
> <!-- This target requires Tomcat 4 or 5 -->
> <!-- =================================================================== -->
> @@ -473,7 +520,7 @@
> <!-- Installs Slide with Tomcat 5.x using Tomcat authentication -->
> <!-- This target requires Tomcat 5.x -->
> <!-- =================================================================== -->
> - <target name="tomcat-5-install" depends="tomcat-install" if="catalina.present" description="Modifies Tomcat 4.x installation to include Slide">
> + <target name="tomcat-5-install" depends="tomcat-install" if="catalina.present" description="Modifies Tomcat 5.x installation to include Slide">
> <copy todir="${slide.dist}/slide/catalina-conf" overwrite="yes">
> <fileset dir="src/conf/catalina">
> <include name="tomcat-5-server.patch"/>
> @@ -521,7 +568,7 @@
> <fileset dir="src/conf/schema"/>
> </copy>
>
> - <!-- also copy general information into Slide directory -->
> + <!-- also copy general information into Slide directory -->
> <copy todir="${catalina.dist}/slide" overwrite="yes">
> <fileset dir=".">
> <include name="README"/>
>
>
>
> No revision
> No revision
> 1.1.2.1 +4 -0 jakarta-slide/src/conf/webapp/Attic/jaas.config
>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: slide-dev-help@jakarta.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org