struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@apache.org
Subject svn commit: r263953 - in /struts/shale/trunk: build.xml default.properties docs/release-notes-1.0.0.html use-cases/build.xml
Date Sun, 28 Aug 2005 23:34:07 GMT
Author: craigmcc
Date: Sun Aug 28 16:34:02 2005
New Revision: 263953

URL: http://svn.apache.org/viewcvs?rev=263953&view=rev
Log:
Cleanups to revised build procedures, make the use-cases/build.xml file not
fail if you don't have the custom Tomcat integration classes (unless you
actually try to use them).

PR:  Bugzilla #36393
Submitted By:  Manfred Klug <manklu AT web.de>

Modified:
    struts/shale/trunk/build.xml
    struts/shale/trunk/default.properties
    struts/shale/trunk/docs/release-notes-1.0.0.html
    struts/shale/trunk/use-cases/build.xml

Modified: struts/shale/trunk/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build.xml?rev=263953&r1=263952&r2=263953&view=diff
==============================================================================
--- struts/shale/trunk/build.xml (original)
+++ struts/shale/trunk/build.xml Sun Aug 28 16:34:02 2005
@@ -462,6 +462,10 @@
          ignoreerrors="true"
                   src="${maven.repo}/myfaces/jars/myfaces-jsf-api-1.0.9.jar"
          usetimestamp="true"/>
+    <get         dest="${lib.dir}/myfaces/myfaces-extensions.jar"
+         ignoreerrors="true"
+                  src="${maven.repo}/myfaces/jars/myfaces-extensions-1.0.9.jar"
+         usetimestamp="true"/>
     <get         dest="${lib.dir}/myfaces/myfaces-impl.jar"
          ignoreerrors="true"
                   src="${maven.repo}/myfaces/jars/myfaces-impl-1.0.9.jar"

Modified: struts/shale/trunk/default.properties
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/default.properties?rev=263953&r1=263952&r2=263953&view=diff
==============================================================================
--- struts/shale/trunk/default.properties (original)
+++ struts/shale/trunk/default.properties Sun Aug 28 16:34:02 2005
@@ -72,7 +72,7 @@
 
 commons-beanutils.jar=${lib.dir}/commons-beanutils/commons-beanutils.jar
 commons-chain.jar=${lib.dir}/commons-chain/commons-chain.jar
-commons-codec.jar=${lib.dir}/commons-codec/commons-code.jar
+commons-codec.jar=${lib.dir}/commons-codec/commons-codec.jar
 commons-collections.jar=${lib.dir}/commons-collections/commons-collections.jar
 commons-digester.jar=${lib.dir}/commons-digester/commons-digester.jar
 commons-el.jar=${lib.dir}/commons-el/commons-el.jar

Modified: struts/shale/trunk/docs/release-notes-1.0.0.html
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/docs/release-notes-1.0.0.html?rev=263953&r1=263952&r2=263953&view=diff
==============================================================================
--- struts/shale/trunk/docs/release-notes-1.0.0.html (original)
+++ struts/shale/trunk/docs/release-notes-1.0.0.html Sun Aug 28 16:34:02 2005
@@ -196,7 +196,7 @@
 
     <p>Shale based applications should run on any server that implements the
     Servlet 2.4 and JavaServer Pages 2.0 APIs.  The following steps are
-    required to assemble a Shale based application that may be depoyed and
+    required to assemble a Shale based application that may be deployed and
     executed.
 
     <h4>4.1 Add Required Libraries</h4>
@@ -427,7 +427,7 @@
     <p>FIXME</p>
 
     <a name="Building"></a>
-    <h3>6.0 Building Shale From Source</h3>
+    <h3>7.0 Building Shale From Source</h3>
 
     <p>The Shale distribution includes all of the source code for Shale,
     plus build scripts to reconstruct the release from scratch.  In order
@@ -460,10 +460,8 @@
             you installed the distribution.
         <li><code>tiles.dir</code> - Set this property to the fully qualified
             pathname of the directory into which you unpacked standalone Tiles.</li>
-        <li><code>jsf.home</code> - If you are using the JSF Reference
-            Implementation, set this property to the same value you set
-            <code>jsfri.dir</code> to.  Otherwise, comment out the default
-            entry and uncomment the following line to enable MyFaces use.</li>
+        <li><code>jsf.home</code> - If you are using MyFaces, comment out
+            the default value and uncomment the following line.</li>
         <li><code>jsf-api.jar</code> - IF you are using MyFaces, comment
out
             the default value and uncomment the following line.</li>
         <li><code>jsf-impl.jar</code> - If you are using MyFaces, comment
