[Commits] (bcm) remove slide
commits at osafoundation.org
commits at osafoundation.org
Fri Apr 8 13:16:54 PDT 2005
Commit by: bcm
Modified files:
server/build.xml 1.26 1.27
server/shared.properties 1.14 1.15
server/docs/TODO.txt 1.44 1.45
server/ext/slide-kernel-2.1.jar 1.1.1.1 None
server/webapps/share/.cvsignore 1.1 None
server/webapps/share/build.xml 1.4 None
server/webapps/share/etc/log4j.xml 1.3 None
server/webapps/share/src/com/marathon/security/slide/AbstractDAOPrincipalStore.java 1.1.1.1 None
server/webapps/share/src/com/marathon/security/slide/PrincipalStoreDAO.java 1.1.1.1 None
server/webapps/share/src/com/marathon/security/slide/SpringDAOPrincipalStore.java 1.1.1.1 None
server/webapps/share/src/com/marathon/util/spring/GlueContextLoaderListener.java 1.2 None
server/webapps/share/src/org/osaf/chandler/server/slide/HomedirOwnerSetter.java 1.1 None
server/webapps/share/src/org/osaf/chandler/server/slide/PrincipalStoreDAOHibernate.java 1.1 None
server/webapps/share/web/WEB-INF/.cvsignore 1.1 None
server/webapps/share/web/WEB-INF/Domain.xml 1.6 None
server/webapps/share/web/WEB-INF/applicationContext.xml 1.1 None
server/webapps/share/web/WEB-INF/web.xml 1.8 None
Log message:
remove slide
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/build.xml.diff?r1=text&tr1=1.26&r2=text&tr2=1.27
http://cvs.osafoundation.org/index.cgi/server/shared.properties.diff?r1=text&tr1=1.14&r2=text&tr2=1.15
http://cvs.osafoundation.org/index.cgi/server/docs/TODO.txt.diff?r1=text&tr1=1.44&r2=text&tr2=1.45
http://cvs.osafoundation.org/index.cgi/server/ext/slide-kernel-2.1.jar.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/share/.cvsignore.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/share/build.xml.diff?r1=text&tr1=1.4&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/share/etc/log4j.xml.diff?r1=text&tr1=1.3&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/share/src/com/marathon/security/slide/AbstractDAOPrincipalStore.java.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/share/src/com/marathon/security/slide/PrincipalStoreDAO.java.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/share/src/com/marathon/security/slide/SpringDAOPrincipalStore.java.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/share/src/com/marathon/util/spring/GlueContextLoaderListener.java.diff?r1=text&tr1=1.2&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/share/src/org/osaf/chandler/server/slide/HomedirOwnerSetter.java.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/share/src/org/osaf/chandler/server/slide/PrincipalStoreDAOHibernate.java.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/share/web/WEB-INF/.cvsignore.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/share/web/WEB-INF/Domain.xml.diff?r1=text&tr1=1.6&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/share/web/WEB-INF/applicationContext.xml.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/share/web/WEB-INF/web.xml.diff?r1=text&tr1=1.8&r2=text&tr2=None
Index: server/shared.properties
diff -u server/shared.properties:1.14 server/shared.properties:1.15
--- server/shared.properties:1.14 Wed Apr 6 20:15:00 2005
+++ server/shared.properties Fri Apr 8 13:16:50 2005
@@ -43,7 +43,6 @@
core.test=${core.home}/test
console.home=${chsrv.home}/webapps/console
-share.home=${chsrv.home}/webapps/share
webdav.home=${chsrv.home}/webapps/webdav
web.home=${chsrv.home}/web
@@ -54,9 +53,6 @@
ext.tomcat.package=jakarta-tomcat-5.0.28
ext.tomcat.tarball=${chsrv.ext}/${ext.tomcat.package}.tar.gz
-ext.slide.package=jakarta-slide-server-bin-2.1
-ext.slide.tarball=${chsrv.ext}/${ext.slide.package}.tar.gz
-
maven.repository=${user.home}/.maven/repository
acegi-security.jar=${chsrv.ext}/acegi-security-0.8.1.jar
@@ -93,7 +89,6 @@
odmg.jar=${chsrv.ext}/odmg-3.0.jar
oro.jar=${chsrv.ext}/jakarta-oro-2.0.8.jar
servletapi.jar=${maven.repository}/servletapi/jars/servletapi-2.3.jar
-slide-kernel.jar=${chsrv.ext}/slide-kernel-2.1.jar
slide-webdavlib.jar=${chsrv.ext}/jakarta-slide-webdavlib-2.1.jar
spring.jar=${chsrv.ext}/spring.jar
standard.jar=${chsrv.ext}/standard.jar
Index: server/build.xml
diff -u server/build.xml:1.26 server/build.xml:1.27
--- server/build.xml:1.26 Fri Apr 8 13:04:49 2005
+++ server/build.xml Fri Apr 8 13:16:50 2005
@@ -12,7 +12,6 @@
value="${chsrv.dist}/chandler-server-${chsrv.version}"/>
<property name="chsrv.dist.tomcat" value="${chsrv.dist.version}/tomcat"/>
<property name="chsrv.dist.webapps" value="${chsrv.dist.tomcat}/webapps"/>
- <property name="chsrv.dist.share" value="${chsrv.dist.webapps}/share"/>
<property name="chsrv.dist.console" value="${chsrv.dist.webapps}/console"/>
<property name="chsrv.dist.webdav" value="${chsrv.dist.webapps}/webdav"/>
<property name="chsrv.dist.web" value="${chsrv.dist.webapps}/cosmo"/>
@@ -29,7 +28,7 @@
<!-- BUILD TARGETS -->
<target name="all"
- depends="build-core,build-share,build-console,build-webdav,build-web"
+ depends="build-core,build-console,build-webdav,build-web"
description="compile all source code and pack webapps"/>
<target name="build-core" description="build core subsystem">
@@ -37,12 +36,6 @@
inheritAll="false"/>
</target>
- <target name="build-share" depends="build-core"
- description="build share webapp">
- <ant dir="${share.home}" target="all"
- inheritAll="false"/>
- </target>
-
<target name="build-console" depends="build-core"
description="build console webapp">
<ant dir="${console.home}" target="all"
@@ -62,7 +55,7 @@
</target>
<target name="clean"
- depends="clean-core,clean-share,clean-console,clean-webdav,clean-web"
+ depends="clean-core,clean-console,clean-webdav,clean-web"
description="clean all subsystems"/>
<target name="clean-core" description="clean core subsystem">
@@ -70,11 +63,6 @@
inheritAll="false"/>
</target>
- <target name="clean-share" description="clean share webapp">
- <ant dir="${share.home}" target="clean"
- inheritAll="false"/>
- </target>
-
<target name="clean-console" description="clean console webapp">
<ant dir="${console.home}" target="clean"
inheritAll="false"/>
@@ -191,41 +179,6 @@
</chmod>
</target>
- <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="dist-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.share}"/>
- <delete file="${chsrv.dist.share}/Domain.xml"/>
--->
- </target>
-
- <target name="dist-share"
- description="install share webapp into Tomcat">
- <!--
- <copy todir="${chsrv.dist.share}">
- <fileset dir="${share.home}/web"/>
- </copy>
- <copy todir="${chsrv.dist.tomcat}/conf/Catalina/localhost"
- file="${chsrv.etc}/share.xml">
- <filterset>
- <filter token="RELOADABLE" value="${compile.debug}"/>
- </filterset>
- </copy>
- -->
- </target>
-
<target name="dist-console"
description="install console webapp into Tomcat">
<copy todir="${chsrv.dist.console}">
@@ -265,7 +218,7 @@
</copy>
</target>
- <target name="dist-webapps" depends="dist-share,dist-console,dist-webdav"
+ <target name="dist-webapps" depends="dist-console,dist-webdav"
description="install all webapps into Tomcat"/>
<target name="dist-server"
@@ -346,7 +299,7 @@
</target>
<target name="dist-data"
- description="install database and shared file store">
+ description="install user database database">
<ant dir="${core.home}" target="userdb-setup"
inheritAll="false"/>
<move todir="${chsrv.dist.version}/data">
@@ -357,12 +310,6 @@
<delete dir="${chsrv.home}/data"/>
</target>
-<!--
- <target name="dist"
- depends="dist-tomcat,dist-slide,dist-webapps,dist-web,dist-server,dist-data"
- description="install and configure Chandler server"/>
--->
-
<target name="dist"
depends="dist-tomcat,dist-web,dist-server,dist-data"
description="install and configure Chandler server"/>
@@ -391,7 +338,6 @@
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}"/>
</target>
<target name="dist-tag"
Index: server/docs/TODO.txt
diff -u server/docs/TODO.txt:1.44 server/docs/TODO.txt:1.45
--- server/docs/TODO.txt:1.44 Fri Apr 8 13:04:49 2005
+++ server/docs/TODO.txt Fri Apr 8 13:16:50 2005
@@ -5,7 +5,6 @@
* try putting all stuff from tomcat's common/lib and common/classes
back into the single webapp
* remove console and webdav webapps
- * remove slide
0.2 RELEASE
===========
More information about the Commits
mailing list