You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@apache.org on 2004/10/10 04:30:59 UTC

svn commit: rev 54202 - in struts/trunk/struts-faces: core-library systest1-webapp systest1-webapp/src/java/org/apache/struts/faces/systest systest1-webapp/src/java/org/apache/struts/faces/systest1 systest1-webapp/src/web systest1-webapp/src/web/WEB-INF

Author: craigmcc
Date: Sat Oct  9 19:30:58 2004
New Revision: 54202

Added:
   struts/trunk/struts-faces/systest1-webapp/build.xml
      - copied, changed from rev 54195, struts/trunk/struts-faces/core-library/build.xml
   struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/
      - copied from rev 54196, struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest/
Removed:
   struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest/
Modified:
   struts/trunk/struts-faces/core-library/build.xml
   struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/ApplicationResources.properties
   struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/BindingBean.java
   struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/ContextAction.java
   struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/LogonAction.java
   struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/SimpleBean.java
   struts/trunk/struts-faces/systest1-webapp/src/web/WEB-INF/faces-config.xml
   struts/trunk/struts-faces/systest1-webapp/src/web/WEB-INF/struts-config.xml
   struts/trunk/struts-faces/systest1-webapp/src/web/WEB-INF/validation.xml
   struts/trunk/struts-faces/systest1-webapp/src/web/WEB-INF/web.xml
   struts/trunk/struts-faces/systest1-webapp/src/web/context.jsp
   struts/trunk/struts-faces/systest1-webapp/src/web/context1.jsp
   struts/trunk/struts-faces/systest1-webapp/src/web/logon.jsp
   struts/trunk/struts-faces/systest1-webapp/src/web/logon1.jsp
   struts/trunk/struts-faces/systest1-webapp/src/web/simple.jsp
Log:
Factor out system integration test webapp #1.


Modified: struts/trunk/struts-faces/core-library/build.xml
==============================================================================
--- struts/trunk/struts-faces/core-library/build.xml	(original)
+++ struts/trunk/struts-faces/core-library/build.xml	Sat Oct  9 19:30:58 2004
@@ -228,7 +228,7 @@
   <!-- ===================== Generate Documentation ======================== -->
 
 
-  <target         name="docs" depends="prepare"
+  <target         name="docs" depends="library"
            description="Create generated documentation and JavaDocs">
 
     <style     basedir="src/conf"
@@ -256,7 +256,7 @@
   <!-- ==================== Create Binary Distribution ==================== -->
 
 
-  <target name="dist" depends="library"
+  <target name="dist" depends="doc"
    description="Create binary distribution">
 
     <mkdir     dir="${dist.home}"/>

Copied: struts/trunk/struts-faces/systest1-webapp/build.xml (from rev 54195, struts/trunk/struts-faces/core-library/build.xml)
==============================================================================
--- struts/trunk/struts-faces/core-library/build.xml	(original)
+++ struts/trunk/struts-faces/systest1-webapp/build.xml	Sat Oct  9 19:30:58 2004
@@ -19,7 +19,7 @@
 -->
 
 
-<project name="Struts-Faces Core Library" default="library" basedir=".">
+<project name="Struts-Faces System Test Webapp 1" default="compile" basedir=".">
 
 
   <!-- ===================== Initialize Property Values ==================== -->
@@ -62,6 +62,7 @@
   <property name="servlet.jar"      value="${server.home}/common/lib/servlet.jar"/>
   <property name="standard.jar"     value="${jstl.home}/lib/standard.jar"/>
   <property name="struts.jar"       value="${struts.home}/lib/struts.jar"/>
+  <property name="struts-faces.jar" value="${basedir}/../core-library/target/lib/struts-faces.jar"/>
 
 
   <!-- Conditional Processing Flags -->
@@ -75,7 +76,8 @@
   <!-- Build Defaults -->
   <property name="build.home"      value="${basedir}/target"/>
   <property name="dist.home"       value="${basedir}/dist"/>
-  <property name="project.name"    value="Struts-Faces Integration Library"/>
+  <property name="context.path"    value="struts-faces-systest1"/>
+  <property name="project.name"    value="Struts-Faces System Test Webapp 1"/>
   <property name="project.package" value="org.apache.struts.faces"/>
   <property name="project.version" value="1.0-dev"/>
 
