[Commits] (bcm) consolidate java sources from webdav and console webapps into the web

commits at osafoundation.org commits at osafoundation.org
Fri Apr 8 14:43:42 PDT 2005


Commit by: bcm
Modified files:
server/build.xml 1.27 1.28
server/shared.properties 1.15 1.16
server/docs/TODO.txt 1.45 1.46
server/etc/server.xml 1.15 1.16
server/web/.cvsignore None 1.1
server/web/build.xml 1.1 1.2
server/web/etc/applicationContext-adapter-dav.xml None 1.1
server/web/etc/applicationContext-security-web.xml None 1.1
server/web/etc/action-servlet.xml 1.1 1.2
server/web/etc/applicationContext-security.xml 1.1 None
server/web/etc/applicationContext-webdav-adapter.xml 1.1 None
server/web/src/org/osaf/cosmo/dav/CosmoDavServlet.java None 1.1
server/web/src/org/osaf/cosmo/dav/impl/CosmoDavResourceFactoryImpl.java None 1.1
server/web/src/org/osaf/cosmo/dav/impl/CosmoDavResourceImpl.java None 1.1
server/web/src/org/osaf/cosmo/dav/impl/CosmoDavSessionProviderImpl.java None 1.1
server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.java None 1.1
server/web/src/org/osaf/cosmo/ui/UserAction.java None 1.1
server/web/web/WEB-INF/.cvsignore 1.1 1.2
server/web/web/WEB-INF/struts-config.xml 1.2 1.3
server/web/web/WEB-INF/web.xml 1.1 1.2
server/webapps/console/.cvsignore 1.1.1.1 None
server/webapps/console/build.xml 1.14 None
server/webapps/console/etc/MessageResources.properties 1.8 None
server/webapps/console/etc/action-servlet.xml 1.2 None
server/webapps/console/etc/applicationContext-webui-security.xml 1.5 None
server/webapps/console/src/org/osaf/chandler/server/console/ConsoleErrorAction.java 1.1.1.1 None
server/webapps/console/src/org/osaf/chandler/server/console/UserAction.java 1.8 None
server/webapps/console/test/.cvsignore 1.1.1.1 None
server/webapps/console/test/etc/log4j.xml 1.1.1.1 None
server/webapps/console/test/org/osaf/chandler/server/console/BaseActionTestCase.java 1.1.1.1 None
server/webapps/console/test/org/osaf/chandler/server/console/UserActionTest.java 1.5 None
server/webapps/console/web/chandler.css 1.1.1.1 None
server/webapps/console/web/index.jsp 1.3 None
server/webapps/console/web/WEB-INF/.cvsignore 1.2 None
server/webapps/console/web/WEB-INF/struts-config.xml 1.8 None
server/webapps/console/web/WEB-INF/tiles-config.xml 1.4 None
server/webapps/console/web/WEB-INF/urlrewrite.xml 1.4 None
server/webapps/console/web/WEB-INF/validation.xml 1.3 None
server/webapps/console/web/WEB-INF/validator-rules.xml 1.1.1.1 None
server/webapps/console/web/WEB-INF/web.xml 1.5 None
server/webapps/console/web/WEB-INF/jsp/home.jsp 1.1 None
server/webapps/console/web/WEB-INF/jsp/layout.jsp 1.6 None
server/webapps/console/web/WEB-INF/jsp/login.jsp 1.2 None
server/webapps/console/web/WEB-INF/jsp/tagfiles.jsp 1.1.1.1 None
server/webapps/console/web/WEB-INF/jsp/taglibs.jsp 1.3 None
server/webapps/console/web/WEB-INF/jsp/error/connect.jsp 1.1.1.1 None
server/webapps/console/web/WEB-INF/jsp/error/general.jsp 1.1.1.1 None
server/webapps/console/web/WEB-INF/jsp/error/notfound.jsp 1.1.1.1 None
server/webapps/console/web/WEB-INF/jsp/user/list.jsp 1.9 None
server/webapps/console/web/WEB-INF/jsp/user/view.jsp 1.7 None
server/webapps/console/web/WEB-INF/tags/baseurl.tag 1.1 None
server/webapps/console/web/WEB-INF/tags/cnfmsg.tag 1.1 None
server/webapps/console/web/WEB-INF/tags/errmsg.tag 1.1 None
server/webapps/console/web/WEB-INF/tags/homedir.tag 1.3 None
server/webapps/console/web/WEB-INF/tld/c.tld 1.1.1.1 None
server/webapps/console/web/WEB-INF/tld/fmt.tld 1.1.1.1 None
server/webapps/console/web/WEB-INF/tld/fn.tld 1.1.1.1 None
server/webapps/console/web/WEB-INF/tld/struts-html-el.tld 1.1.1.1 None
server/webapps/console/web/WEB-INF/tld/struts-logic-el.tld 1.1.1.1 None
server/webapps/console/web/WEB-INF/tld/struts-tiles-el.tld 1.1.1.1 None
server/webapps/webdav/.cvsignore 1.1 None
server/webapps/webdav/build.xml 1.10 None
server/webapps/webdav/etc/applicationContext-webdav-adapter.xml 1.7 None
server/webapps/webdav/etc/applicationContext-webdav-security.xml 1.4 None
server/webapps/webdav/src/org/osaf/cosmo/webdav/CosmoWebdavServlet.java 1.3 None
server/webapps/webdav/src/org/osaf/cosmo/webdav/impl/CosmoDavResourceFactoryImpl.java 1.1 None
server/webapps/webdav/src/org/osaf/cosmo/webdav/impl/CosmoDavResourceImpl.java 1.1 None
server/webapps/webdav/src/org/osaf/cosmo/webdav/impl/CosmoDavSessionProviderImpl.java 1.1 None
server/webapps/webdav/web/WEB-INF/.cvsignore 1.3 None
server/webapps/webdav/web/WEB-INF/web.xml 1.13 None