out

Modified: struts/shale/trunk/use-cases/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/build.xml?rev=263953&r1=263952&r2=263953&view=diff
==============================================================================
--- struts/shale/trunk/use-cases/build.xml (original)
+++ struts/shale/trunk/use-cases/build.xml Sun Aug 28 16:34:02 2005
@@ -56,18 +56,6 @@
   <property name="project.version" value="0.1-dev"/>
 
 
-  <!-- Custom Tomcat Integration -->
-  <taskdef  name="deploy"   classname="org.apache.catalina.ant.DeployTask"/>
-  <taskdef  name="install"  classname="org.apache.catalina.ant.InstallTask"/>
-  <taskdef  name="list"     classname="org.apache.catalina.ant.ListTask"/>
-  <taskdef  name="reload"   classname="org.apache.catalina.ant.ReloadTask"/>
-  <taskdef  name="remove"   classname="org.apache.catalina.ant.RemoveTask"/>
-  <taskdef  name="undeploy" classname="org.apache.catalina.ant.UndeployTask"/>
-  <property name="password" value="tomcat"/>
-  <property name="url"      value="http://localhost:8080/manager"/>
-  <property name="username" value="tomcat"/>
-
-
   <!-- Filter Settings -->
   <property name="webapp.state.saving" value="server"/>
   <property name="webapp.url"          value="http://localhost:8080/${context.path}"/>
@@ -384,45 +372,59 @@
   <!-- ===================== Tomcat Integration ============================ -->
 
 
-  <target name="deploy" depends="compile"
-   description="Deploy webapp on Tomcat">
-    <install url="${url}" username="${username}" password="${password}"
-            path="/${context.path}"
-             war="file://${build.home}/${context.path}"/>
+  <property name="password" value="tomcat"/>
+  <property name="url"      value="http://localhost:8080/manager"/>
+  <property name="username" value="tomcat"/>
+
+
+  <target    name="deploy" depends="compile"
+      description="Deploy webapp on Tomcat">
+    <taskdef name="install"
+        classname="org.apache.catalina.ant.InstallTask"/>
+    <install  url="${url}" username="${username}" password="${password}"
+             path="/${context.path}"
+              war="file://${build.home}/${context.path}"/>
   </target>
 
 
-  <target name="install" depends="compile"
-   description="Install webapp on Tomcat">
-    <install url="${url}" username="${username}" password="${password}"
-            path="/${context.path}"
-             war="file://${build.home}/${context.path}"/>
+  <target    name="install" depends="compile"
+      description="Install webapp on Tomcat">
+    <taskdef name="install"
+        classname="org.apache.catalina.ant.InstallTask"/>
+    <install  url="${url}" username="${username}" password="${password}"
+             path="/${context.path}"
+              war="file://${build.home}/${context.path}"/>
   </target>
 
 
-  <target name="list" description="List installed webapps on Tomcat">
-    <list url="${url}" username="${username}" password="${password}"/>
+  <target    name="list" description="List installed webapps on Tomcat">
+    <taskdef name="list"
+        classname="org.apache.catalina.ant.ListTask"/>
+    <list     url="${url}" username="${username}" password="${password}"/>
   </target>
 
 
-  <target name="reload" depends="compile"
-   description="Reload webapp on Tomcat">
-    <reload url="${url}" username="${username}" password="${password}"
-            path="/${context.path}"/>
+  <target    name="reload" depends="compile"
+      description="Reload webapp on Tomcat">
+    <taskdef name="reload"   classname="org.apache.catalina.ant.ReloadTask"/>
+    <reload   url="${url}" username="${username}" password="${password}"
+             path="/${context.path}"/>
   </target>
 
 
-  <target name="remove"
-   description="Remove webapp from Tomcat">
-    <remove url="${url}" username="${username}" password="${password}"
-            path="/${context.path}"/>
+  <target    name="remove" description="Remove webapp from Tomcat">
+    <taskdef name="remove"
+        classname="org.apache.catalina.ant.RemoveTask"/>
+    <remove   url="${url}" username="${username}" password="${password}"
+             path="/${context.path}"/>
   </target>
 
 
-  <target name="undeploy"
-   description="Undeploy webapp from Tomcat">
-    <remove url="${url}" username="${username}" password="${password}"
-            path="/${context.path}"/>
+  <target    name="undeploy" description="Undeploy webapp from Tomcat">
+    <taskdef name="remove"
+        classname="org.apache.catalina.ant.RemoveTask"/>
+    <remove   url="${url}" username="${username}" password="${password}"
+             path="/${context.path}"/>
   </target>
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org


Mime
View raw message