@@ -86,12 +88,6 @@
   <property name="compile.optimize"        value="true"/>
 
 
-  <!-- Unit Test Defaults -->
-  <property name="test.haltonerror"        value="true"/>
-  <property name="test.haltonfailure"      value="true"/>
-  <property name="test.runner"             value="junit.textui.TestRunner"/>
-
-
   <!-- Compile Classpath -->
   <path id="compile.classpath">
     <pathelement location="${commons-beanutils.jar}"/>
@@ -104,26 +100,27 @@
     <pathelement location="${jstl.jar}"/>
     <pathelement location="${servlet.jar}"/>
     <pathelement location="${struts.jar}"/>
-    <pathelement location="${build.home}/classes"/>
+    <pathelement location="${struts-faces.jar}"/>
+    <pathelement location="${build.home}/${context.path}/WEB-INF/classes"/>
   </path>
 
 
-  <!-- Test Classpath -->
-  <path id="test.classpath">
-    <pathelement location="${commons-beanutils.jar}"/>
-    <pathelement location="${commons-collections.jar}"/>
-    <pathelement location="${commons-digester.jar}"/>
-    <pathelement location="${commons-logging.jar}"/>
-    <pathelement location="${commons-validator.jar}"/>
-    <pathelement location="${jsf-api.jar}"/>
-    <pathelement location="${jsp-api.jar}"/>
-    <pathelement location="${jstl.jar}"/>
-    <pathelement location="${junit.jar}"/>
-    <pathelement location="${servlet.jar}"/>
-    <pathelement location="${struts.jar}"/>
-    <pathelement location="${build.home}/classes"/>
-    <pathelement location="${build.home}/test-classes"/>
-  </path>
+  <!-- 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"/>
+
+
+  <!-- System Integration Test Settings -->
+  <property name="webapp.state.saving" value="server"/>
+  <property name="webapp.url"          value="http://localhost:8080$/{context.path}"/>
+
 
   <!-- ==================== Maintenance Targets ============================ -->
 
@@ -137,24 +134,26 @@
 
   <target     name="init">
     <echo  message="---------- ${project.name} ${project.version} -----------"/>
-    <filter  token="name"     value="${project.name}"/>
-    <filter  token="package"  value="${project.package}"/>
-    <filter  token="state"    value="${systest.state.saving}"/>
-    <filter  token="version"  value="${project.version}"/>
-    <echo  message="jsf-api.jar =    ${jsf-api.jar}"/>
-    <echo  message="jsf-impl.jar =   ${jsf-impl.jar}"/>
-    <echo  message="struts-jar =     ${struts.jar}"/>
-    <echo  message="jsfri.present =  ${jsfri.present}"/>
-    <echo  message="myfaces.present= ${myfaces.present}"/>
+    <filter  token="name"       value="${project.name}"/>
+    <filter  token="package"    value="${project.package}"/>
+    <filter  token="state"      value="${webapp.state.saving}"/>
+    <filter  token="version"    value="${project.version}"/>
+    <echo  message="build.standalone = ${build.standalone}"/>
+    <echo  message="jsf-api.jar =      ${jsf-api.jar}"/>
+    <echo  message="jsf-impl.jar =     ${jsf-impl.jar}"/>
+    <echo  message="struts.jar =       ${struts.jar}"/>
+    <echo  message="struts-faces.jar = ${struts-faces.jar}"/>
+    <echo  message="jsfri.present =    ${jsfri.present}"/>
+    <echo  message="myfaces.present=   ${myfaces.present}"/>
   </target>
 
 
   <target     name="prepare" depends="init">
     <mkdir     dir="${build.home}"/>
-    <mkdir     dir="${build.home}/classes"/>
-    <mkdir     dir="${build.home}/classes/META-INF"/>
-    <mkdir     dir="${build.home}/conf"/>
-    <mkdir     dir="${build.home}/lib"/>
+    <mkdir     dir="${build.home}/${context.path}"/>
+    <mkdir     dir="${build.home}/${context.path}/WEB-INF"/>
+    <mkdir     dir="${build.home}/${context.path}/WEB-INF/classes"/>
+    <mkdir     dir="${build.home}/${context.path}/WEB-INF/lib"/>
     <mkdir     dir="${dist.home}"/>
     <mkdir     dir="${dist.home}/docs"/>
     <mkdir     dir="${dist.home}/docs/api"/>
