pfc-prolog-cvs — mail list with cvs-commit messages

[Pfc-prolog-cvs] prolix build.xml,1.41,1.42

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix
In directory sc8-pr-cvs1:/tmp/cvs-serv13367

Modified Files:
	build.xml 
Log Message:
Fixed bug when generated war

Index: build.xml
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/build.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** build.xml	18 Jul 2003 12:42:07 -0000	1.41
--- build.xml	20 Jul 2003 15:18:27 -0000	1.42
***************
*** 464,468 ****
               includes="${package.path}/web/**/*.class,
                         ${package.path}/ejb/interfaces/**/*.class,
!                        ${package.path}/interpreter/exception/*.class,
                         ${package.path}/web/WebClientResources.properties"
               >
--- 464,468 ----
               includes="${package.path}/web/**/*.class,
                         ${package.path}/ejb/interfaces/**/*.class,
!                        ${package.path}/interpreter/exceptions/*.class,
                         ${package.path}/web/WebClientResources.properties"
               >

[Pfc-prolog-cvs] prolix/web/xsl solution.xslt,1.1,1.2

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/web/xsl
In directory sc8-pr-cvs1:/tmp/cvs-serv14826/web/xsl

Modified Files:
	solution.xslt 
Log Message:
Refactored concatenation with StringWriters and visitor

Index: solution.xslt
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/web/xsl/solution.xslt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** solution.xslt	8 Jul 2003 22:27:42 -0000	1.1
--- solution.xslt	19 Jul 2003 19:37:51 -0000	1.2
***************
*** 2,20 ****
  	version="1.0">
  
! <xslt:template match="result">
! <xslt:choose>
! 	<xslt:when test="@number">
! 		<h2> Solucion <xslt:value-of select="@number"/> </h2>
! 		<xslt:if test="substitution" >
! 			<UL>
! 			<xslt:apply-templates select="substitution"/>
! 	     		</UL>	
! 		</xslt:if>
! 	</xslt:when>
! 	<xslt:otherwise>
! 		<h2> Solucion </h2>
! 		No
! 	</xslt:otherwise>
! </xslt:choose>
  </xslt:template>
  
--- 2,19 ----
  	version="1.0">
  
! <xslt:template match="tree">
! 	<xslt:apply-templates select="solution" />
! 	<xslt:if test="@completelyExplored=yes">
! 		<h2>No hay mas soluciones</h2>
! 	</xslt:if>
! </xslt:template>
! 
! <xslt:template match="solution">
! 	<h2> Solucion <xslt:value-of select="@number"/> </h2>
! 	<xslt:if test="substitution" >
! 		<UL>
! 		<xslt:apply-templates select="substitution"/>
! 	     	</UL>	
! 	</xslt:if>
  </xslt:template>
  

[Pfc-prolog-cvs] prolix/src/org/asturlinux/frade/prolix/ejb/sessionjb ProlixMainBean.java,1.20,1.21 SimpleXmlVisitor.java,1.3,1.4

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/ejb/sessionjb
In directory sc8-pr-cvs1:/tmp/cvs-serv14826/src/org/asturlinux/frade/prolix/ejb/sessionjb

Modified Files:
	ProlixMainBean.java SimpleXmlVisitor.java 
Log Message:
Refactored concatenation with StringWriters and visitor

Index: ProlixMainBean.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/ejb/sessionjb/ProlixMainBean.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ProlixMainBean.java	17 Jul 2003 17:17:24 -0000	1.20
--- ProlixMainBean.java	19 Jul 2003 19:37:51 -0000	1.21
***************
*** 27,30 ****
--- 27,32 ----
  import javax.ejb.*;
  import java.util.*;
+ import java.io.StringWriter;
+ import java.io.Writer;
  import org.asturlinux.frade.dummy.*;
  import org.asturlinux.frade.prolix.interpreter.exceptions.*;
***************
*** 64,69 ****
      private PrologContextDummy prologCtx;
  
-     private String xmlResult = "";
-     private int solutionCounter = 1;
      private boolean lastSolution = false;
      /**
--- 66,69 ----
***************
*** 140,146 ****
  	throws ProgramNotLoadedException, QueryNotLoadedException
      {
- 	xmlResult = "";
- 	solutionCounter = 1;
- 
  	TreeElement treeResult = prologCtx.step();
  
--- 140,143 ----
***************
*** 150,155 ****
  	    setLastSolution(treeResult.isCompletlyExplored());
  
! 	treeElementToXmlTransformation(treeResult);
! 	return xmlResult;
      }
  
--- 147,152 ----
  	    setLastSolution(treeResult.isCompletlyExplored());
  
! 	// FIXME: cache results
! 	return transformToXml(treeResult);
      }
  
***************
*** 196,213 ****
  
  
!     private void treeElementToXmlTransformation(TreeElement tree)
      {
! 	String xmlOpen = "<results>";
! 	xmlResult = xmlResult.concat(xmlOpen);
  
! 	recursiveInOrder(tree);
  
! 	if (tree.isCompletlyExplored())
! 	    xmlResult = xmlResult.concat("<result solution=\"no\"/>");
! 	String xmlClose = "</results>";
! 	xmlResult = xmlResult.concat(xmlClose);
      }
      
!     private void recursiveInOrder(TreeElement tree)
      {
  	/**
--- 193,228 ----
  
  
!     private String transformToXml(TreeElement tree)
      {
! 	Writer writer = new StringWriter();
! 	    
! 	try {
  
! 	    // FIXME: generate appropiate xml headers (<?xml> and doctype)
  
! 	    // generate opening tag
! 	    if ( tree.isCompletlyExplored() )
! 		writer.write("<tree completelyExplored=\"yes\">\n");
! 	    else
! 		writer.write("<tree>\n");
! 
! 	    SimpleXmlVisitor visitor =
! 		new SimpleXmlVisitor(writer);
! 
! 	    // process recursively the tree
! 	    recursiveInOrder(tree,visitor);
! 
! 	    // generate end tag
! 	    writer.write("</tree>\n");
! 
! 	}
! 	catch(java.io.IOException ex) {
! 	    ex.printStackTrace();
! 	}
! 
! 	return writer.toString();
      }
      
!     private void recursiveInOrder(TreeElement tree, SimpleXmlVisitor visitor)
      {
  	/**
***************
*** 218,242 ****
  	    return;
  
! 	try
! 	    {
! 		TreeElement[] sons = tree.getNextLevelElements();
! 		for (int i = 0; i < sons.length; i++)
! 		    recursiveInOrder(sons[i]);
! 	    }
! 	catch (NullPointerException np)
! 	    {
! 	    }
  	/**
  	 * node "treatment" using visitor pattern.
  	 * visitor write node's xml.
  	 */
