Changeset 1193

Timestamp:

01/02/07 15:16:20

Author:

douglm

Message:

Disabled common-context stuff doesn't work.

Files:

• trunk/config/configs/democal.properties (modified) (1 diff)
• trunk/deployment/resources/build.xml (modified) (2 diffs)
• trunk/deployment/termination/webapp/build.xml (modified) (1 diff)

trunk/config/configs/democal.properties

@@ -44 +44 @@
-# server when the root context is defined to be an application rather than the
-# normal web server default.
-
-
-
-
-
+
+
+
+
+
+
+
-
-org.bedework.global.directory.browsing.disallowed=false

trunk/deployment/resources/build.xml

@@ -47 +47 @@
-      <isset property="org.bedework.global.build.common.context" />
-      <then>
-        <echo message="***************************************************************" />
-        <echo message="Deploying common context ${common.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
-        <echo message="***************************************************************" />
-
-        <!-- Delete expanded version -->
-        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
-
-        <!-- copy the war file. -->
-        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}"
-              file="${common.war.file}"
-              overwrite="yes" />
-
-        <!-- Delete the quickstart context def -->
-        <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
-
-        <!--
-        <if>
-          <isset property="org.bedework.global.portal.platform" />
-          <then>
-            <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.global.portal.platform}/build.xml"
-                 inheritrefs="true" target="deploy" />
-          </then>
-        </if>
-        -->
-      </then>
-    </if>
-  </target>
-
-  <!-- =================================================================
-       The "deploy.common" target is called once to create a common web
-       accessible directory
-       ================================================================= -->
-
-  <target name="deploy.common" depends="init" >
-    <if>
-      <isset property="org.bedework.global.build.common.context" />
-      <then>
-        <!-- Build a deployable war file with common files -->
-
@@ -115 +78 @@
-             basedir="${common.dest.war}"
-             excludes="WEB-INF/web.xml" />
+
+        <echo message="***************************************************************" />
+        <echo message="Deploying common context ${common.war.file} into ${org.bedework.appserver.dir}/${propval.app.deploy.dir}" />
+        <echo message="***************************************************************" />
+
+        <!-- Delete expanded version -->
+        <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.war.name}" />
+
+        <!-- copy the war file. -->
+        <copy todir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}"
+              file="${common.war.file}"
+              overwrite="yes" />
+
+        <!-- Delete the quickstart context def -->
+        <delete file="${org.bedework.appserver.dir}/conf/Catalina/localhost/${propval.app.war.name}.xml" />
+
+        <!--
+        <if>
+          <isset property="org.bedework.global.portal.platform" />
+          <then>
+            <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.global.portal.platform}/build.xml"
+                 inheritrefs="true" target="deploy" />
+          </then>
+        </if>
+        -->
-      </then>
-      <else>

trunk/deployment/termination/webapp/build.xml

@@ -14 +14 @@
-    <!-- Deploy common resources -->
-    <ant antfile="${org.bedework.common.resources}/build.xml"
-.common
+
-  </target>
-