Changeset 1206

Timestamp:

01/09/07 11:00:08

Author:

douglm

Message:

Move renamed GotoAction? into comon.

Fix noop action to always forward to success.

Remove refs to bw-client.jar - moved last of the classes

Files:

• trunk/deployment/build.xml (modified) (3 diffs)
• trunk/deployment/webpublic/webapp/build.xml (modified) (1 diff)
• trunk/deployment/webuser/webapp/build.xml (modified) (1 diff)

trunk/deployment/build.xml

@@ -199 +199 @@
-       this component.
-       ================================================================= -->
-
-  <!--
-  <target name="deploy.standalone.apps" if="org.bedework.global.build.standalone.app" >
-    <property name="org.bedework.deploy.kind" value="webapp" />
-    <antcall target="deploy.apps" inheritrefs="true" />
-  </target>
-
-  <target name="deploy.portal.apps" if="org.bedework.global.portal.platform" >
-    <property name="org.bedework.deploy.kind"
-              value="${org.bedework.global.portal.platform}" />
-    <antcall target="deploy.apps" inheritrefs="true" />
-  </target>
-
-  <target name="deploy.j2ee.apps" if="org.bedework.global.j2ee.platform" >
-    <property name="org.bedework.deploy.kind"
-              value="${org.bedework.global.j2ee.platform}" />
-    <antcall target="deploy.apps" inheritrefs="true" />
-  </target>
-  -->
-
-  <!-- Always build the shellscr stuff.
-  <target name="deploy.shellscr.apps" >
-    <property name="org.bedework.deploy.kind" value="shellscr" />
-    <antcall target="deploy.apps" inheritrefs="true" />
-  </target>
-  -->
-
-  <!-- The cp.xalan task conditionally copies the xalan.jar file, if
@@ -292 +266 @@
-
-    <!-- ======================= termination tasks ================= -->
-    <!--
-    <property name="org.bedework.deploy.type.dir"
-              location="${org.bedework.deployment.base}/termination" />
-              -->
-
-    <ant antfile="${org.bedework.deployment.base}/termination/${org.bedework.deploy.kind}/build.xml"
@@ -317 +287 @@
-    </if>
-  </target>
-  <!--
-  <target name="wrap.deploy.available.app">
-    <available file="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml"
-               property="app.kind.available" />
-
-    <antcall target="deploy.available.app" inheritrefs="true" />
-  </target>
-
-  <target name="deploy.available.app" if="app.kind.available">
-    <propertyset id="deploy-app-properties">
-      <propertyref prefix="org.bedework.app.${org.bedework.deploy.name}"/>
-      <globmapper from="org.bedework.app.${org.bedework.deploy.name}.*" to="propval.app.*"/>
-    </propertyset>
-
-    <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml"
-         inheritrefs="true" target="deploy" >
-      <propertyset refid="deploy-app-properties" />
-    </ant>
-  </target>
-  -->
-</project>
-

trunk/deployment/webpublic/webapp/build.xml

@@ -100 +100 @@
-    <fileset id="app.bin.files" dir="${bin.home}" >
-      <include name="bw-webcommon*.jar" />
-      <include name="bw-webclient*.jar" />
-    </fileset>
-
- -->
+
-    <fileset id="app.temp.lib.files" dir="${org.bedework.temp.jars}" >
-      <include name="${org.bedework.webclient.jar.name}" />
-    </fileset>
+    -->
-
-    <!-- ===============================================================

trunk/deployment/webuser/webapp/build.xml

@@ -95 +95 @@
-    <fileset id="app.bin.files" dir="${bin.home}" >
-      <include name="bw-webcommon*.jar" />
-      <include name="bw-webclient*.jar" />
-    </fileset>
-
- -->
+
-    <fileset id="app.temp.lib.files" dir="${org.bedework.temp.jars}" >
-      <include name="${org.bedework.webclient.jar.name}" />
-    </fileset>
+    -->
-
-    <!-- ===============================================================