@@ -162,28 +161,106 @@
 
 
   <target     name="static" depends="prepare">
-    <tstamp/>
-    <copy    todir="${build.home}/conf"
+
+    <!-- Copy static web resources -->
+    <copy    todir="${build.home}/${context.path}"
          filtering="on">
-      <fileset dir="src/conf"
-          includes="*.MF"/>
+      <fileset dir="src/web"/>
     </copy>
-    <copy    todir="${build.home}/classes/META-INF">
-      <fileset dir="src/conf"
-          includes="*faces-config.xml"/>
+
+    <!-- Copy required configuration files -->
+    <copy    todir="${build.home}/${context.path}/WEB-INF">
+      <fileset dir="${struts.home}/lib"
+          includes="valid*.xml"/>
     </copy>
+
+    <!-- Copy required library JAR files -->
+    <mkdir         dir="${build.home}/${context.path}/WEB-INF/lib"/>
+    <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
+                  file="${struts-faces.jar}"/>
+    <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
+                  file="${commons-beanutils.jar}"/>
+    <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
+                  file="${commons-collections.jar}"/>
+    <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
+                  file="${commons-digester.jar}"/>
+    <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
+                  file="${commons-fileupload.jar}"/>
+    <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
+                  file="${commons-logging.jar}"/>
+    <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
+                  file="${commons-validator.jar}"/>
+    <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
+                  file="${jakarta-oro.jar}"/>
+    <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
+                  file="${struts.jar}"/>
+
+  </target>
+
+
+  <target name="static.jsfri" depends="static"
+            if="jsfri.present">
+
+    <replace        dir="${build.home}/${context.path}/WEB-INF"
+                  token="MYFACES_BEGIN"
+                  value="&lt;!-- MyFaces Listener"/>
+    <replace        dir="${build.home}/${context.path}/WEB-INF"
+                  token="MYFACES_END"
+                  value="--&gt;"/>
+
+  </target>
+
+
+  <target name="static.myfaces" depends="static.jsfri"
+            if="myfaces.present">
+
+    <replace        dir="${build.home}/${context.path}/WEB-INF"
+                  token="MYFACES_BEGIN"
+                  value="&lt;!-- MyFaces Listener --&gt;"/>
+    <replace        dir="${build.home}/${context.path}/WEB-INF"
+                  token="MYFACES_END"
+                  value=""/>
+
   </target>
 
 
-  <!-- =================== Compile Library Components ====================== -->
+  <target name="libraries" depends="static.jsfri"
+            if="build.standalone">
 
+    <!-- Copy libraries required for standalone use only -->
+    <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
+                  file="${jsf-api.jar}"/>
+    <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
+                  file="${jsf-impl.jar}"/>
+    <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
+                  file="${jstl.jar}"/>
+    <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
+                  file="${standard.jar}"/>
+
+  </target>
 
-  <target         name="compile" depends="static"
-           description="Compile core integration library">
+
+  <target name="libraries.myfaces" depends="libraries"
+            if="myfaces.present">
+
+    <!-- Copy additional libraries required by MyFaces implementation -->
+    <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
+                  file="${jsf.home}/lib/commons-codec-1.2.jar"/>
+    <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
+                  file="${jsf.home}/lib/commons-el.jar"/>
+
+  </target>
+
+
+  <!-- ================= Compile Application Components ==================== -->
+
+
+  <target         name="compile" depends="libraries.myfaces"
+           description="Compile application components">
 
     <!-- Compile Java Sources -->
     <javac      srcdir="src/java"
-               destdir="${build.home}/classes"
+               destdir="${build.home}/${context.path}/WEB-INF/classes"
                  debug="${compile.debug}"
            deprecation="${compile.deprecation}"
               optimize="${compile.optimize}">
@@ -191,51 +268,20 @@
     </javac>
 
     <!-- Copy non-Java Sources -->
-    <copy        todir="${build.home}/classes">
+    <copy        todir="${build.home}/${context.path}/WEB-INF/classes">
       <fileset     dir="src/java">
         <exclude  name="**/*.java"/>
       </fileset>
     </copy>
 