Log message:
consolidate java sources from webdav and console webapps into the web
subproject, changing packages from org.osaf.chandler.server to org.osaf.cosmo
in the process.

pack all libs and resources into an exploded war and distribute that rather
than disting libs and resources into tomcat's common lib and classes dirs.
back to standalone deployable webapp == good!!!!!



ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/build.xml.diff?r1=text&tr1=1.27&r2=text&tr2=1.28
http://cvs.osafoundation.org/index.cgi/server/shared.properties.diff?r1=text&tr1=1.15&r2=text&tr2=1.16
http://cvs.osafoundation.org/index.cgi/server/docs/TODO.txt.diff?r1=text&tr1=1.45&r2=text&tr2=1.46
http://cvs.osafoundation.org/index.cgi/server/etc/server.xml.diff?r1=text&tr1=1.15&r2=text&tr2=1.16
http://cvs.osafoundation.org/index.cgi/server/web/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/web/build.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/web/etc/applicationContext-adapter-dav.xml?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/web/etc/applicationContext-security-web.xml?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/web/etc/action-servlet.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/web/etc/applicationContext-security.xml.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/web/etc/applicationContext-webdav-adapter.xml.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/web/src/org/osaf/cosmo/dav/CosmoDavServlet.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/web/src/org/osaf/cosmo/dav/impl/CosmoDavResourceFactoryImpl.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/web/src/org/osaf/cosmo/dav/impl/CosmoDavResourceImpl.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/web/src/org/osaf/cosmo/dav/impl/CosmoDavSessionProviderImpl.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/web/src/org/osaf/cosmo/ui/CosmoErrorAction.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/web/src/org/osaf/cosmo/ui/UserAction.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/web/web/WEB-INF/.cvsignore.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/web/web/WEB-INF/struts-config.xml.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/server/web/web/WEB-INF/web.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/webapps/console/.cvsignore.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/build.xml.diff?r1=text&tr1=1.14&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/etc/MessageResources.properties.diff?r1=text&tr1=1.8&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/etc/action-servlet.xml.diff?r1=text&tr1=1.2&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/etc/applicationContext-webui-security.xml.diff?r1=text&tr1=1.5&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/src/org/osaf/chandler/server/console/ConsoleErrorAction.java.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/src/org/osaf/chandler/server/console/UserAction.java.diff?r1=text&tr1=1.8&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/test/.cvsignore.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/test/etc/log4j.xml.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/test/org/osaf/chandler/server/console/BaseActionTestCase.java.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/test/org/osaf/chandler/server/console/UserActionTest.java.diff?r1=text&tr1=1.5&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/chandler.css.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/index.jsp.diff?r1=text&tr1=1.3&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/.cvsignore.diff?r1=text&tr1=1.2&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/struts-config.xml.diff?r1=text&tr1=1.8&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/tiles-config.xml.diff?r1=text&tr1=1.4&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/urlrewrite.xml.diff?r1=text&tr1=1.4&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/validation.xml.diff?r1=text&tr1=1.3&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/validator-rules.xml.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/web.xml.diff?r1=text&tr1=1.5&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/jsp/home.jsp.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/jsp/layout.jsp.diff?r1=text&tr1=1.6&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/jsp/login.jsp.diff?r1=text&tr1=1.2&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/jsp/tagfiles.jsp.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/jsp/taglibs.jsp.diff?r1=text&tr1=1.3&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/jsp/error/connect.jsp.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/jsp/error/general.jsp.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/jsp/error/notfound.jsp.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/jsp/user/list.jsp.diff?r1=text&tr1=1.9&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/jsp/user/view.jsp.diff?r1=text&tr1=1.7&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/tags/baseurl.tag.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/tags/cnfmsg.tag.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/tags/errmsg.tag.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/tags/homedir.tag.diff?r1=text&tr1=1.3&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/tld/c.tld.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/tld/fmt.tld.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/tld/fn.tld.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/tld/struts-html-el.tld.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/tld/struts-logic-el.tld.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/console/web/WEB-INF/tld/struts-tiles-el.tld.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/.cvsignore.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/build.xml.diff?r1=text&tr1=1.10&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/etc/applicationContext-webdav-adapter.xml.diff?r1=text&tr1=1.7&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/etc/applicationContext-webdav-security.xml.diff?r1=text&tr1=1.4&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/src/org/osaf/cosmo/webdav/CosmoWebdavServlet.java.diff?r1=text&tr1=1.3&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/src/org/osaf/cosmo/webdav/impl/CosmoDavResourceFactoryImpl.java.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/src/org/osaf/cosmo/webdav/impl/CosmoDavResourceImpl.java.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/src/org/osaf/cosmo/webdav/impl/CosmoDavSessionProviderImpl.java.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/web/WEB-INF/.cvsignore.diff?r1=text&tr1=1.3&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/webapps/webdav/web/WEB-INF/web.xml.diff?r1=text&tr1=1.13&r2=text&tr2=None

