pfc-prolog-cvs Mailing List for pfc-prolix (Page 14)
Status: Beta
Brought to you by:
ivanfrade
You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(77) |
Jun
(37) |
Jul
(152) |
Aug
(180) |
Sep
(45) |
Oct
|
Nov
|
Dec
|
---|
From: <iva...@us...> - 2003-07-13 16:12:43
|
Update of /cvsroot/pfc-prolog/prolix/web In directory sc8-pr-cvs1:/tmp/cvs-serv16171/web Modified Files: consult.jsp program.jsp Log Message: Added automatic struts-config.xml generation Index: consult.jsp =================================================================== RCS file: /cvsroot/pfc-prolog/prolix/web/consult.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** consult.jsp 9 Jul 2003 17:50:36 -0000 1.3 --- consult.jsp 13 Jul 2003 16:12:40 -0000 1.4 *************** *** 5,20 **** %> - <%@ page errorPage="errorInProgram.jsp" %> - <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/xml" prefix="x" %> <%@ taglib uri="ejbtags" prefix="ejb" %> <ejb:useBean id="interpreter" type="org.asturlinux.frade.prolix.ejb.interfaces.ProlixMain"/> - <%! - String writedProgram = ""; - String currentConsult = ""; - %> <html> --- 5,15 ---- %> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/xml" prefix="x" %> <%@ taglib uri="ejbtags" prefix="ejb" %> + <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> <ejb:useBean id="interpreter" type="org.asturlinux.frade.prolix.ejb.interfaces.ProlixMain"/> <html> *************** *** 24,32 **** <body bgcolor="#768FDD"> - <% - writedProgram = (String)request.getParameter("programa"); - session.setAttribute("program",writedProgram); - interpreter.loadProgram(writedProgram); - %> <h1>Prolix </h1> --- 19,22 ---- *************** *** 39,53 **** <hr align="left" size="1"> ! <form method="GET" enctype="text/plain" action="solutions.jsp"> ! consulta: <br> <font size="+3">?</font> ! <input type="text" name="consulta" size="0" maxlength="100" ! value="Aqui la consulta "> <br><br> ! <input type="submit" name="consult" value="Consultar"> ! <input type="submit" name="consult" value="Cargar otro programa"> </form> </td> <td valign="top"> <form method="GET" enctype="text/plain"> Ultimas consultas:<br> --- 29,44 ---- <hr align="left" size="1"> ! <html:form enctype="text/plain" action="/actions/loadConsult"> ! consulta: <br> <font size="+3">?</font> ! <html:text name="consulta" size="0" maxlength="100" ! value="Aqui la consulta "/> <br><br> ! <html:submit value="consult"> ! <html:submit value="otherProgram"> </form> </td> <td valign="top"> + <!-- At moment dont used <form method="GET" enctype="text/plain"> Ultimas consultas:<br> *************** *** 56,59 **** --- 47,51 ---- <input TYPE="radio" NAME="old-consult" VALUE="ditu3">hermano(M,N).<br> </form> + --> </td> Index: program.jsp =================================================================== RCS file: /cvsroot/pfc-prolog/prolix/web/program.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** program.jsp 13 Jul 2003 13:17:34 -0000 1.2 --- program.jsp 13 Jul 2003 16:12:40 -0000 1.3 *************** *** 34,37 **** --- 34,38 ---- </html:textarea> <br> <html:submit value="load"/> + <html:reset value="clean"/> </html:form> </body> |
From: <iva...@us...> - 2003-07-13 16:12:43
|
Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions In directory sc8-pr-cvs1:/tmp/cvs-serv16171/src/org/asturlinux/frade/prolix/web/actions Modified Files: LoadProgramAction.java Log Message: Added automatic struts-config.xml generation Index: LoadProgramAction.java =================================================================== RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions/LoadProgramAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LoadProgramAction.java 11 Jul 2003 20:38:42 -0000 1.3 --- LoadProgramAction.java 13 Jul 2003 16:12:40 -0000 1.4 *************** *** 9,17 **** import org.apache.struts.util.*; import org.asturlinux.frade.prolix.web.formbeans.*; /** ! * Action to load program * */ - public class LoadProgramAction extends Action { --- 9,26 ---- import org.apache.struts.util.*; import org.asturlinux.frade.prolix.web.formbeans.*; + //import org.asturlinux.frade.prolix.ejb.interfaces.*; + //import org.asturlinux.frade.prolix.interpreter.exceptions.*; + /** ! * @struts.action name="loadProgramForm" ! * path="/actions/loadProgram" ! * scope="request" ! * input="/program.jsp" ! * validate="false" ! * parameter="" * + * @struts.action-forward name="success" + * path="/consult.jsp" */ public class LoadProgramAction extends Action { *************** *** 29,33 **** // Take form bean atrributes ! //String program = ((LoadProgramFormBean)form).getProgram(); return (mapping.findForward("success")); --- 38,42 ---- // Take form bean atrributes ! String program = ((LoadProgramFormBean)form).getProgram(); return (mapping.findForward("success")); |
From: <iva...@us...> - 2003-07-13 16:12:43
|
Update of /cvsroot/pfc-prolog/prolix In directory sc8-pr-cvs1:/tmp/cvs-serv16171 Modified Files: build.xml Log Message: Added automatic struts-config.xml generation Index: build.xml =================================================================== RCS file: /cvsroot/pfc-prolog/prolix/build.xml,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** build.xml 13 Jul 2003 13:17:34 -0000 1.29 --- build.xml 13 Jul 2003 16:12:40 -0000 1.30 *************** *** 14,19 **** <property name="interpreter" value="prolix-dummy-interpreter.jar"/> <property name="war.file" value="prolixjsp.war"/> ! <property name="struts.jar.file" value="my-struts.jar"/> ! <property name="src.release.file" value="prolix-src-snapshot-${version}.jar"/> <target name="check-jboss" unless="jboss.home"> --- 14,19 ---- <property name="interpreter" value="prolix-dummy-interpreter.jar"/> <property name="war.file" value="prolixjsp.war"/> ! <property name="web.client.jar.file" value="web-client-classes.jar"/> ! <property name="src.release.file" value="prolix-src-snapshot.jar"/> <target name="check-jboss" unless="jboss.home"> *************** *** 75,78 **** --- 75,81 ---- <property name="jboss.lib" value="${jboss.home}/lib" /> + <property name="jboss.tomcat.lib" + value="${jboss.home}/tomcat-4.1.x/common/lib"/> + <property name="jboss.all.lib" value="${jboss.home}/server/all/lib"/> <property name="jboss.client" value="${jboss.home}/client" /> <!-- Configuration used on JBoss 3 to run your server. There must be *************** *** 154,157 **** --- 157,162 ---- <pathelement location="${build.classes.dir}" /> <pathelement location="lib/${interpreter}"/> + <pathelement location="${jboss.tomcat.lib}/servlet.jar"/> + <pathelement location="${jboss.all.lib}/xalan.jar"/> </path> *************** *** 217,220 **** --- 222,226 ---- <copy todir="${src.resources.dir}/xdoclet" file="${etc.dir}/servlets.xml"/> <copy todir="${src.resources.dir}/xdoclet" file="${etc.dir}/servlet-mappings.xml"/> + <webdoclet sourcepath="${src.ejb.dir}" *************** *** 226,229 **** --- 232,238 ---- > <fileset dir="${src.ejb.dir}"> + <include name="**/*Action.java"/> + </fileset> + <fileset dir="${src.ejb.dir}"> <include name="**/*Bean.java"/> </fileset> *************** *** 308,311 **** --- 317,321 ---- </deploymentdescriptor> <jbosswebxml/> + <strutsconfigxml/> </webdoclet> </target> *************** *** 377,385 **** </fileset> </jar> - - <!-- Client web war --> - - <!-- Temporaly until webdoclet generate it --> - <copy file="${etc.dir}/struts-config.xml" todir="${build.generate.web-conf}/WEB-INF" /> <mkdir dir="${build.dir}/WEB-INF"/> --- 387,390 ---- |
From: <iva...@us...> - 2003-07-13 13:17:37
|
Update of /cvsroot/pfc-prolog/prolix/web In directory sc8-pr-cvs1:/tmp/cvs-serv23218/web Modified Files: program.jsp Log Message: First page with struts works. Index: program.jsp =================================================================== RCS file: /cvsroot/pfc-prolog/prolix/web/program.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** program.jsp 11 Jul 2003 20:40:02 -0000 1.1 --- program.jsp 13 Jul 2003 13:17:34 -0000 1.2 *************** *** 1,12 **** <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <%@ page import="java.util.*,java.rmi.*,javax.naming.*,javax.rmi.*, ! java.io.*,javax.ejb.*,org.asturlinux.frade.prolix.ejb.interfaces.*, ! org.asturlinux.frade.prolix.interpreter.exceptions.*" ! %> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/xml" prefix="x" %> <%@ taglib uri="ejbtags" prefix="ejb" %> ! <%@ taglib uri="/WEB-INF/struts-html.tld" %> <!-- Obtain Home reference--> --- 1,12 ---- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <%@ page import="java.util.*,java.rmi.*,javax.naming.*,javax.rmi.*, ! java.io.*,javax.ejb.*, org.asturlinux.frade.prolix.ejb.interfaces.*, ! org.asturlinux.frade.prolix.interpreter.exceptions.*" %> ! <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/xml" prefix="x" %> <%@ taglib uri="ejbtags" prefix="ejb" %> ! <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%> <!-- Obtain Home reference--> *************** *** 30,38 **** <h1>Prolix </h1> <hr align="left" size="1"> ! <html:form method="POST" enctype="text/plain" action="actions/loadProgram"> ! <html:textarea property="programa" rows="20" cols="60"> ! </textarea> <br> ! <input name="loadGood" value="Load" type="submit"> ! <input name="clear" value="Clean" type="reset"> </html:form> </body> --- 30,37 ---- <h1>Prolix </h1> <hr align="left" size="1"> ! <html:form method="POST" enctype="text/plain" action="/actions/loadProgram"> ! <html:textarea property="program" rows="20" cols="60"> ! </html:textarea> <br> ! <html:submit value="load"/> </html:form> </body> |
From: <iva...@us...> - 2003-07-13 13:17:37
|
Update of /cvsroot/pfc-prolog/prolix In directory sc8-pr-cvs1:/tmp/cvs-serv23218 Modified Files: build.xml Log Message: First page with struts works. Index: build.xml =================================================================== RCS file: /cvsroot/pfc-prolog/prolix/build.xml,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** build.xml 12 Jul 2003 14:04:43 -0000 1.28 --- build.xml 13 Jul 2003 13:17:34 -0000 1.29 *************** *** 11,18 **** <property file=".ant.properties" /> <property name="Name" value="Prolix"/> ! <property name="version" value="1.1"/> <property name="interpreter" value="prolix-dummy-interpreter.jar"/> <property name="war.file" value="prolixjsp.war"/> <property name="struts.jar.file" value="my-struts.jar"/> <target name="check-jboss" unless="jboss.home"> --- 11,19 ---- <property file=".ant.properties" /> <property name="Name" value="Prolix"/> ! <property name="version" value="0.1"/> <property name="interpreter" value="prolix-dummy-interpreter.jar"/> <property name="war.file" value="prolixjsp.war"/> <property name="struts.jar.file" value="my-struts.jar"/> + <property name="src.release.file" value="prolix-src-snapshot-${version}.jar"/> <target name="check-jboss" unless="jboss.home"> *************** *** 90,93 **** --- 91,95 ---- <property name="lib.dir" value="${basedir}/lib"/> <property name="lib.web.client.dir" value="${lib.dir}/web-client"/> + <property name="struts.lib.dir" value="${lib.web.client.dir}/WEB-INF/lib"/> <property name="build.dir" value="${basedir}/build"/> *************** *** 99,105 **** <property name="dist.dir" value="${basedir}/dist"/> <property name="src.web.dir" value="${basedir}/web"/> - <property name="struts.lib.dir" value="${lib.dir}/struts"/> <property name="etc.dir" value="${basedir}/etc"/> <!-- Removed properties <property name="src.client.dir" value="${src.main.dir}/client"/> --- 101,107 ---- <property name="dist.dir" value="${basedir}/dist"/> <property name="src.web.dir" value="${basedir}/web"/> <property name="etc.dir" value="${basedir}/etc"/> + <property name="src.resources.dir" value="${build.generate.dir}/merge"/> <!-- Removed properties <property name="src.client.dir" value="${src.main.dir}/client"/> *************** *** 109,113 **** <property name="build.bin.dir" value="${build.dir}/bin"/> <property name="src.servlet.dir" value="${src.main.dir}/servlet"/> - <property name="src.resources.dir" value="${src.dir}/resources"/> <property name="build.javadocs.dir" value="${build.dir}/docs/api"/> <property name="build.war.dir" value="${build.dir}/war"/> --- 111,114 ---- *************** *** 213,216 **** --- 214,220 ---- </taskdef> + <!-- Servlets file to merge dir --> + <copy todir="${src.resources.dir}/xdoclet" file="${etc.dir}/servlets.xml"/> + <copy todir="${src.resources.dir}/xdoclet" file="${etc.dir}/servlet-mappings.xml"/> <webdoclet sourcepath="${src.ejb.dir}" *************** *** 297,300 **** --- 301,309 ---- </taglib> + <taglib + uri="/WEB-INF/struts-template.tld" + location="/WEB-INF/struts-template.tld"> + </taglib> + </deploymentdescriptor> <jbosswebxml/> *************** *** 375,379 **** <mkdir dir="${build.dir}/WEB-INF"/> ! <mkdir dir="${build.dir}/WEB-INF/lib"/> <jar jarfile="${build.dir}/WEB-INF/lib/${struts.jar.file}"> <fileset --- 384,389 ---- <mkdir dir="${build.dir}/WEB-INF"/> ! <mkdir dir="${build.dir}/WEB-INF/classes"/> ! <!-- I'll try to do without a jar <jar jarfile="${build.dir}/WEB-INF/lib/${struts.jar.file}"> <fileset *************** *** 383,391 **** </fileset> </jar> ! <jar jarfile="${dist.dir}/${war.file}"> <fileset dir="${src.web.dir}" ! includes="**/**" > </fileset> --- 393,414 ---- </fileset> </jar> ! --> ! <copy todir="${build.dir}/WEB-INF/classes"> ! <fileset ! dir="${build.classes.dir}" ! includes="${package.path}/web/**/*.class, ! ${package.path}/ejb/interfaces/**/*.class, ! ${package.path}/interpreter/exceptions/**/*.class" ! > ! </fileset> ! </copy> ! ! <copy file="${etc.dir}/Resources.properties" ! todir="${build.dir}/WEB-INF/classes"/> ! <jar jarfile="${dist.dir}/${war.file}"> <fileset dir="${src.web.dir}" ! includes="**/*.jsp,**/*.tld,**/*.xslt" > </fileset> *************** *** 396,406 **** </fileset> <fileset ! dir="${etc.dir}" ! includes="Resources.properties" > </fileset> <fileset dir="${build.dir}" ! includes="WEB-INF/lib/${struts.jar.file}" > </fileset> --- 419,432 ---- </fileset> <fileset ! dir="${build.dir}" ! includes="WEB-INF/classes/Resources.properties" > </fileset> + <!-- Changed: must copy a .jar --> <fileset dir="${build.dir}" ! includes="WEB-INF/classes/${package.path}/web/**/*.class, ! WEB-INF/classes/${package.path}/ejb/interfaces/**/*.class, ! WEB-INF/classes/${package.path}/interpreter/exceptions/*.class" > </fileset> *************** *** 433,436 **** --- 459,485 ---- </target> + <!-- =================================================================== --> + <!-- To release an snapshot of sourcecode --> + <!-- =================================================================== --> + + <target name="snapshot" depends="clean"> + <jar jarfile="../${src.release.file}"> + <fileset + dir="${basedir}" + includes="**/**" + excludes="**/CVS/**,**/lib/**" + > + </fileset> + </jar> + + <property name="machine" value="iva...@pf..."/> + <property name="location" + value="/home/groups/p/pf/pfc-prolog/htdocs"/> + + <exec executable="scp"> + <arg line="../${src.release.file} ${machine}:${location}"/> + </exec> + + </target> <!-- =================================================================== --> |
From: <iva...@us...> - 2003-07-12 14:04:46
|
Update of /cvsroot/pfc-prolog/prolix In directory sc8-pr-cvs1:/tmp/cvs-serv9458 Modified Files: build.xml Log Message: webdoclet now generates struts taglibs. Comented server-side deploy to test client-side Index: build.xml =================================================================== RCS file: /cvsroot/pfc-prolog/prolix/build.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** build.xml 11 Jul 2003 20:38:42 -0000 1.27 --- build.xml 12 Jul 2003 14:04:43 -0000 1.28 *************** *** 234,237 **** --- 234,238 ---- </contextparam> + <!-- XSLT tags --> <taglib uri="http://java.sun.com/jstl/fmt" *************** *** 274,281 **** --- 275,299 ---- </taglib> + <!-- ejb management tags --> <taglib uri="ejbtags" location="/WEB-INF/lib/ejbtags.jar"> </taglib> + + <!-- struts tags --> + <taglib + uri="/WEB-INF/struts-bean.tld" + location="/WEB-INF/struts-bean.tld"> + </taglib> + + <taglib + uri="/WEB-INF/struts-html.tld" + location="/WEB-INF/struts-html.tld"> + </taglib> + + <taglib + uri="/WEB-INF/struts-logic.tld" + location="/WEB-INF/struts-logic.tld"> + </taglib> </deploymentdescriptor> *************** *** 424,428 **** to JBOSS_HOME/server/default/lib ? --> <target name="deploy-server" depends="jar"> ! <copy file="${dist.dir}/prolix-beans.jar" todir="${jboss.deploy}"/> <copy file="${dist.dir}/${war.file}" todir="${jboss.deploy}" /> </target> --- 442,448 ---- to JBOSS_HOME/server/default/lib ? --> <target name="deploy-server" depends="jar"> ! <!-- FIXME VI commented while test struts ! <copy file="${dist.dir}/prolix-beans.jar" todir="${jboss.deploy}"/> ! --> <copy file="${dist.dir}/${war.file}" todir="${jboss.deploy}" /> </target> |
From: <iva...@us...> - 2003-07-11 20:40:05
|
Update of /cvsroot/pfc-prolog/prolix/web In directory sc8-pr-cvs1:/tmp/cvs-serv16132/web Added Files: program.jsp Log Message: Added new main page to test new tags and struts --- NEW FILE: program.jsp --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <%@ page import="java.util.*,java.rmi.*,javax.naming.*,javax.rmi.*, java.io.*,javax.ejb.*,org.asturlinux.frade.prolix.ejb.interfaces.*, org.asturlinux.frade.prolix.interpreter.exceptions.*" %> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/xml" prefix="x" %> <%@ taglib uri="ejbtags" prefix="ejb" %> <%@ taglib uri="/WEB-INF/struts-html.tld" %> <!-- Obtain Home reference--> <ejb:useHome id="prolixHome" type="org.asturlinux.frade.prolix.ejb.interfaces.ProlixMainHome" location="org/asturlinux/frade/prolix/ejb/sessionjb/ProlixMain" /> <!-- Obtain Bean reference. If don't exist, create new one --> <ejb:useBean id="interpreter" type="org.asturlinux.frade.prolix.ejb.interfaces.ProlixMain" scope="session"> <ejb:createBean instance="<%= prolixHome.create() %>" /> </ejb:useBean> <html> <head> <title>Prolix main</title> </head> <body bgcolor="#768FDD"> <h1>Prolix </h1> <hr align="left" size="1"> <html:form method="POST" enctype="text/plain" action="actions/loadProgram"> <html:textarea property="programa" rows="20" cols="60"> </textarea> <br> <input name="loadGood" value="Load" type="submit"> <input name="clear" value="Clean" type="reset"> </html:form> </body> </html> |
From: <iva...@us...> - 2003-07-11 20:38:46
|
Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/formbeans In directory sc8-pr-cvs1:/tmp/cvs-serv15941/src/org/asturlinux/frade/prolix/web/formbeans Modified Files: LoadProgramFormBean.java Log Message: Corrected some erroneous packages. Now constructs correct war-client file. Index: LoadProgramFormBean.java =================================================================== RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/formbeans/LoadProgramFormBean.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LoadProgramFormBean.java 11 Jul 2003 12:28:45 -0000 1.2 --- LoadProgramFormBean.java 11 Jul 2003 20:38:42 -0000 1.3 *************** *** 1,3 **** ! package org.asturlinux.frade.prolix.web.forms; import javax.servlet.http.HttpServletRequest; --- 1,3 ---- ! package org.asturlinux.frade.prolix.web.formbeans; import javax.servlet.http.HttpServletRequest; |
From: <iva...@us...> - 2003-07-11 20:38:46
|
Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions In directory sc8-pr-cvs1:/tmp/cvs-serv15941/src/org/asturlinux/frade/prolix/web/actions Modified Files: LoadProgramAction.java Log Message: Corrected some erroneous packages. Now constructs correct war-client file. Index: LoadProgramAction.java =================================================================== RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions/LoadProgramAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LoadProgramAction.java 11 Jul 2003 12:28:45 -0000 1.2 --- LoadProgramAction.java 11 Jul 2003 20:38:42 -0000 1.3 *************** *** 8,12 **** import org.apache.struts.action.*; import org.apache.struts.util.*; ! import org.asturlinux.frade.prolix.web.forms.*; /** * Action to load program --- 8,12 ---- import org.apache.struts.action.*; import org.apache.struts.util.*; ! import org.asturlinux.frade.prolix.web.formbeans.*; /** * Action to load program |
From: <iva...@us...> - 2003-07-11 20:38:46
|
Update of /cvsroot/pfc-prolog/prolix In directory sc8-pr-cvs1:/tmp/cvs-serv15941 Modified Files: build.xml Log Message: Corrected some erroneous packages. Now constructs correct war-client file. Index: build.xml =================================================================== RCS file: /cvsroot/pfc-prolog/prolix/build.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** build.xml 11 Jul 2003 19:44:47 -0000 1.26 --- build.xml 11 Jul 2003 20:38:42 -0000 1.27 *************** *** 387,390 **** --- 387,395 ---- > </fileset> + <fileset + dir="${lib.web.client.dir}" + includes="WEB-INF/lib/*.jar" + > + </fileset> </jar> </target> |
From: <iva...@us...> - 2003-07-11 19:44:51
|
Update of /cvsroot/pfc-prolog/prolix In directory sc8-pr-cvs1:/tmp/cvs-serv9365 Modified Files: build.xml Log Message: Added construction of web-client including struts required files (untested in jboss) Index: build.xml =================================================================== RCS file: /cvsroot/pfc-prolog/prolix/build.xml,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** build.xml 11 Jul 2003 11:30:07 -0000 1.25 --- build.xml 11 Jul 2003 19:44:47 -0000 1.26 *************** *** 14,17 **** --- 14,18 ---- <property name="interpreter" value="prolix-dummy-interpreter.jar"/> <property name="war.file" value="prolixjsp.war"/> + <property name="struts.jar.file" value="my-struts.jar"/> <target name="check-jboss" unless="jboss.home"> *************** *** 99,102 **** --- 100,104 ---- <property name="src.web.dir" value="${basedir}/web"/> <property name="struts.lib.dir" value="${lib.dir}/struts"/> + <property name="etc.dir" value="${basedir}/etc"/> <!-- Removed properties *************** *** 350,353 **** --- 352,369 ---- <!-- Client web war --> + + <!-- Temporaly until webdoclet generate it --> + <copy file="${etc.dir}/struts-config.xml" todir="${build.generate.web-conf}/WEB-INF" /> + + <mkdir dir="${build.dir}/WEB-INF"/> + <mkdir dir="${build.dir}/WEB-INF/lib"/> + <jar jarfile="${build.dir}/WEB-INF/lib/${struts.jar.file}"> + <fileset + dir="${build.classes.dir}/${package.path}" + includes="web/**/*.class" + > + </fileset> + </jar> + <jar jarfile="${dist.dir}/${war.file}"> <fileset *************** *** 361,369 **** > </fileset> ! <fileset ! dir="${lib.web.client.dir}" ! includes="WEB-INF/lib/**" ! > ! </fileset> </jar> </target> --- 377,390 ---- > </fileset> ! <fileset ! dir="${etc.dir}" ! includes="Resources.properties" ! > ! </fileset> ! <fileset ! dir="${build.dir}" ! includes="WEB-INF/lib/${struts.jar.file}" ! > ! </fileset> </jar> </target> *************** *** 439,443 **** <filter token="dist.dir" value="${dist.dir}"/> <copy todir="${dist.dir}" filtering="yes"> ! <fileset dir="${basedir}/etc" includes="run-*-client.sh"> </fileset> </copy> --- 460,464 ---- <filter token="dist.dir" value="${dist.dir}"/> <copy todir="${dist.dir}" filtering="yes"> ! <fileset dir="${etc.dir}" includes="run-*-client.sh"> </fileset> </copy> |
From: <iva...@us...> - 2003-07-11 12:28:50
|
Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions In directory sc8-pr-cvs1:/tmp/cvs-serv6033/src/org/asturlinux/frade/prolix/web/actions Modified Files: LoadProgramAction.java Log Message: Corrected some var names and minos details Index: LoadProgramAction.java =================================================================== RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions/LoadProgramAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LoadProgramAction.java 11 Jul 2003 11:30:07 -0000 1.1 --- LoadProgramAction.java 11 Jul 2003 12:28:45 -0000 1.2 *************** *** 5,11 **** import javax.servlet.*; import javax.servlet.http.*; - import java.sql.*; import java.security.*; - import javax.sql.*; import org.apache.struts.action.*; import org.apache.struts.util.*; --- 5,9 ---- |
From: <iva...@us...> - 2003-07-11 12:28:50
|
Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/formbeans In directory sc8-pr-cvs1:/tmp/cvs-serv6033/src/org/asturlinux/frade/prolix/web/formbeans Modified Files: LoadProgramFormBean.java Log Message: Corrected some var names and minos details Index: LoadProgramFormBean.java =================================================================== RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/formbeans/LoadProgramFormBean.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LoadProgramFormBean.java 11 Jul 2003 11:30:07 -0000 1.1 --- LoadProgramFormBean.java 11 Jul 2003 12:28:45 -0000 1.2 *************** *** 14,18 **** * @return the _program value. */ ! public String get_program() { return _program; } --- 14,18 ---- * @return the _program value. */ ! public String getProgram() { return _program; } *************** *** 20,27 **** /** * Set the _program value. ! * @param new_program The new _program value. */ ! public void set_program(String new_program) { ! this._program = new_program; } --- 20,27 ---- /** * Set the _program value. ! * @param newProgram The new _program value. */ ! public void setProgram(String newProgram) { ! this._program = newProgram; } |
From: <iva...@us...> - 2003-07-11 11:30:11
|
Update of /cvsroot/pfc-prolog/prolix In directory sc8-pr-cvs1:/tmp/cvs-serv30601 Modified Files: build.xml Log Message: Added basic struts structure Index: build.xml =================================================================== RCS file: /cvsroot/pfc-prolog/prolix/build.xml,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** build.xml 11 Jul 2003 09:03:06 -0000 1.24 --- build.xml 11 Jul 2003 11:30:07 -0000 1.25 *************** *** 88,91 **** --- 88,92 ---- <property name="lib.dir" value="${basedir}/lib"/> + <property name="lib.web.client.dir" value="${lib.dir}/web-client"/> <property name="build.dir" value="${basedir}/build"/> *************** *** 97,100 **** --- 98,102 ---- <property name="dist.dir" value="${basedir}/dist"/> <property name="src.web.dir" value="${basedir}/web"/> + <property name="struts.lib.dir" value="${lib.dir}/struts"/> <!-- Removed properties *************** *** 122,127 **** </path> ! <path id="base.path"> <path refid="xdoclet.path"/> <pathelement location="${jboss.client}/jboss-j2ee.jar" /> <pathelement location="${jboss.client}/jnp-client.jar" /> --- 124,143 ---- </path> ! <path id="struts.path"> ! <pathelement location="${struts.lib.dir}/commons-beanutils.jar"/> ! <pathelement location="${struts.lib.dir}/commons-lang.jar"/> ! <pathelement location="${struts.lib.dir}/struts.jar"/> ! <pathelement location="${struts.lib.dir}/commons-collections.jar"/> ! <pathelement location="${struts.lib.dir}/commons-logging.jar"/> ! <pathelement location="${struts.lib.dir}/struts-legacy.jar"/> ! <pathelement location="${struts.lib.dir}/commons-digester.jar"/> ! <pathelement location="${struts.lib.dir}/commons-validator.jar"/> ! <pathelement location="${struts.lib.dir}/commons-fileupload.jar"/> ! <pathelement location="${struts.lib.dir}/jakarta-oro.jar"/> ! </path> ! ! <path id="base.path"> <path refid="xdoclet.path"/> + <path refid="struts.path"/> <pathelement location="${jboss.client}/jboss-j2ee.jar" /> <pathelement location="${jboss.client}/jnp-client.jar" /> *************** *** 276,280 **** destdir="${build.classes.dir}" debug="on" ! deprecation="off" optimize="on" classpathref="base.path" --- 292,296 ---- destdir="${build.classes.dir}" debug="on" ! deprecation="on" optimize="on" classpathref="base.path" *************** *** 346,350 **** </fileset> <fileset ! dir="${lib.dir}" includes="WEB-INF/lib/**" > --- 362,366 ---- </fileset> <fileset ! dir="${lib.web.client.dir}" includes="WEB-INF/lib/**" > |
From: <iva...@us...> - 2003-07-11 11:30:10
|
Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions In directory sc8-pr-cvs1:/tmp/cvs-serv30601/src/org/asturlinux/frade/prolix/web/actions Added Files: LoadProgramAction.java Log Message: Added basic struts structure --- NEW FILE: LoadProgramAction.java --- package org.asturlinux.frade.prolix.web.actions; import java.io.*; import java.util.*; import javax.servlet.*; import javax.servlet.http.*; import java.sql.*; import java.security.*; import javax.sql.*; import org.apache.struts.action.*; import org.apache.struts.util.*; import org.asturlinux.frade.prolix.web.forms.*; /** * Action to load program * */ public class LoadProgramAction extends Action { public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { // Auxiliar var //Locale locale = getLocale(request); //MessageResources messages = getResources(); ActionErrors errors = new ActionErrors(); // Take form bean atrributes //String program = ((LoadProgramFormBean)form).getProgram(); return (mapping.findForward("success")); } } |
From: <iva...@us...> - 2003-07-11 11:30:10
|
Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/formbeans In directory sc8-pr-cvs1:/tmp/cvs-serv30601/src/org/asturlinux/frade/prolix/web/formbeans Added Files: LoadProgramFormBean.java Log Message: Added basic struts structure --- NEW FILE: LoadProgramFormBean.java --- package org.asturlinux.frade.prolix.web.forms; import javax.servlet.http.HttpServletRequest; import org.apache.struts.action.*; public class LoadProgramFormBean extends ActionForm { private String _program = null; /** * Get the _program value. * @return the _program value. */ public String get_program() { return _program; } /** * Set the _program value. * @param new_program The new _program value. */ public void set_program(String new_program) { this._program = new_program; } /** * Redefined methods */ public void reset(ActionMapping mapping, HttpServletRequest request) { _program = null; } public ActionErrors validate (ActionMapping mapping, HttpServletRequest request) { ActionErrors errors = new ActionErrors(); if ((_program == null) || (_program.length() < 1)) errors.add("program", new ActionError("error.void.program")); return errors; } } |
From: <iva...@us...> - 2003-07-11 11:28:54
|
Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions In directory sc8-pr-cvs1:/tmp/cvs-serv30394/src/org/asturlinux/frade/prolix/web/actions Log Message: Directory /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions added to the repository |
From: <iva...@us...> - 2003-07-11 11:28:54
|
Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web In directory sc8-pr-cvs1:/tmp/cvs-serv30394/src/org/asturlinux/frade/prolix/web Log Message: Directory /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web added to the repository |
From: <iva...@us...> - 2003-07-11 11:28:54
|
Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/formbeans In directory sc8-pr-cvs1:/tmp/cvs-serv30394/src/org/asturlinux/frade/prolix/web/formbeans Log Message: Directory /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/formbeans added to the repository |
From: <iva...@us...> - 2003-07-11 09:03:59
|
Update of /cvsroot/pfc-prolog/prolix In directory sc8-pr-cvs1:/tmp/cvs-serv14376 Modified Files: build.xml Log Message: Moved all .jar files to one and only lib dir. Updated build.xml Index: build.xml =================================================================== RCS file: /cvsroot/pfc-prolog/prolix/build.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** build.xml 10 Jul 2003 18:27:19 -0000 1.23 --- build.xml 11 Jul 2003 09:03:06 -0000 1.24 *************** *** 345,348 **** --- 345,353 ---- > </fileset> + <fileset + dir="${lib.dir}" + includes="WEB-INF/lib/**" + > + </fileset> </jar> </target> *************** *** 442,448 **** <delete> <fileset dir="." includes="**/*~" defaultexcludes="no" /> - </delete> - <delete> - <fileset dir="web-conf" includes="**/*.xml" /> </delete> <delete --- 447,450 ---- |
From: <iva...@us...> - 2003-07-10 21:40:05
|
Update of /cvsroot/pfc-prolog/prolix In directory sc8-pr-cvs1:/tmp/cvs-serv23364 Modified Files: build.xml Log Message: Remove unused properties Index: build.xml =================================================================== RCS file: /cvsroot/pfc-prolog/prolix/build.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** build.xml 10 Jul 2003 18:23:38 -0000 1.22 --- build.xml 10 Jul 2003 18:27:19 -0000 1.23 *************** *** 86,90 **** value="${src.dir}/${package.path}"/> <property name="src.ejb.dir" value="${src.dir}"/> - <property name="src.ejb.conf.dir" value="${src.dir}/ejb-conf"/> <property name="lib.dir" value="${basedir}/lib"/> --- 86,89 ---- *************** *** 423,428 **** </copy> - <!-- <copy file="${src.ejb.conf.dir}/jndi.properties" todir="${build.bin.dir}"/> - --> </target> --- 422,425 ---- |
From: <iva...@us...> - 2003-07-10 20:35:14
|
Update of /cvsroot/pfc-prolog/prolix In directory sc8-pr-cvs1:/tmp/cvs-serv23014 Modified Files: build.xml Log Message: Reestructured build dir Index: build.xml =================================================================== RCS file: /cvsroot/pfc-prolog/prolix/build.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** build.xml 9 Jul 2003 17:50:36 -0000 1.21 --- build.xml 10 Jul 2003 18:23:38 -0000 1.22 *************** *** 92,100 **** <property name="build.dir" value="${basedir}/build"/> <property name="build.generate.dir" value="${build.dir}/generate"/> ! <property name="build.classes.dir" value="${build.dir}/beans"/> <property name="dist.dir" value="${basedir}/dist"/> - <property name="client.conf" value="${build.generate.dir}/web/WEB-INF"/> - <property name="client.generated" value="${build.generate.dir}/web"/> <property name="src.web.dir" value="${basedir}/web"/> --- 92,100 ---- <property name="build.dir" value="${basedir}/build"/> <property name="build.generate.dir" value="${build.dir}/generate"/> ! <property name="build.classes.dir" value="${build.dir}/classes"/> ! <property name="build.generate.ejb-conf" value="${build.generate.dir}/ejb-conf"/> ! <property name="build.generate.web-conf" value="${build.generate.dir}/web-conf"/> <property name="dist.dir" value="${basedir}/dist"/> <property name="src.web.dir" value="${basedir}/web"/> *************** *** 177,181 **** <!-- Beans Deployment descriptor --> ! <deploymentdescriptor destdir="${build.classes.dir}/META-INF"/> <!-- AS 4/29/02 Do not validate XML files because JBoss 3.0 message driven will report an wrong error because it uses the wrong jboss.dtd --> --- 177,181 ---- <!-- Beans Deployment descriptor --> ! <deploymentdescriptor destdir="${build.generate.ejb-conf}/META-INF"/> <!-- AS 4/29/02 Do not validate XML files because JBoss 3.0 message driven will report an wrong error because it uses the wrong jboss.dtd --> *************** *** 184,188 **** typemapping="${type.mapping}" datasource="${datasource.name}" ! destdir="${build.classes.dir}/META-INF" validateXml="false" /> --- 184,188 ---- typemapping="${type.mapping}" datasource="${datasource.name}" ! destdir="${build.generate.ejb-conf}/META-INF" validateXml="false" /> *************** *** 198,202 **** <webdoclet sourcepath="${src.ejb.dir}" ! destdir="${client.conf}" classpathref="base.path" excludedtags="@version,@author" --- 198,202 ---- <webdoclet sourcepath="${src.ejb.dir}" ! destdir="${build.generate.web-conf}/WEB-INF" classpathref="base.path" excludedtags="@version,@author" *************** *** 303,307 **** </fileset> <fileset ! dir="${build.classes.dir}" includes="META-INF/**" > --- 303,307 ---- </fileset> <fileset ! dir="${build.generate.ejb-conf}" includes="META-INF/**" > *************** *** 342,347 **** </fileset> <fileset ! dir="${client.generated}" ! includes="**/*.xml" > </fileset> --- 342,347 ---- </fileset> <fileset ! dir="${build.generate.web-conf}" ! includes="WEB-INF/*.xml" > </fileset> |
Update of /cvsroot/pfc-prolog/prolix/web/WEB-INF In directory sc8-pr-cvs1:/tmp/cvs-serv20121 Added Files: struts-bean.tld struts-form.tld struts-html.tld struts-logic.tld struts-template.tld struts.tld Log Message: Added Struts TLD files --- NEW FILE: struts-bean.tld --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd"> <taglib> <tlibversion>1.0</tlibversion> <jspversion>1.1</jspversion> <shortname>bean</shortname> <uri>http://jakarta.apache.org/struts/tags-bean-1.0.2</uri> <tag> <name>cookie</name> <tagclass>org.apache.struts.taglib.bean.CookieTag</tagclass> <teiclass>org.apache.struts.taglib.bean.CookieTei</teiclass> <bodycontent>empty</bodycontent> <attribute> <name>id</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>multiple</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>value</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>define</name> <tagclass>org.apache.struts.taglib.bean.DefineTag</tagclass> <teiclass>org.apache.struts.taglib.bean.DefineTei</teiclass> <bodycontent>empty</bodycontent> <attribute> <name>id</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>property</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>scope</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>toScope</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>type</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>value</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>header</name> <tagclass>org.apache.struts.taglib.bean.HeaderTag</tagclass> <teiclass>org.apache.struts.taglib.bean.HeaderTei</teiclass> <bodycontent>empty</bodycontent> <attribute> <name>id</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>multiple</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>value</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>include</name> <tagclass>org.apache.struts.taglib.bean.IncludeTag</tagclass> <teiclass>org.apache.struts.taglib.bean.IncludeTei</teiclass> <bodycontent>empty</bodycontent> <attribute> <name>anchor</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>forward</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>href</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>id</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>page</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>transaction</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>message</name> <tagclass>org.apache.struts.taglib.bean.MessageTag</tagclass> <bodycontent>empty</bodycontent> <attribute> <name>arg0</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>arg1</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>arg2</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>arg3</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>arg4</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>bundle</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>key</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>locale</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>page</name> <tagclass>org.apache.struts.taglib.bean.PageTag</tagclass> <teiclass>org.apache.struts.taglib.bean.PageTei</teiclass> <bodycontent>empty</bodycontent> <attribute> <name>id</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>property</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>parameter</name> <tagclass>org.apache.struts.taglib.bean.ParameterTag</tagclass> <teiclass>org.apache.struts.taglib.bean.ParameterTei</teiclass> <bodycontent>empty</bodycontent> <attribute> <name>id</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>multiple</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>value</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>resource</name> <tagclass>org.apache.struts.taglib.bean.ResourceTag</tagclass> <teiclass>org.apache.struts.taglib.bean.ResourceTei</teiclass> <bodycontent>empty</bodycontent> <attribute> <name>id</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>input</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>size</name> <tagclass>org.apache.struts.taglib.bean.SizeTag</tagclass> <teiclass>org.apache.struts.taglib.bean.SizeTei</teiclass> <bodycontent>empty</bodycontent> <attribute> <name>collection</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>id</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>property</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>scope</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>struts</name> <tagclass>org.apache.struts.taglib.bean.StrutsTag</tagclass> <teiclass>org.apache.struts.taglib.bean.StrutsTei</teiclass> <bodycontent>empty</bodycontent> <attribute> <name>id</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>formBean</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>forward</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>mapping</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>write</name> <tagclass>org.apache.struts.taglib.bean.WriteTag</tagclass> <bodycontent>empty</bodycontent> <attribute> <name>filter</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>ignore</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>property</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>scope</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> </taglib> --- NEW FILE: struts-form.tld --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd"> <taglib> <tlibversion>1.0</tlibversion> <jspversion>1.1</jspversion> <shortname>form</shortname> <tag> <name>base</name> <tagclass>org.apache.struts.taglib.html.BaseTag</tagclass> <bodycontent>empty</bodycontent> </tag> <tag> [...1666 lines suppressed...] <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>style</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>styleClass</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>tabindex</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> </taglib> --- NEW FILE: struts-html.tld --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd"> <taglib> <tlibversion>1.0</tlibversion> <jspversion>1.1</jspversion> <shortname>html</shortname> <uri>http://jakarta.apache.org/struts/tags-html-1.0.2</uri> <tag> <name>base</name> <tagclass>org.apache.struts.taglib.html.BaseTag</tagclass> <bodycontent>empty</bodycontent> <attribute> [...2142 lines suppressed...] <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>styleId</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>tabindex</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>value</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> </taglib> --- NEW FILE: struts-logic.tld --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd"> <taglib> <tlibversion>1.0</tlibversion> <jspversion>1.1</jspversion> <shortname>logic</shortname> <uri>http://jakarta.apache.org/struts/tags-logic-1.0.2</uri> <tag> <name>equal</name> <tagclass>org.apache.struts.taglib.logic.EqualTag</tagclass> <bodycontent>JSP</bodycontent> <attribute> <name>cookie</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>header</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>parameter</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>property</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>scope</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>value</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>forward</name> <tagclass>org.apache.struts.taglib.logic.ForwardTag</tagclass> <bodycontent>empty</bodycontent> <attribute> <name>name</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>greaterEqual</name> <tagclass>org.apache.struts.taglib.logic.GreaterEqualTag</tagclass> <bodycontent>JSP</bodycontent> <attribute> <name>cookie</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>header</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>parameter</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>property</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>scope</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>value</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>greaterThan</name> <tagclass>org.apache.struts.taglib.logic.GreaterThanTag</tagclass> <bodycontent>JSP</bodycontent> <attribute> <name>cookie</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>header</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>parameter</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>property</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>scope</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>value</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>iterate</name> <tagclass>org.apache.struts.taglib.logic.IterateTag</tagclass> <teiclass>org.apache.struts.taglib.logic.IterateTei</teiclass> <bodycontent>JSP</bodycontent> <attribute> <name>collection</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>id</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>indexId</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>length</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>offset</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>property</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>scope</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>type</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>lessEqual</name> <tagclass>org.apache.struts.taglib.logic.LessEqualTag</tagclass> <bodycontent>JSP</bodycontent> <attribute> <name>cookie</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>header</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>parameter</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>property</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>scope</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>value</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>lessThan</name> <tagclass>org.apache.struts.taglib.logic.LessThanTag</tagclass> <bodycontent>JSP</bodycontent> <attribute> <name>cookie</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>header</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>parameter</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>property</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>scope</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>value</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>match</name> <tagclass>org.apache.struts.taglib.logic.MatchTag</tagclass> <bodycontent>JSP</bodycontent> <attribute> <name>cookie</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>header</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>location</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>parameter</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>property</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>scope</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>value</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>notEqual</name> <tagclass>org.apache.struts.taglib.logic.NotEqualTag</tagclass> <bodycontent>JSP</bodycontent> <attribute> <name>cookie</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>header</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>parameter</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>property</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>scope</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>value</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>notMatch</name> <tagclass>org.apache.struts.taglib.logic.NotMatchTag</tagclass> <bodycontent>JSP</bodycontent> <attribute> <name>cookie</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>header</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>location</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>parameter</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>property</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>scope</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>value</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>notPresent</name> <tagclass>org.apache.struts.taglib.logic.NotPresentTag</tagclass> <bodycontent>JSP</bodycontent> <attribute> <name>cookie</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>header</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>parameter</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>property</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>role</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>scope</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>user</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>present</name> <tagclass>org.apache.struts.taglib.logic.PresentTag</tagclass> <bodycontent>JSP</bodycontent> <attribute> <name>cookie</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>header</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>parameter</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>property</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>role</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>scope</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>user</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>redirect</name> <tagclass>org.apache.struts.taglib.logic.RedirectTag</tagclass> <attribute> <name>anchor</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>forward</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>href</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>page</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>paramId</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>paramName</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>paramProperty</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>paramScope</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>property</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>scope</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>transaction</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> </taglib> --- NEW FILE: struts-template.tld --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd"> <taglib> <tlibversion>1.0</tlibversion> <jspversion>1.1</jspversion> <shortname>template</shortname> <uri>http://jakarta.apache.org/struts/tags-template-1.0.2</uri> <tag> <name>insert</name> <tagclass>org.apache.struts.taglib.template.InsertTag</tagclass> <bodycontent>JSP</bodycontent> <attribute> <name>template</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>put</name> <tagclass>org.apache.struts.taglib.template.PutTag</tagclass> <bodycontent>JSP</bodycontent> <attribute> <name>name</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>role</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>content</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>direct</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> <tag> <name>get</name> <tagclass>org.apache.struts.taglib.template.GetTag</tagclass> <bodycontent>empty</bodycontent> <attribute> <name>flush</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>name</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>role</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> </taglib> --- NEW FILE: struts.tld --- <?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd"> <taglib> <!-- ============== Tag Library Description Elements ============= --> <tlibversion>1.0</tlibversion> <jspversion>1.1</jspversion> <shortname>STRUTS Framework Tag Library</shortname> <uri>http://jakarta.apache.org/taglibs/struts-1.0</uri> <info> This tag library contains useful general-purpose tags supporting the development of JSP/servlet applications based on the "Model 2" (MVC based) design pattern. WARNING: ALL OF THE TAGS IN THIS LIBRARY ARE DEPRECATED, AND [...1947 lines suppressed...] </attribute> <attribute> <name>arg2</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>arg3</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> <name>arg4</name> <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> </tag> </taglib> |
From: <iva...@us...> - 2003-07-09 18:35:41
|
Update of /cvsroot/pfc-prolog/prolix/web In directory sc8-pr-cvs1:/tmp/cvs-serv5829/web Added Files: errorInConsult.jsp Log Message: Added error page in jsp --- NEW FILE: errorInConsult.jsp --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <jsp:forward page="consult.jsp"> <jsp:param name="error" value=" <%= exception.getMessage()%> "/> </jsp:forward> |
From: <iva...@us...> - 2003-07-09 18:30:35
|
Update of /cvsroot/pfc-prolog/prolix/web In directory sc8-pr-cvs1:/tmp/cvs-serv4936/web Modified Files: solutions.jsp Log Message: Updated web pages. Return to simple version without error control Index: solutions.jsp =================================================================== RCS file: /cvsroot/pfc-prolog/prolix/web/solutions.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** solutions.jsp 9 Jul 2003 17:50:36 -0000 1.3 --- solutions.jsp 9 Jul 2003 18:30:32 -0000 1.4 *************** *** 3,7 **** java.io.*,javax.ejb.*,org.asturlinux.frade.prolix.ejb.interfaces.*, org.asturlinux.frade.prolix.interpreter.exceptions.*" %> ! <%@ page error="errorInConsult.jsp" %> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> --- 3,7 ---- java.io.*,javax.ejb.*,org.asturlinux.frade.prolix.ejb.interfaces.*, org.asturlinux.frade.prolix.interpreter.exceptions.*" %> ! <%@ page errorPage="errorInConsult.jsp" %> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> *************** *** 13,23 **** <% ! String action = (String) request.getParameter("action"); ! ! if (action.equals("consult")) ! { ! String userConsult = (String)request.getParameter("consulta"); ! interpreter.loadConsult(userConsult); ! } %> --- 13,19 ---- <% ! String consultToLoad = (String)request.getParameter("consulta"); ! session.setAttribute("consultToLoad",consultToLoad); ! interpreter.loadConsult(consultToLoad); %> *************** *** 30,34 **** <hr align="left" size="10"> ! <%= currentProgram %> <hr align="left" size="10"> --- 26,30 ---- <hr align="left" size="10"> ! <%= interpreter.getProgram() %> <hr align="left" size="10"> |