-    <!-- Create Tag Library Descriptor -->
-    <style     basedir="src/conf"
-               destdir="${build.home}/conf"
-             extension=".tld"
-                 style="src/conf/struts-tld.xsl"
-              includes="struts-faces.xml"/>
-    <copy       tofile="${build.home}/classes/META-INF/struts-faces.tld"
-                  file="${build.home}/conf/struts-faces.tld"/>
-
-    <!-- Copy license and notice files -->
-    <copy       tofile="${build.home}/classes/META-INF/LICENSE.txt"
-                  file="LICENSE.txt"/>
-    <copy       tofile="${build.home}/classes/META-INF/NOTICE.txt"
-                  file="NOTICE.txt"/>
-
-  </target>
-
-
-  <target         name="library" depends="compile"
-           description="Package integration library">
-
-    <jar       jarfile="${build.home}/lib/struts-faces.jar"
-               basedir="${build.home}/classes"
-              manifest="${build.home}/conf/MANIFEST.MF"/>
-
   </target>
 
 
   <!-- ===================== Generate Documentation ======================== -->
 
 
-  <target         name="docs" depends="prepare"
-           description="Create generated documentation and JavaDocs">
-
-    <style     basedir="src/conf"
-               destdir="${dist.home}/docs"
-             extension=".html"
-                 style="src/conf/struts-doc.xsl"
-              includes="struts-faces.xml"/>
+  <target         name="docs" depends="compile"
+           description="Create JavaDocs">
 
     <javadoc
             sourcepath="src/java"
@@ -256,7 +302,7 @@
   <!-- ==================== Create Binary Distribution ==================== -->
 
 
-  <target name="dist" depends="library"
+  <target name="dist" depends="docs"
    description="Create binary distribution">
 
     <mkdir     dir="${dist.home}"/>
@@ -265,15 +311,8 @@
                                 excludes="build.properties"/>
     </copy>
 
-    <mkdir     dir="${dist.home}/conf"/>
-    <copy    todir="${dist.home}/conf">
-      <fileset dir="${build.home}/conf" includes="*.tld"/>
-    </copy>
-
-    <mkdir     dir="${dist.home}/lib"/>
-    <copy    todir="${dist.home}/lib">
-      <fileset dir="${build.home}/lib" includes="*.jar"/>
-    </copy>
+    <jar   jarfile="${dist.home}/${context.path}.war"
+           basedir="${build.home}/${context.path}"/>
 
     <mkdir     dir="${dist.home}/src"/>
     <copy    todir="${dist.home}/src">
@@ -283,51 +322,33 @@
   </target>
 
 
-  <!-- ========================= Unit Tests ================================ -->
-
+  <!-- ===================== Tomcat Integration ============================ -->
 
-  <target         name="test:compile" depends="library"
-           description="Compile library unit tests">
 
-    <mkdir         dir="${build.home}/test-classes"/>
-
-    <!-- Compile Java Sources -->
-    <javac      srcdir="src/test"
-               destdir="${build.home}/test-classes"
-                 debug="${compile.debug}"
-           deprecation="${compile.deprecation}"
-              optimize="${compile.optimize}">
-      <classpath refid="test.classpath" />
-    </javac>
+  <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>
 
-    <!-- Copy non-Java Sources -->
-    <copy        todir="${build.home}/test-classes">
-      <fileset     dir="src/test">
-        <exclude  name="**/*.java"/>
-      </fileset>
-    </copy>
 
+  <target name="list" description="List installed webapps on Tomcat">
+    <list url="${url}" username="${username}" password="${password}"/>
   </target>
 
 
-  <target         name="test" depends="test:compile"
-           description="Execute library unit tests">
-
-    <junit        fork="yes"
-           haltonerror="${test.haltonerror}"
-         haltonfailure="${test.haltonfailure}"
-          printSummary="no">
-
-      <classpath refid="test.classpath"/>
-      <formatter  type="plain"
-               usefile="false"/>
-      <batchtest  fork="yes">
-        <fileset   dir="${build.home}/test-classes"
-              includes="org/apache/struts/faces/*/*TestCase.class"/>
-      </batchtest>
+  <target name="reload" depends="compile"
+   description="Reload webapp on Tomcat">
+    <reload url="${url}" username="${username}" password="${password}"
+            path="/${context.path}"/>
+  </target>
 