Index: server/shared.properties
diff -u server/shared.properties:1.15 server/shared.properties:1.16
--- server/shared.properties:1.15	Fri Apr  8 13:16:50 2005
+++ server/shared.properties	Fri Apr  8 14:43:28 2005
@@ -42,9 +42,12 @@
 core.etc=${core.home}/etc
 core.test=${core.home}/test
 
-console.home=${chsrv.home}/webapps/console
-webdav.home=${chsrv.home}/webapps/webdav
 web.home=${chsrv.home}/web
+web.build=${web.home}/build
+web.src=${web.home}/src
+web.etc=${web.home}/etc
+web.web=${web.home}/web
+web.test=${web.home}/test
 
 #
 # dependencies

Index: server/docs/TODO.txt
diff -u server/docs/TODO.txt:1.45 server/docs/TODO.txt:1.46
--- server/docs/TODO.txt:1.45	Fri Apr  8 13:16:50 2005
+++ server/docs/TODO.txt	Fri Apr  8 14:43:29 2005
@@ -2,9 +2,10 @@
 0.1 RELEASE
 ===========
 
- * try putting all stuff from tomcat's common/lib and common/classes
-   back into the single webapp
- * remove console and webdav webapps
+ * pack core/etc files into core jar rather than putting them in
+   WEB-INF/classes
+ * set cosmo version as env entry rather than property
+ * get rid of properties file
 
 0.2 RELEASE
 ===========

Index: server/web/etc/action-servlet.xml
diff -u server/web/etc/action-servlet.xml:1.1 server/web/etc/action-servlet.xml:1.2
--- server/web/etc/action-servlet.xml:1.1	Wed Apr  6 20:15:02 2005
+++ server/web/etc/action-servlet.xml	Fri Apr  8 14:43:30 2005
@@ -8,7 +8,7 @@
   <!-- provisioning actions -->
 
   <bean name="userAction" abstract="true" singleton="false"
