cvs commit: logging-log4j/examples/tiny-webapp/Hello/WebRoot/WEB-INF/classes .cvsignore

[ceki]

ceki        2005/01/19 09:32:07

  Modified:    examples/tiny-webapp/Hello build.xml build.properties.sample
  Added:       examples/tiny-webapp/Hello/WebRoot/WEB-INF web.xml
               examples/tiny-webapp/Hello/WebRoot index.html
               examples/tiny-webapp/Hello/WebRoot/WEB-INF/classes
                        .cvsignore
  Removed:     examples/tiny-webapp/Hello/src/WEB-INF web.xml
               examples/tiny-webapp/Hello/src/resources hello-log4j.xml
               examples/tiny-webapp/Hello/src/html index.html
  Log:
  Files moved around to allow for in place deployment, that is deployment 
without building a jar file.
  
  Revision  Changes    Path
  1.1                  
logging-log4j/examples/tiny-webapp/Hello/WebRoot/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
  <web-app>
  
  
    <display-name>Hello sample web-application</display-name>
  
    <servlet>
      <servlet-name>some-init-servlet</servlet-name>
      <servlet-class>wombat.InitServlet</servlet-class>
      <load-on-startup>1</load-on-startup>
    </servlet>
  
    <servlet>
      <servlet-name>HelloServlet</servlet-name>
      <servlet-class>wombat.HelloServlet</servlet-class>
    </servlet>
  
    <servlet-mapping>
      <servlet-name>HelloServlet</servlet-name>
      <url-pattern>/HelloServlet</url-pattern>
    </servlet-mapping>
  
    <env-entry>
     <description>JNDI logging context for this app</description>
     <env-entry-name>log4j/context-name</env-entry-name>
     <env-entry-value>hello</env-entry-value>
     <env-entry-type>java.lang.String</env-entry-type>
    </env-entry>
     
    <env-entry>
     <description>URL for configuring log4j context</description>
     <env-entry-name>log4j/configuration-resource</env-entry-name>
     <env-entry-value>hello-log4j.xml</env-entry-value>
     <env-entry-type>java.lang.String</env-entry-type>
    </env-entry>
    
     <listener>
       
<listener-class>org.apache.log4j.selector.servlet.ContextDetachingSCL</listener-class>
     </listener>
    
  </web-app>
  
  
  
  1.3       +14 -9     logging-log4j/examples/tiny-webapp/Hello/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/examples/tiny-webapp/Hello/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml 27 Mar 2004 17:31:56 -0000      1.2
  +++ build.xml 19 Jan 2005 17:32:06 -0000      1.3
  @@ -7,14 +7,21 @@
     <!-- The build.properties file defines variables dependent of the host 
machine -->
     <property file="build.properties"/>
     
  -  <property name="src.dir" value="${basedir}/src/java/"/>
  -  <property name="javac.dest" value="${basedir}/classes"/>
  +  <property name="log4j.home" value="../../.."/>
  +
  +  <property name="src.dir" value="${basedir}/src/java"/>
  +  <property name="WebRoot" value="${basedir}/WebRoot"/>
  +  <property name="WEB-INF" value="${WebRoot}/WEB-INF"/>
  +  <property name="javac.dest" value="${WEB-INF}/classes"/>
   
     <property name="webapp-name" value="hello"/>
   
     <path id="compile.classpath">
  -    <pathelement location="${build.home}/classes"/>
  -    <pathelement location="${log4j.jar}"/>
  +    <pathelement location="${src.dir}"/>
  +    <pathelement location="${javac.dest}"/>
  +     <fileset dir="${log4j.home}">
  +       <include name="log4j-1.3*.jar"/>
  +     </fileset>
       <pathelement location="${servlet.jar}"/>
     </path>
    
  @@ -31,11 +38,9 @@
       </javac>
     </target>
   
  -  <target name="war" depends="compile">
  -    <war warfile="${webapp-name}.war" webxml="src/WEB-INF/web.xml">
  -      <classes dir="classes"/>
  -      <zipfileset dir="src/resources" prefix="WEB-INF/classes"/>
  -      <zipfileset dir="src/html" prefix=""/>
  +  <target name="war" depends="compile">    
  +    <war warfile="${webapp-name}.war" webxml="${WEB-INF}/web.xml">
  +      <zipfileset dir="${WebRoot}"/>
       </war>
     </target>
   
  
  
  
  1.2       +0 -4      
logging-log4j/examples/tiny-webapp/Hello/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: 
/home/cvs/logging-log4j/examples/tiny-webapp/Hello/build.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.properties.sample   27 Mar 2004 17:31:56 -0000      1.1
  +++ build.properties.sample   19 Jan 2005 17:32:06 -0000      1.2
  @@ -8,7 +8,3 @@
   
   # We need servlet to compile the various servlets.
   servlet.jar=/java/servlet.jar
  -
  -
  -# We need log4j-x.jar to run these examples
  -log4j.jar=../../../log4j-1.3alpha.jar
  
  
  
  1.1                  
logging-log4j/examples/tiny-webapp/Hello/WebRoot/index.html
  
  Index: index.html
  ===================================================================
  
  <HTML>
  <BODY>
  
  <FORM METHOD="POST" ACTION="/hello/HelloServlet">
  Your name: <INPUT TYPE="text" NAME="name" SIZE="10">
  <INPUT TYPE="submit">
  </FORM>
  
  </BODY>
  </HTML>
  
  
  1.1                  
logging-log4j/examples/tiny-webapp/Hello/WebRoot/WEB-INF/classes/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  wombat
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]