! 	System.out.println("Exploring node: " + tree.getQuery());
! 	if (tree.isSolution())
! 	    {
! 		SimpleXmlVisitor visitor = new SimpleXmlVisitor(solutionCounter);
! 		tree.accept(visitor);
! 		solutionCounter++;
! 		xmlResult = xmlResult.concat(visitor.getResult());
! 	    }	
      }
  
--- 233,246 ----
  	    return;
  
! 	TreeElement[] sons = tree.getNextLevelElements();
! 	for (int i = 0; i < sons.length; i++)
! 	    recursiveInOrder(sons[i],visitor);
! 	    
  	/**
  	 * node "treatment" using visitor pattern.
  	 * visitor write node's xml.
  	 */
! 	System.out.println("DEBUG: Exploring node: " + tree.getQuery());
! 	tree.accept(visitor);
      }
  

Index: SimpleXmlVisitor.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/ejb/sessionjb/SimpleXmlVisitor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SimpleXmlVisitor.java	2 Jul 2003 19:33:06 -0000	1.3
--- SimpleXmlVisitor.java	19 Jul 2003 19:37:51 -0000	1.4
***************
*** 24,70 ****
  
  import org.asturlinux.frade.prolix.interpreter.interfaces.*;
  
  public class SimpleXmlVisitor extends TreeElementVisitor
  {
-     private String _result;
-     private int _counter;
  
!     public SimpleXmlVisitor(int counter)
      {
! 	_result = "";
! 	_counter = counter;
      }
  
      public void visitTreeElement(TreeElement te)
      {
  	/**
  	 * Code to execute over the TreeElement te
  	 */
  
! 	String opening = "<result solution=\"yes\" number=\"" + _counter + "\">";
! 	_result = _result.concat(opening);
! 	
! 	Substitution[] substArray = te.getSubstitutions();
! 
! 	if (substArray != null)
  	    {
! 		System.out.println("Node have substitutions");
  		for (int i = 0; i < substArray.length;i++)
  		    {
! 			_result = _result.concat("<substitution " 
! 				       + "variable=\"" 
! 				       + substArray[i].getOriginalValue() 
! 				       + "\" " + "value=\"" 
! 				       + substArray[i].getNewValue() 
! 				       + "\"" + "/>");
  		    }
  	    }
! 	String closing = "</result>";
! 	_result = _result.concat(closing);
! 	
!     }
!     public String getResult()
!     {
! 	return _result;
      }
  }
--- 24,73 ----
  
  import org.asturlinux.frade.prolix.interpreter.interfaces.*;
+ import java.io.Writer;
  
  public class SimpleXmlVisitor extends TreeElementVisitor
  {
  
!     private int _solutionCounter = 0;
!     private Writer _writer;
! 
!     public SimpleXmlVisitor(Writer writer)
      {
! 	_writer = writer;
      }
  
      public void visitTreeElement(TreeElement te)
      {
+ 	try {
  	/**
  	 * Code to execute over the TreeElement te
  	 */
  
! 	if ( te.isSolution() )
  	    {
! 		
! 		_solutionCounter++;
! 		_writer.write("<solution number=\"" +
! 			      _solutionCounter + "\">\n");
! 		
! 		Substitution[] substArray = te.getSubstitutions();
! 		
  		for (int i = 0; i < substArray.length;i++)
  		    {
! 			_writer.write("<substitution " 
! 				      + "variable=\"" 
! 				      + substArray[i].getOriginalValue() 
! 				      + "\" " + "value=\"" 
! 				      + substArray[i].getNewValue() 
! 				      + "\"" + "/>\n");
  		    }
+ 		
+ 		_writer.write("</solution>\n");
  	    }
! 	}
! 	catch ( java.io.IOException ex ) {
! 	    ex.printStackTrace();
! 	}
      }
+ 
  }

[Pfc-prolog-cvs] prolix/src/org/asturlinux/frade/dummy TreeElementDummy.java,1.1,1.2

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/dummy
In directory sc8-pr-cvs1:/tmp/cvs-serv14826/src/org/asturlinux/frade/dummy

Modified Files:
	TreeElementDummy.java 
Log Message:
Refactored concatenation with StringWriters and visitor

Index: TreeElementDummy.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/dummy/TreeElementDummy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TreeElementDummy.java	13 Jul 2003 20:46:25 -0000	1.1
--- TreeElementDummy.java	19 Jul 2003 19:37:51 -0000	1.2
***************
*** 34,38 ****
      private boolean iAmSolution = false;
      private TreeElementDummy _parent;
!     private TreeElementDummy[] _sons;
      private Substitution[] _substitutions = null;
  
--- 34,38 ----
      private boolean iAmSolution = false;
      private TreeElementDummy _parent;
!     private TreeElementDummy[] _sons = new TreeElementDummy[0];
      private Substitution[] _substitutions = null;
  

[Pfc-prolog-cvs] prolix/etc SolutionsXml.dtd,1.1,1.2

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/etc
In directory sc8-pr-cvs1:/tmp/cvs-serv14826/etc

Modified Files:
	SolutionsXml.dtd 