-        class="org.osaf.chandler.server.console.UserAction" >
+        class="org.osaf.cosmo.ui.UserAction" >
     <property name="provisioningManager">
       <ref bean="provisioningManager"/>
     </property>

Index: server/etc/server.xml
diff -u server/etc/server.xml:1.15 server/etc/server.xml:1.16
--- server/etc/server.xml:1.15	Mon Apr  4 17:53:18 2005
+++ server/etc/server.xml	Fri Apr  8 14:43:29 2005
@@ -62,6 +62,7 @@
                scheme="https" clientAuth="want"
                keystorePass="chandler"/>
     <Engine name="Catalina" defaultHost="localhost">
+      <Logger className="org.apache.catalina.logger.SystemOutLogger"/>
       <Valve className="org.apache.catalina.valves.AccessLogValve"
              directory="../logs" pattern="combined"
              resolveHosts="false"/>

Index: server/web/web/WEB-INF/.cvsignore
diff -u server/web/web/WEB-INF/.cvsignore:1.1 server/web/web/WEB-INF/.cvsignore:1.2
--- server/web/web/WEB-INF/.cvsignore:1.1	Thu Apr  7 12:31:21 2005
+++ server/web/web/WEB-INF/.cvsignore	Fri Apr  8 14:43:31 2005
@@ -1,2 +1 @@
 action-servlet.xml
-classes

Index: server/web/web/WEB-INF/struts-config.xml
diff -u server/web/web/WEB-INF/struts-config.xml:1.2 server/web/web/WEB-INF/struts-config.xml:1.3
--- server/web/web/WEB-INF/struts-config.xml:1.2	Thu Apr  7 17:14:44 2005
+++ server/web/web/WEB-INF/struts-config.xml	Fri Apr  8 14:43:31 2005
@@ -28,7 +28,7 @@
 
   <action-mappings>
     <action path="/error"
-            type="org.osaf.chandler.server.console.ConsoleErrorAction">
+            type="org.osaf.cosmo.ui.ConsoleErrorAction">
       <forward name="error.general" path="error.general"
                redirect="false"/>
       <forward name="error.connect" path="error.connect"
@@ -53,7 +53,7 @@
     <!-- user actions -->
 
     <action path="/user"
-            type="org.osaf.chandler.server.console.UserAction"
+            type="org.osaf.cosmo.ui.UserAction"
             name="userForm"
             scope="request"
             validate="false"
@@ -62,7 +62,7 @@
     </action>
 
     <action path="/user/update"
-            type="org.osaf.chandler.server.console.UserAction"
+            type="org.osaf.cosmo.ui.UserAction"
             name="userForm"
             scope="request"
             validate="true"
@@ -74,13 +74,13 @@
     </action>
 
     <action path="/user/remove"
-            type="org.osaf.chandler.server.console.UserAction"
+            type="org.osaf.cosmo.ui.UserAction"
             parameter="remove">
       <forward name="success" path="/users" redirect="true"/>
     </action>
 
     <action path="/users"
-            type="org.osaf.chandler.server.console.UserAction"
+            type="org.osaf.cosmo.ui.UserAction"
             name="userForm"
             scope="request"
             validate="false"
@@ -89,7 +89,7 @@
     </action>
 
     <action path="/user/create"
-            type="org.osaf.chandler.server.console.UserAction"
+            type="org.osaf.cosmo.ui.UserAction"
             name="userForm"
             scope="request"
             validate="true"

Index: server/web/web/WEB-INF/web.xml
diff -u server/web/web/WEB-INF/web.xml:1.1 server/web/web/WEB-INF/web.xml:1.2
--- server/web/web/WEB-INF/web.xml:1.1	Wed Apr  6 20:15:03 2005
+++ server/web/web/WEB-INF/web.xml	Fri Apr  8 14:43:31 2005
@@ -12,7 +12,8 @@
       classpath:applicationContext-jcr-client.xml
       classpath:applicationContext-manager.xml
       classpath:applicationContext-security.xml
-      classpath:applicationContext-webdav-adapter.xml
+      classpath:applicationContext-security-web.xml
+      classpath:applicationContext-adapter-dav.xml
     </param-value>
   </context-param>
   <context-param>