-    </junit>
 
+  <target name="remove"
+   description="Remove webapp from Tomcat">
+    <remove url="${url}" username="${username}" password="${password}"
+            path="/${context.path}"/>
   </target>
 
 

Modified: struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/ApplicationResources.properties
==============================================================================
--- struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest/ApplicationResources.properties	(original)
+++ struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/ApplicationResources.properties	Sat Oct  9 19:30:58 2004
@@ -1,3 +1,19 @@
+# Copyright 2002,2004 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# $Id$
+
 button.cancel=Cancel
 button.logon=Logon
 button.reset=Reset

Modified: struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/BindingBean.java
==============================================================================
--- struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest/BindingBean.java	(original)
+++ struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/BindingBean.java	Sat Oct  9 19:30:58 2004
@@ -12,9 +12,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * $Id$
  */
 
-package org.apache.struts.faces.systest;
+package org.apache.struts.faces.systest1;
 
 
 import javax.faces.component.UIComponent;

Modified: struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/ContextAction.java
==============================================================================
--- struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest/ContextAction.java	(original)
+++ struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/ContextAction.java	Sat Oct  9 19:30:58 2004
@@ -12,9 +12,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * $Id$
  */
 
-package org.apache.struts.faces.systest;
+package org.apache.struts.faces.systest1;
 
 import java.util.Locale;
 import javax.servlet.http.HttpServletRequest;

Modified: struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/LogonAction.java
==============================================================================
--- struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest/LogonAction.java	(original)
+++ struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/LogonAction.java	Sat Oct  9 19:30:58 2004
@@ -12,9 +12,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * $Id$
  */
 
-package org.apache.struts.faces.systest;
+package org.apache.struts.faces.systest1;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

Modified: struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/SimpleBean.java
==============================================================================
--- struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest/SimpleBean.java	(original)
+++ struts/trunk/struts-faces/systest1-webapp/src/java/org/apache/struts/faces/systest1/SimpleBean.java	Sat Oct  9 19:30:58 2004
@@ -12,9 +12,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * $Id$
  */
 