Log Message:
Refactored concatenation with StringWriters and visitor

Index: SolutionsXml.dtd
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/etc/SolutionsXml.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SolutionsXml.dtd	19 Jul 2003 15:35:22 -0000	1.1
--- SolutionsXml.dtd	19 Jul 2003 19:37:50 -0000	1.2
***************
*** 1,11 ****
  <?xml version="1.0" encoding="ISO-8859-1" ?>
  
! <!ELEMENT results (result)*>
! 
! <!ELEMENT result (substitution*)>
  <!ELEMENT substitution EMPTY>
  
! <!ATTLIST result solution (yes|no) "yes">
! <!ATTLIST result number CDATA #IMPLIED>
  <!ATTLIST substitution variable CDATA #REQUIRED>
  <!ATTLIST substitution value CDATA #REQUIRED>
--- 1,11 ----
  <?xml version="1.0" encoding="ISO-8859-1" ?>
+ %
+ <!ELEMENT tree (solution)*>
  
! <!ELEMENT solution (substitution*)>
  <!ELEMENT substitution EMPTY>
  
! <!ATTLIST tree completlyExplored (yes|no) "yes">
! <!ATTLIST solution number CDATA #IMPLIED>
  <!ATTLIST substitution variable CDATA #REQUIRED>
  <!ATTLIST substitution value CDATA #REQUIRED>

[Pfc-prolog-cvs] prolix/etc SolutionsXml.dtd,NONE,1.1

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/etc
In directory sc8-pr-cvs1:/tmp/cvs-serv14219

Added Files:
	SolutionsXml.dtd 
Log Message:
Added dtd to solutions-xml

--- NEW FILE: SolutionsXml.dtd ---
<?xml version="1.0" encoding="ISO-8859-1" ?>

<!ELEMENT results (result)*>

<!ELEMENT result (substitution*)>
<!ELEMENT substitution EMPTY>

<!ATTLIST result solution (yes|no) "yes">
<!ATTLIST result number CDATA #IMPLIED>
<!ATTLIST substitution variable CDATA #REQUIRED>
<!ATTLIST substitution value CDATA #REQUIRED>

[Pfc-prolog-cvs] prolix/src/org/asturlinux/frade/prolix/web/actions LoadConsultAction.java,1.9,1.10

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions
In directory sc8-pr-cvs1:/tmp/cvs-serv10437/src/org/asturlinux/frade/prolix/web/actions

Modified Files:
	LoadConsultAction.java 
Log Message:
Added reload last consult functionality

Index: LoadConsultAction.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions/LoadConsultAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** LoadConsultAction.java	18 Jul 2003 10:24:23 -0000	1.9
--- LoadConsultAction.java	18 Jul 2003 16:32:11 -0000	1.10
***************
*** 54,118 ****
  {
  
!     public ActionForward execute(ActionMapping mapping,
! 				 ActionForm form,
! 				 HttpServletRequest request,
! 				 HttpServletResponse response)
! 	throws IOException, ServletException
!     {
! 	// Auxiliar var
! 	Locale locale = getLocale(request);
! 	MessageResources messages = getResources(request);
! 	ActionErrors errors = new ActionErrors();
  
! 	// Take form bean atrributes
! 	String consult = ((LoadConsultFormBean)form).getConsult();
  	
! 	try
! 	    {
! 		HttpSession session = request.getSession();
! 		ProlixMain interpreter = (ProlixMain)session.getAttribute("interpreter");
! 		interpreter.loadConsult(consult);
  
! 		// Save in session current loaded consult
! 		CurrentStateBean state = (CurrentStateBean)session.getAttribute("prologData");
! 		if (state != null)
! 		    state.setCurrentConsult(consult);
  
! 		// To remember last consults:
! 		LastConsultsBean lastConsults = (LastConsultsBean)session.getAttribute("oldConsults");
! 		if (lastConsults != null)
! 		    {
! 			Vector lastest = lastConsults.getLastConsults();
  
! 			//First time can be null
! 			if (lastest == null)
! 			    lastest = new Vector();
  
! 			if (lastest.add(consult))
! 			    lastConsults.setLastConsults(lastest);
! 			else
! 			    errors.add("consult",new ActionError("error.saving.consult.bean"));
! 		    }
! 	    }
! 	catch (SyntaxException se)
! 	    {
! 		errors.add("consult",new ActionError("error.syntax.exception"));
! 	    }
! 	catch (LexicalException le)
! 	    {
! 		errors.add("consult",new ActionError("error.lexical.exception"));
! 	    }
! 	catch (ProgramNotLoadedException pnle)
! 	    {
! 		errors.add("consult",new ActionError("error.program.not.loaded"));
! 	    }
  	
! 	if (!errors.isEmpty())
! 	    {
! 		saveErrors(request,errors);
! 		return (mapping.findForward("success"));
! 	    }
! 
  	return (mapping.findForward("success"));
!     }
  }