@@ -68,7 +69,7 @@
   </filter-mapping>
   <servlet>
     <servlet-name>webdav</servlet-name>
-    <servlet-class>org.osaf.cosmo.webdav.CosmoWebdavServlet</servlet-class>
+    <servlet-class>org.osaf.cosmo.dav.CosmoDavServlet</servlet-class>
     <load-on-startup>1</load-on-startup>
     <init-param>
       <param-name>resource-path-prefix</param-name>

Index: server/web/build.xml
diff -u server/web/build.xml:1.1 server/web/build.xml:1.2
--- server/web/build.xml:1.1	Wed Apr  6 20:15:01 2005
+++ server/web/build.xml	Fri Apr  8 14:43:29 2005
@@ -8,10 +8,6 @@
   <property file="${chsrv.home}/build.properties"/>
   <property file="${chsrv.home}/shared.properties"/>
 
-  <property name="web.etc"           value="${web.home}/etc"/>
-  <property name="web.web"           value="${web.home}/web"/>
-  <property name="web.test"          value="${web.home}/test"/>
-
   <!-- CLASSPATHS -->
 
   <path id="ext.classpath">
@@ -21,6 +17,7 @@
     <pathelement location="${jackrabbit.jar}"/>
     <pathelement location="${jcr.jar}"/>
     <pathelement location="${jcr-server.jar}"/>
+    <pathelement location="${jcr-webdav.jar}"/>
     <pathelement location="${log4j.jar}"/>
     <pathelement location="${servletapi.jar}"/>
     <pathelement location="${spring.jar}"/>
@@ -30,27 +27,105 @@
 
   <!-- BUILD TARGETS -->
 
+  <target name="prepare" description="set up the build environment">
+    <mkdir dir="${web.build}/classes"/>
+    <mkdir dir="${web.build}/webapp"/>
+  </target>
+
+  <target name="compile" depends="prepare"
+          description="build the source">
+    <javac srcdir="${web.src}"
+           destdir="${web.build}/classes"
+           classpathref="ext.classpath"
+           debug="${compile.debug}"
+           optimize="${compile.optimize}"
+           deprecation="${compile.deprecation}"/>
+  </target>
+
   <target name="pack" description="pack the webapp">
-    <copy todir="${web.web}/WEB-INF/classes">
+    <copy todir="${web.build}/classes">
       <fileset dir="${web.etc}">
-        <include name="applicationContext-security.xml"/>
-        <include name="applicationContext-webdav-adapter.xml"/>
+        <include name="applicationContext-security-web.xml"/>
+        <include name="applicationContext-adapter-dav.xml"/>
         <include name="MessageResources.properties"/>
       </fileset>
     </copy>
-    <copy todir="${web.web}/WEB-INF">
+    <jar destfile="${web.build}/cosmo-web.jar"
+         basedir="${web.build}/classes"/>
+    <copy todir="${web.build}/webapp">
+      <fileset dir="${web.web}"/>
+    </copy>
+    <copy todir="${web.build}/webapp/WEB-INF">
       <fileset dir="${web.etc}">
         <include name="action-servlet.xml"/>
       </fileset>
     </copy>