-package org.apache.struts.faces.systest;
+package org.apache.struts.faces.systest1;
 
 
 /**

Modified: struts/trunk/struts-faces/systest1-webapp/src/web/WEB-INF/faces-config.xml
==============================================================================
--- struts/trunk/struts-faces/systest1-webapp/src/web/WEB-INF/faces-config.xml	(original)
+++ struts/trunk/struts-faces/systest1-webapp/src/web/WEB-INF/faces-config.xml	Sat Oct  9 19:30:58 2004
@@ -22,6 +22,8 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 
+ $Id$
+
 -->
 
 
@@ -30,7 +32,7 @@
   <managed-bean>
     <managed-bean-name>binding</managed-bean-name>
     <managed-bean-class>
-      org.apache.struts.faces.systest.BindingBean
+      org.apache.struts.faces.systest1.BindingBean
     </managed-bean-class>
     <managed-bean-scope>request</managed-bean-scope>
   </managed-bean>
@@ -38,7 +40,7 @@
   <managed-bean>
     <managed-bean-name>simple</managed-bean-name>
     <managed-bean-class>
-      org.apache.struts.faces.systest.SimpleBean
+      org.apache.struts.faces.systest1.SimpleBean
     </managed-bean-class>
     <managed-bean-scope>request</managed-bean-scope>
   </managed-bean>

Modified: struts/trunk/struts-faces/systest1-webapp/src/web/WEB-INF/struts-config.xml
==============================================================================
--- struts/trunk/struts-faces/systest1-webapp/src/web/WEB-INF/struts-config.xml	(original)
+++ struts/trunk/struts-faces/systest1-webapp/src/web/WEB-INF/struts-config.xml	Sat Oct  9 19:30:58 2004
@@ -20,6 +20,8 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 
+ $Id$
+
 -->
 
 
@@ -66,12 +68,12 @@
 
     <!-- Render Context Values Action -->
     <action          path="/context"
-                     type="org.apache.struts.faces.systest.ContextAction"
+                     type="org.apache.struts.faces.systest1.ContextAction"
                  validate="false"/>
 
     <!-- Execute Logon Action -->
     <action          path="/logon"
-                     type="org.apache.struts.faces.systest.LogonAction"
+                     type="org.apache.struts.faces.systest1.LogonAction"
                     input="logon"
                      name="logonForm"
                     scope="request"
@@ -95,7 +97,7 @@
 
   <message-resources
           key="messages"
-    parameter="org.apache.struts.faces.systest.ApplicationResources"/>
+    parameter="org.apache.struts.faces.systest1.ApplicationResources"/>
 
 
   <!-- ========== Plug Ins Configuration ================================== -->

Modified: struts/trunk/struts-faces/systest1-webapp/src/web/WEB-INF/validation.xml
==============================================================================
--- struts/trunk/struts-faces/systest1-webapp/src/web/WEB-INF/validation.xml	(original)
+++ struts/trunk/struts-faces/systest1-webapp/src/web/WEB-INF/validation.xml	Sat Oct  9 19:30:58 2004
@@ -21,13 +21,13 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 
+ $Id$
+
 -->
 
 
 <!--
     Validation Rules for the Struts-Faces System Integration Test Webapp
-
-    $Id$
 -->
 
 <form-validation>

Modified: struts/trunk/struts-faces/systest1-webapp/src/web/WEB-INF/web.xml
==============================================================================
--- struts/trunk/struts-faces/systest1-webapp/src/web/WEB-INF/web.xml	(original)
+++ struts/trunk/struts-faces/systest1-webapp/src/web/WEB-INF/web.xml	Sat Oct  9 19:30:58 2004
@@ -21,6 +21,8 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 
+ $Id$
+
 -->
 
 

Modified: struts/trunk/struts-faces/systest1-webapp/src/web/context.jsp
==============================================================================
--- struts/trunk/struts-faces/systest1-webapp/src/web/context.jsp	(original)
+++ struts/trunk/struts-faces/systest1-webapp/src/web/context.jsp	Sat Oct  9 19:30:58 2004
@@ -14,6 +14,8 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 
+ $Id$
+
 -->
 
 <%@ page contentType="text/html;charset=UTF-8" %>

Modified: struts/trunk/struts-faces/systest1-webapp/src/web/context1.jsp
==============================================================================
--- struts/trunk/struts-faces/systest1-webapp/src/web/context1.jsp	(original)
+++ struts/trunk/struts-faces/systest1-webapp/src/web/context1.jsp	Sat Oct  9 19:30:58 2004
@@ -14,6 +14,8 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 
+ $Id$
+
 -->
 
 <%@ page contentType="text/html;charset=UTF-8" %>

Modified: struts/trunk/struts-faces/systest1-webapp/src/web/logon.jsp
==============================================================================
--- struts/trunk/struts-faces/systest1-webapp/src/web/logon.jsp	(original)
+++ struts/trunk/struts-faces/systest1-webapp/src/web/logon.jsp	Sat Oct  9 19:30:58 2004
@@ -14,6 +14,8 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 
+ $Id$
+
 -->
 
 <%@ page contentType="text/html;charset=UTF-8" %>

Modified: struts/trunk/struts-faces/systest1-webapp/src/web/logon1.jsp
==============================================================================
--- struts/trunk/struts-faces/systest1-webapp/src/web/logon1.jsp	(original)
+++ struts/trunk/struts-faces/systest1-webapp/src/web/logon1.jsp	Sat Oct  9 19:30:58 2004
@@ -14,6 +14,8 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 
+ $Id$
+
 -->
 
 <%@ page contentType="text/html;charset=UTF-8" %>

Modified: struts/trunk/struts-faces/systest1-webapp/src/web/simple.jsp
==============================================================================
--- struts/trunk/struts-faces/systest1-webapp/src/web/simple.jsp	(original)
+++ struts/trunk/struts-faces/systest1-webapp/src/web/simple.jsp	Sat Oct  9 19:30:58 2004
@@ -14,6 +14,8 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 
+ $Id$
+
 -->
 
 <%@ page contentType="text/html;charset=UTF-8" %>

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