--- 54,123 ----
  {
  
!   public ActionForward execute(ActionMapping mapping,
! 			       ActionForm form,
! 			       HttpServletRequest request,
! 			       HttpServletResponse response)
!     throws IOException, ServletException
!   {
!     // Auxiliar var
!     Locale locale = getLocale(request);
!     MessageResources messages = getResources(request);
!     ActionErrors errors = new ActionErrors();
  
!     // Take form bean atrributes
!     String consult = ((LoadConsultFormBean)form).getConsult();
  	
!     try
!       {
! 	HttpSession session = request.getSession();
! 	ProlixMain interpreter = (ProlixMain)session.getAttribute("interpreter");
! 	interpreter.loadConsult(consult);
  
! 	// Save in session current loaded consult
! 	CurrentStateBean state = (CurrentStateBean)session.getAttribute("prologData");
! 	if (state != null)
! 	  state.setCurrentConsult(consult);
  
! 	// To remember last consults:
! 	LastConsultsBean lastConsults = (LastConsultsBean)session.getAttribute("oldConsults");
! 	if (lastConsults != null)
! 	  {
! 	    Vector lastest = lastConsults.getLastConsults();
  
! 	    //First time can be null
! 	    if (lastest == null)
! 	      lastest = new Vector();
! 			
! 	    if (!lastest.contains(consult)) 
! 	      {
  
! 	      if (lastest.add(consult))
! 		lastConsults.setLastConsults(lastest);
! 	      else
! 		errors.add("consult",new ActionError("error.saving.consult.bean"));
! 	      
! 	      }
! 	  }
!       }
!     catch (SyntaxException se)
!       {
! 	errors.add("consult",new ActionError("error.syntax.exception"));
!       }
!     catch (LexicalException le)
!       {
! 	errors.add("consult",new ActionError("error.lexical.exception"));
!       }
!     catch (ProgramNotLoadedException pnle)
!       {
! 	errors.add("consult",new ActionError("error.program.not.loaded"));
!       }
  	
!     if (!errors.isEmpty())
!       {
! 	saveErrors(request,errors);
  	return (mapping.findForward("success"));
!       }
! 
!     return (mapping.findForward("success"));
!   }
  }

[Pfc-prolog-cvs] prolix/web consult.jsp,1.17,1.18

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/web
In directory sc8-pr-cvs1:/tmp/cvs-serv10437/web

Modified Files:
	consult.jsp 
Log Message:
Added reload last consult functionality

Index: consult.jsp
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/web/consult.jsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** consult.jsp	18 Jul 2003 10:24:23 -0000	1.17
--- consult.jsp	18 Jul 2003 16:32:11 -0000	1.18
***************
*** 73,78 ****
  	<hr align="left" size="1">
      
!      <html:form action="/actions/loadConsult">
! 	      consulta: <br>
         <font size="+3">?</font> 
         <html:text property="consult" size="0" maxlength="100" /> <br><br>
--- 73,78 ----
  	<hr align="left" size="1">
      
!         <html:form action="/actions/loadConsult">
! 	             consulta: <br>
         <font size="+3">?</font> 
         <html:text property="consult" size="0" maxlength="100" /> <br><br>
***************
*** 84,100 ****
      <td valign="top">
      <logic:notEmpty name="oldConsults" property="lastConsults">
      <logic:iterate id="iterator" name="oldConsults" property="lastConsults">
  	  <tr>
! 	    <%= iterator %>
  	  </tr>
- <!-- At moment dont used
-      <form action="/actions/">
- 	Ultimas consultas:<br>
- 	<input TYPE="radio" NAME="old-consult" VALUE="ditu1" checked>hermano(carlos,X).<br>
- 	<input TYPE="radio" NAME="old-consult" VALUE="ditu2">padre(carlos,X).<br>
- 	<input TYPE="radio" NAME="old-consult" VALUE="ditu3">hermano(M,N).<br>
-      </form>
- -->
      </logic:iterate>
      </logic:notEmpty>	  
      </td>
--- 84,97 ----
      <td valign="top">
      <logic:notEmpty name="oldConsults" property="lastConsults">
+     <html:form action="/actions/loadConsult">
      <logic:iterate id="iterator" name="oldConsults" property="lastConsults">
  	  <tr>
!             <!-- That's horrible -->
! 	    <input type=radio name="consult" value="<%= iterator %>"> 
!                  <%= iterator %> <br>
  	  </tr>
      </logic:iterate>
+       <html:submit><bean:message key="button.load"/></html:submit>
+     </html:form>
      </logic:notEmpty>	  
      </td>

[Pfc-prolog-cvs] prolix build.xml,1.40,1.41

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix
In directory sc8-pr-cvs1:/tmp/cvs-serv5474

Modified Files:
	build.xml 
Log Message:
War file generated with war task

Index: build.xml
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/build.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** build.xml	17 Jul 2003 19:16:37 -0000	1.40
--- build.xml	18 Jul 2003 12:42:07 -0000	1.41
***************
*** 445,491 ****
      </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}/WebClientResources.properties" 
!          todir="${build.dir}/WEB-INF/classes/${package.path}/web"/>
  
-      <jar jarfile="${dist.dir}/${war.file}">
-           <fileset
-                    dir="${src.web.dir}"
-                    includes="**/*.jsp,**/*.tld,**/*.xslt"
-                    >
-           </fileset>
-           <fileset
-                    dir="${build.generate.web-conf}"
-                    includes="WEB-INF/*.xml"
-                    >
-           </fileset>
-           <fileset 
- 	           dir="${build.dir}"
- 	           includes="WEB-INF/classes/${package.path}/web/WebClientResources.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>
-           <fileset
- 	           dir="${lib.web.client.dir}"
- 	           includes="WEB-INF/lib/*.jar"
-                    >
-           </fileset>
-       </jar>
     </target>
     
--- 445,478 ----
      </jar>
  -->     
      <copy file="${etc.dir}/WebClientResources.properties" 