+    <copy todir="${web.build}/webapp/WEB-INF/classes">
+      <fileset dir="${chsrv.etc}">
+        <include name="log4j.xml"/>
+      </fileset>
+      <fileset dir="${core.etc}">
+        <exclude name="applicationContext-slide-client.xml"/>
+        <exclude name="applicationContext-webdav-client.xml"/>
+        <include name="*.xml"/>
+      </fileset>
+      <fileset dir="${core.build}/classes">
+        <include name="hibernate.cfg.xml"/>
+      </fileset>
+    </copy>
+    <copy todir="${web.build}/webapp/WEB-INF/classes">
+      <fileset dir="${core.etc}">
+        <include name="chandler.properties"/>
+      </fileset>
+      <filterset>
+        <filter token="VERSION" value="${chsrv.version}"/>
+      </filterset>
+    </copy>
+    <copy todir="${web.build}/webapp/WEB-INF/lib"
+          file="${core.build}/chandler-server-core.jar"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib"
+          file="${web.build}/cosmo-web.jar"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${acegi-security.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${antlr.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${aopalliance.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${cglib.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${commons-beanutils.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${commons-codec.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${commons-collections.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${commons-digester.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${commons-httpclient.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${commons-lang.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${commons-logging.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${commons-validator.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${concurrent.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${dom4j.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${ehcache.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${hibernate.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${jackrabbit.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${jcr.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${jcr-server.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${jcr-webdav.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${jdom.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${joda-time.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${jstl.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${jta.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${log4j.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${lucene.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${odmg.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${oro.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${spring.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${standard.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${struts.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${struts-el.jar}"/>
+    <copy todir="${web.build}/webapp/WEB-INF/lib" file="${urlrewrite.jar}"/>
   </target>
 
-  <target name="all" depends="pack"
-          description="alias for pack"/>
+  <target name="all" depends="compile,pack"
+          description="build and pack the source"/>
 
-  <target name="clean"
+  <target name="clean" depends="test-clean"
           description="clean out the source">
-    <delete dir="${web.web}/WEB-INF/classes"/>
+    <delete dir="${web.build}"/>
     <delete>
       <fileset dir="${web.web}/WEB-INF">
         <include name="action-servlet.xml"/>

Index: server/build.xml
diff -u server/build.xml:1.27 server/build.xml:1.28
--- server/build.xml:1.27	Fri Apr  8 13:16:50 2005
+++ server/build.xml	Fri Apr  8 14:43:28 2005
@@ -12,8 +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.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"/>
 
   <taskdef name="hibernatedoclet"
@@ -28,34 +26,22 @@
   <!-- BUILD TARGETS -->
 
   <target name="all"
-          depends="build-core,build-console,build-webdav,build-web"
-          description="compile all source code and pack webapps"/>
+          depends="build-core,build-web"
+          description="compile all source code and pack webapp"/>
 
   <target name="build-core" description="build core subsystem">
     <ant dir="${core.home}" target="all"
          inheritAll="false"/>
   </target>
 
-  <target name="build-console" depends="build-core"
-          description="build console webapp">
-    <ant dir="${console.home}" target="all"
-         inheritAll="false"/>
-  </target>
-
-  <target name="build-webdav"
-          description="build content webdav webapp">
-    <ant dir="${webdav.home}" target="all"
-         inheritAll="false"/>
-  </target>
-
   <target name="build-web"
           description="build webapp">
-    <ant dir="${web.home}" target="pack"
+    <ant dir="${web.home}" target="all"
          inheritAll="false"/>
   </target>
 
   <target name="clean"
-          depends="clean-core,clean-console,clean-webdav,clean-web"
+          depends="clean-core,clean-web"
           description="clean all subsystems"/>
 
   <target name="clean-core" description="clean core subsystem">
@@ -63,16 +49,6 @@
          inheritAll="false"/>
   </target>
 
-  <target name="clean-console" description="clean console webapp">
-    <ant dir="${console.home}" target="clean"
-         inheritAll="false"/>
-  </target>
-
-  <target name="clean-webdav" description="clean webdav webapp">
-    <ant dir="${webdav.home}" target="clean"
-         inheritAll="false"/>
-  </target>
-
   <target name="clean-web" description="clean webapp">
     <ant dir="${web.home}" target="clean"
          inheritAll="false"/>
@@ -115,7 +91,7 @@
   <target name="test-init" depends="test-gen,test-dbsetup"
           description="initialize test environment... only needed once"/>
 
-  <target name="test" depends="test-core,test-console"
+  <target name="test" depends="test-core,test-web"
           description="run all tests"/>
 
   <target name="test-core" description="test core subsystem">
@@ -123,8 +99,8 @@
          inheritAll="false"/>
   </target>
 
-  <target name="test-console" description="test console webapp">
-    <ant dir="${console.home}" target="test"
+  <target name="test-web" description="test webapp">
+    <ant dir="${web.home}" target="test"
          inheritAll="false"/>
   </target>
 
@@ -138,12 +114,12 @@
          inheritAll="false"/>
   </target>
 
-  <target name="test-clean-console" description="clean console webapp tests">
-    <ant dir="${console.home}" target="test-clean"
+  <target name="test-clean-web" description="clean webapp tests">
+    <ant dir="${web.home}" target="test-clean"
          inheritAll="false"/>
   </target>
 
-  <target name="test-clean" depends="test-clean-core,test-clean-console"
+  <target name="test-clean" depends="test-clean-core,test-clean-web"
           description="clean out test files">
     <delete dir="${chsrv.test}"/>
   </target>
@@ -179,36 +155,10 @@
     </chmod>
   </target>
 
-  <target name="dist-console"
-          description="install console webapp into Tomcat">
-    <copy todir="${chsrv.dist.console}">
-      <fileset dir="${console.home}/web"/>
-    </copy>
-    <copy todir="${chsrv.dist.tomcat}/conf/Catalina/localhost"
-          file="${chsrv.etc}/console.xml">
-      <filterset>
-        <filter token="RELOADABLE" value="${compile.debug}"/>
-      </filterset>
-    </copy>
-  </target>
-
-  <target name="dist-webdav"
-          description="install webdav webapp into Tomcat">
-    <copy todir="${chsrv.dist.webdav}">
-      <fileset dir="${webdav.home}/web"/>
-    </copy>
-    <copy todir="${chsrv.dist.tomcat}/conf/Catalina/localhost"
-          file="${chsrv.etc}/webdav.xml">
-      <filterset>
-        <filter token="RELOADABLE" value="${compile.debug}"/>
-      </filterset>
-    </copy>
-  </target>
-
   <target name="dist-web"
           description="install web webapp into Tomcat">
     <copy todir="${chsrv.dist.web}">
-      <fileset dir="${web.home}/web"/>
+      <fileset dir="${web.build}/webapp"/>
     </copy>
     <copy todir="${chsrv.dist.tomcat}/conf/Catalina/localhost"
           file="${chsrv.etc}/cosmo.xml">
@@ -218,9 +168,6 @@
     </copy>
   </target>
 
-  <target name="dist-webapps" depends="dist-console,dist-webdav"
-          description="install all webapps into Tomcat"/>
-
   <target name="dist-server"
           description="install server scripts and config into Tomcat">
     <mkdir dir="${chsrv.dist.version}/logs"/>
@@ -237,65 +184,9 @@
         <include name="repository.xml"/>
       </fileset>
     </copy>
-    <copy todir="${chsrv.dist.tomcat}/common/classes">
-      <fileset dir="${chsrv.etc}">
-        <include name="log4j.xml"/>
-      </fileset>
-      <fileset dir="${core.etc}">
-        <include name="*.xml"/>
-      </fileset>
-      <fileset dir="${core.build}/classes">
-        <include name="hibernate.cfg.xml"/>
-      </fileset>
-    </copy>
-    <copy todir="${chsrv.dist.tomcat}/common/classes">
-      <fileset dir="${core.etc}">
-        <include name="chandler.properties"/>
-      </fileset>
-      <filterset>
-        <filter token="VERSION" value="${chsrv.version}"/>
-      </filterset>
-    </copy>
-    <copy todir="${chsrv.dist.tomcat}/common/lib"
-          file="${core.build}/chandler-server-core.jar"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib"
-          file="${console.home}/build/chandler-server-console.jar"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib"
-          file="${webdav.home}/build/cosmo-webdav.jar"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${acegi-security.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${antlr.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${aopalliance.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${cglib.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${commons-beanutils.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${commons-codec.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${commons-digester.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${commons-httpclient.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${commons-lang.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${commons-logging.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${commons-validator.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${concurrent.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${dom4j.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${ehcache.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${hibernate.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${jackrabbit.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${jcr.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${jcr-server.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${jcr-webdav.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${jdom.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${joda-time.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${jstl.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${jta.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${log4j.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${lucene.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${odmg.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${oro.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${slide-webdavlib.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${spring.jar}"/>
+    <!-- XXX: remove and document dropping in your db driver as part of
+         installation -->
     <copy todir="${chsrv.dist.tomcat}/common/lib" file="${hsqldb.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${standard.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${struts.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${struts-el.jar}"/>
-    <copy todir="${chsrv.dist.tomcat}/common/lib" file="${urlrewrite.jar}"/>
   </target>
 
   <target name="dist-data"



More information about the Commits mailing list