!          todir="${build.classes.dir}/${package.path}/web"/>
! 
! 
!      <!-- Doing the same with war-task -->
!      <war warfile="${dist.dir}/${war.file}"
!           webxml="${build.generate.web-conf}/WEB-INF/web.xml"
!           basedir="${src.web.dir}"
!           includes="**/*.jsp,**/*.tld,**/*.xslt"
!           >
!      <lib
!           dir="${lib.web.client.dir}/WEB-INF/lib"
!           includes="*.jar"
!           >
!      </lib>
!      <classes
!              dir="${build.classes.dir}"
!              includes="${package.path}/web/**/*.class,
!                        ${package.path}/ejb/interfaces/**/*.class,
!                        ${package.path}/interpreter/exception/*.class,
!                        ${package.path}/web/WebClientResources.properties"
!              >
!      </classes>
!      <webinf
!             dir="${build.generate.web-conf}/WEB-INF"
!             includes="*.xml"
!             >
!      </webinf>
!      </war>
  
     </target>
     

[Pfc-prolog-cvs] prolix/etc WebClientResources.properties,1.6,1.7

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/etc
In directory sc8-pr-cvs1:/tmp/cvs-serv16517/etc

Modified Files:
	WebClientResources.properties 
Log Message:
Now shows lastest consult in page

Index: WebClientResources.properties
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/etc/WebClientResources.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** WebClientResources.properties	17 Jul 2003 17:17:24 -0000	1.6
--- WebClientResources.properties	18 Jul 2003 10:24:23 -0000	1.7
***************
*** 6,13 ****
  error.program.not.loaded=<li>No ha cargado un programa previamente en el intérprete</li>
  error.query.not.loaded=<li>No ha cargado una consulta previamente en el intérprete</li>
  errors.footer=</ul>
  errors.header=<h3>Se han producido los siguientes errores</h3><ul>
- errors.prefix=Prefix
- errors.suffix=Suffix
  button.load=Cargar
  button.clear=Limpiar
--- 6,12 ----
  error.program.not.loaded=<li>No ha cargado un programa previamente en el intérprete</li>
  error.query.not.loaded=<li>No ha cargado una consulta previamente en el intérprete</li>
+ error.saving.consult.bean=<li>Error al salvar la consulta en el bean</li>
  errors.footer=</ul>
  errors.header=<h3>Se han producido los siguientes errores</h3><ul>
  button.load=Cargar
  button.clear=Limpiar

[Pfc-prolog-cvs] prolix/web consult.jsp,1.16,1.17

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/web
In directory sc8-pr-cvs1:/tmp/cvs-serv16517/web

Modified Files:
	consult.jsp 
Log Message:
Now shows lastest consult in page

Index: consult.jsp
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/web/consult.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** consult.jsp	17 Jul 2003 19:41:28 -0000	1.16
--- consult.jsp	18 Jul 2003 10:24:23 -0000	1.17
***************
*** 67,71 ****
  
  <table>
!     <td>
  	<hr align="left" size="1">
          <%= loadedProgram %> <br><br><br><br>
--- 67,72 ----
  
  <table>
!     <tr>
!      <td>
  	<hr align="left" size="1">
          <%= loadedProgram %> <br><br><br><br>
***************
*** 98,101 ****
--- 99,103 ----
      </logic:notEmpty>	  
      </td>
+     </tr>
  </table>
      

[Pfc-prolog-cvs] prolix/src/org/asturlinux/frade/prolix/web/actions LoadConsultAction.java,1.8,1.9

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions
In directory sc8-pr-cvs1:/tmp/cvs-serv16517/src/org/asturlinux/frade/prolix/web/actions

Modified Files:
	LoadConsultAction.java 
Log Message:
Now shows lastest consult in page

Index: LoadConsultAction.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions/LoadConsultAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** LoadConsultAction.java	17 Jul 2003 17:55:17 -0000	1.8
--- LoadConsultAction.java	18 Jul 2003 10:24:23 -0000	1.9
***************
*** 73,79 ****
  		ProlixMain interpreter = (ProlixMain)session.getAttribute("interpreter");
  		interpreter.loadConsult(consult);
! 		CurrentStateBean ib = (CurrentStateBean)session.getAttribute("prologData");
! 		if (ib != null)
! 		    ib.setCurrentConsult(consult);
  	    }
  	catch (SyntaxException se)
--- 73,97 ----
  		ProlixMain interpreter = (ProlixMain)session.getAttribute("interpreter");
  		interpreter.loadConsult(consult);
! 
! 		// Save in session current loaded consult
! 		CurrentStateBean state = (CurrentStateBean)session.getAttribute("prologData");
! 		if (state != null)
! 		    state.setCurrentConsult(consult);
! 
! 		// To remember last consults:
! 		LastConsultsBean lastConsults = (LastConsultsBean)session.getAttribute("oldConsults");
! 		if (lastConsults != null)
! 		    {
! 			Vector lastest = lastConsults.getLastConsults();
! 
! 			//First time can be null
! 			if (lastest == null)
! 			    lastest = new Vector();
! 
! 			if (lastest.add(consult))
! 			    lastConsults.setLastConsults(lastest);
! 			else
! 			    errors.add("consult",new ActionError("error.saving.consult.bean"));
! 		    }
  	    }
  	catch (SyntaxException se)

[Pfc-prolog-cvs] prolix/web consult.jsp,1.15,1.16 program.jsp,1.10,1.11

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/web
In directory sc8-pr-cvs1:/tmp/cvs-serv8777

Modified Files:
	consult.jsp program.jsp 
Log Message:
Removed enctype in forms that caused problems with some browsers

Index: consult.jsp
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/web/consult.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** consult.jsp	17 Jul 2003 19:16:38 -0000	1.15
--- consult.jsp	17 Jul 2003 19:41:28 -0000	1.16
***************
*** 72,76 ****
  	<hr align="left" size="1">
      
!      <html:form enctype="text/plain" action="/actions/loadConsult">
  	      consulta: <br>
         <font size="+3">?</font> 
--- 72,76 ----
  	<hr align="left" size="1">
      
!      <html:form action="/actions/loadConsult">
  	      consulta: <br>
         <font size="+3">?</font> 

Index: program.jsp
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/web/program.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** program.jsp	17 Jul 2003 19:16:38 -0000	1.10
--- program.jsp	17 Jul 2003 19:41:28 -0000	1.11
***************
*** 59,63 ****
    <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>
--- 59,63 ----
    <h1>Prolix </h1>
    <hr align="left" size="1">
!    <html:form action="/actions/loadProgram">
         <html:textarea property="program" rows="20" cols="60">
         </html:textarea> <br>

[Pfc-prolog-cvs] prolix/web consult.jsp,1.14,1.15 program.jsp,1.9,1.10 solutions.jsp,1.12,1.13

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/web
In directory sc8-pr-cvs1:/tmp/cvs-serv4021/web

Modified Files:
	consult.jsp program.jsp solutions.jsp 
Log Message:
Added target to obtain a snapshot with libraries to release - Added license in JSP files

Index: consult.jsp
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/web/consult.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** consult.jsp	17 Jul 2003 17:17:25 -0000	1.14
--- consult.jsp	17 Jul 2003 19:16:38 -0000	1.15
***************
*** 1,4 ****
- 
  <!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.*,
--- 1,28 ----
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ 
+ <!-- ===========================================================
+ /**
+  *
+  * Copyright 2003 Ivan Frade
+  * 
+  * This file is part of Prolix.
+  *
+  * Prolix is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * Prolix is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with Prolix; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+  *
+  **/
+     ============================================================= -->
+ 
  <%@ page import="java.util.*,java.rmi.*,javax.naming.*,javax.rmi.*,
    java.io.*,javax.ejb.*,org.asturlinux.frade.prolix.ejb.interfaces.*,

Index: program.jsp
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/web/program.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** program.jsp	15 Jul 2003 22:42:38 -0000	1.9
--- program.jsp	17 Jul 2003 19:16:38 -0000	1.10
***************
*** 1,3 ****
--- 1,28 ----
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ 
+ <!-- ===========================================================
+ /**
+  *
+  * Copyright 2003 Ivan Frade
+  * 
+  * This file is part of Prolix.
+  *
+  * Prolix is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * Prolix is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with Prolix; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+  *
+  **/
+     ============================================================= -->
+ 
  <%@ page import="java.util.*,java.rmi.*,javax.naming.*,javax.rmi.*,
    java.io.*,javax.ejb.*, org.asturlinux.frade.prolix.ejb.interfaces.*,

Index: solutions.jsp
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/web/solutions.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** solutions.jsp	17 Jul 2003 17:17:25 -0000	1.12
--- solutions.jsp	17 Jul 2003 19:16:38 -0000	1.13
***************
*** 1,3 ****
--- 1,29 ----
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ 
+ <!-- ===========================================================
+ /**
+  *
+  * Copyright 2003 Ivan Frade
+  * 
+  * This file is part of Prolix.
+  *
+  * Prolix is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * Prolix is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with Prolix; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+  *
+  **/
+     ============================================================= -->
+ 
+ 
  <%@ page import="java.util.*,java.rmi.*,javax.naming.*,javax.rmi.*,
    java.io.*,javax.ejb.*,org.asturlinux.frade.prolix.ejb.interfaces.*,

[Pfc-prolog-cvs] prolix build.xml,1.39,1.40

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix
In directory sc8-pr-cvs1:/tmp/cvs-serv4021

Modified Files:
	build.xml 
Log Message:
Added target to obtain a snapshot with libraries to release - Added license in JSP files

Index: build.xml
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/build.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** build.xml	17 Jul 2003 17:55:17 -0000	1.39
--- build.xml	17 Jul 2003 19:16:37 -0000	1.40
***************
*** 39,42 ****
--- 39,43 ----
    <property name="web.client.jar.file" value="web-client-classes.jar"/>
    <property name="src.release.file" value="prolix-src-snapshot.jar"/>
+   <property name="src.release.file.with.libs" value="prolix-src-snapshot-with-libs.jar"/>
    
    <target name="check-jboss" unless="jboss.home">
***************
*** 500,503 ****
--- 501,513 ----
  	       includes="**/**"
  	       excludes="**/CVS/**,**/lib/**"
+ 	       >
+       </fileset>
+     </jar>
+ 
+     <jar jarfile="../${src.release.file.with.libs}">
+       <fileset
+ 	       dir="${basedir}"
+ 	       includes="**/**"
+ 	       excludes="**/CVS/**"
  	       >
        </fileset>

[Pfc-prolog-cvs] prolix AUTHOR,NONE,1.1

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix
In directory sc8-pr-cvs1:/tmp/cvs-serv20256a

Added Files:
	AUTHOR 
Log Message:
Added AUTHOR file to project

--- NEW FILE: AUTHOR ---
Ivan Frade
fr...@as...

[Pfc-prolog-cvs] prolix/src/org/asturlinux/frade/prolix/web/beans CurrentStateBean.java,1.4,1.5 LastConsultsBean.java,1.1,1.2

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/beans
In directory sc8-pr-cvs1:/tmp/cvs-serv20111/src/org/asturlinux/frade/prolix/web/beans

Modified Files:
	CurrentStateBean.java LastConsultsBean.java 
Log Message:
Added license all source files - Removed unused jsp pages

Index: CurrentStateBean.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/beans/CurrentStateBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CurrentStateBean.java	17 Jul 2003 17:17:24 -0000	1.4
--- CurrentStateBean.java	17 Jul 2003 17:55:17 -0000	1.5
***************
*** 1,2 ****
--- 1,23 ----
+ /**
+  *
+  * Copyright 2003 Ivan Frade
+  * 
+  * This file is part of Prolix.
+  *
+  * Prolix is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * Prolix is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with Prolix; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+  *
+  **/
  package org.asturlinux.frade.prolix.web.beans;
  

Index: LastConsultsBean.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/beans/LastConsultsBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LastConsultsBean.java	16 Jul 2003 20:37:17 -0000	1.1
--- LastConsultsBean.java	17 Jul 2003 17:55:17 -0000	1.2
***************
*** 1,2 ****
--- 1,23 ----
+ /**
+  *
+  * Copyright 2003 Ivan Frade
+  * 
+  * This file is part of Prolix.
+  *
+  * Prolix is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * Prolix is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with Prolix; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+  *
+  **/
  package org.asturlinux.frade.prolix.web.beans;
  

[Pfc-prolog-cvs] prolix/web errorInConsult.jsp,1.1,NONE errorInProgram.jsp,1.3,NONE index.jsp,1.2,NONE

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/web
In directory sc8-pr-cvs1:/tmp/cvs-serv20111/web

Removed Files:
	errorInConsult.jsp errorInProgram.jsp index.jsp 
Log Message:
Added license all source files - Removed unused jsp pages

--- errorInConsult.jsp DELETED ---

--- errorInProgram.jsp DELETED ---

--- index.jsp DELETED ---

[Pfc-prolog-cvs] prolix/src/org/asturlinux/frade/prolix/web/actions LoadConsultAction.java,1.7,1.8 LoadProgramAction.java,1.10,1.11 SolutionAction.java,1.6,1.7

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions
In directory sc8-pr-cvs1:/tmp/cvs-serv20111/src/org/asturlinux/frade/prolix/web/actions

Modified Files:
	LoadConsultAction.java LoadProgramAction.java 
	SolutionAction.java 
Log Message:
Added license all source files - Removed unused jsp pages

Index: LoadConsultAction.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions/LoadConsultAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** LoadConsultAction.java	15 Jul 2003 22:42:37 -0000	1.7
--- LoadConsultAction.java	17 Jul 2003 17:55:17 -0000	1.8
***************
*** 1,2 ****
--- 1,23 ----
+ /**
+  *
+  * Copyright 2003 Ivan Frade
+  * 
+  * This file is part of Prolix.
+  *
+  * Prolix is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * Prolix is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with Prolix; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+  *
+  **/
  package org.asturlinux.frade.prolix.web.actions;
  

Index: LoadProgramAction.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions/LoadProgramAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** LoadProgramAction.java	15 Jul 2003 22:42:37 -0000	1.10
--- LoadProgramAction.java	17 Jul 2003 17:55:17 -0000	1.11
***************
*** 1,2 ****
--- 1,23 ----
+ /**
+  *
+  * Copyright 2003 Ivan Frade
+  * 
+  * This file is part of Prolix.
+  *
+  * Prolix is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * Prolix is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with Prolix; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+  *
+  **/
  package org.asturlinux.frade.prolix.web.actions;
  

Index: SolutionAction.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions/SolutionAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SolutionAction.java	17 Jul 2003 17:17:24 -0000	1.6
--- SolutionAction.java	17 Jul 2003 17:55:17 -0000	1.7
***************
*** 1,2 ****
--- 1,23 ----
+ /**
+  *
+  * Copyright 2003 Ivan Frade
+  * 
+  * This file is part of Prolix.
+  *
+  * Prolix is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * Prolix is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with Prolix; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+  *
+  **/
  package org.asturlinux.frade.prolix.web.actions;
  

[Pfc-prolog-cvs] prolix README,1.1.1.1,1.2 build.xml,1.38,1.39

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix
In directory sc8-pr-cvs1:/tmp/cvs-serv20111

Modified Files:
	README build.xml 
Log Message:
Added license all source files - Removed unused jsp pages

Index: README
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	30 Apr 2003 21:54:01 -0000	1.1.1.1
--- README	17 Jul 2003 17:55:17 -0000	1.2
***************
*** 1 ****
! This will be the CVS module to source code.
\ No newline at end of file
--- 1,6 ----
!  Prolix, hosted in sourceforge as pfc-prolix, and unix name
! pfc-prolog, is an
! web interface to Prolog interpreters writed in Java.
!                                                                                 
!  This is the version 0.1, is under heavy development, and going to be
! ready at September.
\ No newline at end of file

Index: build.xml
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/build.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** build.xml	15 Jul 2003 22:42:37 -0000	1.38
--- build.xml	17 Jul 2003 17:55:17 -0000	1.39
***************
*** 1,3 ****
--- 1,26 ----
  <?xml version="1.0"?>
+ <!-- ===========================================================
+ /**
+  *
+  * Copyright 2003 Ivan Frade
+  * 
+  * This file is part of Prolix.
+  *
+  * Prolix is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * Prolix is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with Prolix; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+  *
+  **/
+     ============================================================= -->
  
  <!-- =================================================================== -->

[Pfc-prolog-cvs] prolix/src/org/asturlinux/frade/prolix/web/formbeans LoadConsultFormBean.java,1.1,1.2 LoadProgramFormBean.java,1.4,1.5 SolutionsFormBean.java,1.2,1.3

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/formbeans
In directory sc8-pr-cvs1:/tmp/cvs-serv20111/src/org/asturlinux/frade/prolix/web/formbeans

Modified Files:
	LoadConsultFormBean.java LoadProgramFormBean.java 
	SolutionsFormBean.java 
Log Message:
Added license all source files - Removed unused jsp pages

Index: LoadConsultFormBean.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/formbeans/LoadConsultFormBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LoadConsultFormBean.java	13 Jul 2003 19:05:07 -0000	1.1
--- LoadConsultFormBean.java	17 Jul 2003 17:55:17 -0000	1.2
***************
*** 1,2 ****
--- 1,23 ----
+ /**
+  *
+  * Copyright 2003 Ivan Frade
+  * 
+  * This file is part of Prolix.
+  *
+  * Prolix is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * Prolix is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with Prolix; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+  *
+  **/
  package org.asturlinux.frade.prolix.web.formbeans;
  

Index: LoadProgramFormBean.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/formbeans/LoadProgramFormBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LoadProgramFormBean.java	13 Jul 2003 16:12:40 -0000	1.4
--- LoadProgramFormBean.java	17 Jul 2003 17:55:17 -0000	1.5
***************
*** 1,2 ****
--- 1,23 ----
+ /**
+  *
+  * Copyright 2003 Ivan Frade
+  * 
+  * This file is part of Prolix.
+  *
+  * Prolix is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * Prolix is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with Prolix; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+  *
+  **/
  package org.asturlinux.frade.prolix.web.formbeans;
  

Index: SolutionsFormBean.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/formbeans/SolutionsFormBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SolutionsFormBean.java	15 Jul 2003 22:42:37 -0000	1.2
--- SolutionsFormBean.java	17 Jul 2003 17:55:17 -0000	1.3
***************
*** 1,2 ****
--- 1,23 ----
+ /**
+  *
+  * Copyright 2003 Ivan Frade
+  * 
+  * This file is part of Prolix.
+  *
+  * Prolix is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * Prolix is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with Prolix; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+  *
+  **/
  package org.asturlinux.frade.prolix.web.formbeans;
  

[Pfc-prolog-cvs] prolix/src/org/asturlinux/frade/prolix/ejb/sessionjb ProlixMainBean.java,1.19,1.20

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/ejb/sessionjb
In directory sc8-pr-cvs1:/tmp/cvs-serv11378/src/org/asturlinux/frade/prolix/ejb/sessionjb

Modified Files:
	ProlixMainBean.java 
Log Message:
All links text from resources file - Disable next solution button when no more solutions

Index: ProlixMainBean.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/ejb/sessionjb/ProlixMainBean.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ProlixMainBean.java	15 Jul 2003 20:27:45 -0000	1.19
--- ProlixMainBean.java	17 Jul 2003 17:17:24 -0000	1.20
***************
*** 66,70 ****
      private String xmlResult = "";
      private int solutionCounter = 1;
! 
      /**
       * @ejb:interface-method
--- 66,70 ----
      private String xmlResult = "";
      private int solutionCounter = 1;
!     private boolean lastSolution = false;
      /**
       * @ejb:interface-method
***************
*** 142,148 ****
  	xmlResult = "";
  	solutionCounter = 1;
! 	TreeElement resolution = prologCtx.step();
! 	treeElementToXmlTransformation(resolution);
  	return xmlResult;
      }
  
--- 142,168 ----
  	xmlResult = "";
  	solutionCounter = 1;
! 
! 	TreeElement treeResult = prologCtx.step();
! 
! 	if (treeResult == null) //FIXME Can be possible?
! 	    setLastSolution(false);
! 	else
! 	    setLastSolution(treeResult.isCompletlyExplored());
! 
! 	treeElementToXmlTransformation(treeResult);
  	return xmlResult;
+     }
+ 
+     /**
+      * @ejb:interface-method
+      **/
+     public boolean isLastSolution()
+     {
+ 	return lastSolution;
+     }
+ 
+     private void setLastSolution(boolean newValue)
+     {
+ 	lastSolution = newValue;
      }
  

[Pfc-prolog-cvs] prolix/etc WebClientResources.properties,1.5,1.6

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/etc
In directory sc8-pr-cvs1:/tmp/cvs-serv11378/etc

Modified Files:
	WebClientResources.properties 
Log Message:
All links text from resources file - Disable next solution button when no more solutions

Index: WebClientResources.properties
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/etc/WebClientResources.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** WebClientResources.properties	16 Jul 2003 22:48:13 -0000	1.5
--- WebClientResources.properties	17 Jul 2003 17:17:24 -0000	1.6
***************
*** 13,14 ****
--- 13,16 ----
  button.clear=Limpiar
  button.next.solution=Siguiente solución
+ message.load.other.program=Cargar otro programa
+ message.load.other.consult=Cargar otra consulta

[Pfc-prolog-cvs] prolix/src/org/asturlinux/frade/prolix/web/beans CurrentStateBean.java,1.3,1.4

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/beans
In directory sc8-pr-cvs1:/tmp/cvs-serv11378/src/org/asturlinux/frade/prolix/web/beans

Modified Files:
	CurrentStateBean.java 
Log Message:
All links text from resources file - Disable next solution button when no more solutions

Index: CurrentStateBean.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/beans/CurrentStateBean.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CurrentStateBean.java	17 Jul 2003 12:47:18 -0000	1.3
--- CurrentStateBean.java	17 Jul 2003 17:17:24 -0000	1.4
***************
*** 13,17 ****
       * @return the NoMoreSolutions value.
       */
!     public boolean isNoMoreSolutions() {
  	return noMoreSolutions;
      }
--- 13,17 ----
       * @return the NoMoreSolutions value.
       */
!     public boolean getNoMoreSolutions() {
  	return noMoreSolutions;
      }

[Pfc-prolog-cvs] prolix/src/org/asturlinux/frade/prolix/web/actions SolutionAction.java,1.5,1.6

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions
In directory sc8-pr-cvs1:/tmp/cvs-serv11378/src/org/asturlinux/frade/prolix/web/actions

Modified Files:
	SolutionAction.java 
Log Message:
All links text from resources file - Disable next solution button when no more solutions

Index: SolutionAction.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/prolix/web/actions/SolutionAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SolutionAction.java	16 Jul 2003 22:48:14 -0000	1.5
--- SolutionAction.java	17 Jul 2003 17:17:24 -0000	1.6
***************
*** 44,58 ****
  	Locale locale = getLocale(request);
  	MessageResources messages = getResources(request);
- 	String result;
  	try
  	    {
  		HttpSession session = request.getSession();
  		ProlixMain interpreter = (ProlixMain)session.getAttribute("interpreter");
! 		result = interpreter.step();
  		CurrentStateBean data = (CurrentStateBean)session.getAttribute("prologData");
  		if (data != null)
  		    {
  			data.setCurrentResult(result);
! 			session.setAttribute("prologData",data);
  		    }
  	    }
--- 44,60 ----
  	Locale locale = getLocale(request);
  	MessageResources messages = getResources(request);
  	try
  	    {
  		HttpSession session = request.getSession();
  		ProlixMain interpreter = (ProlixMain)session.getAttribute("interpreter");
! 		String result = interpreter.step();
  		CurrentStateBean data = (CurrentStateBean)session.getAttribute("prologData");
  		if (data != null)
  		    {
  			data.setCurrentResult(result);
! 			boolean test = interpreter.isLastSolution();
! 			data.setNoMoreSolutions(test);
! 			// FIXME Aparent dont required code
! 			// session.setAttribute("prologData",data);
  		    }
  	    }