Menu
▾
▴
otgforum-cvs-updates — Mailing list for receiving the cvs update emails.
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(54) |
Jun
(3) |
Jul
(200) |
Aug
(148) |
Sep
(4) |
Oct
(38) |
Nov
(8) |
Dec
(5) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
(42) |
May
(6) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2003 |
Jan
|
Feb
(100) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(54) |
Sep
|
Oct
(35) |
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(28) |
Nov
(14) |
Dec
(7) |
| 2005 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(3) |
Jun
(1) |
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
(1) |
| 2006 |
Jan
(85) |
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
|
Aug
(6) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
|
|
From: Michael R H. <mic...@us...> - 2007-09-10 15:57:09
|
Update of /cvsroot/otgforum/jacob-wst/WebContent/META-INF In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5621/WebContent/META-INF Modified Files: MANIFEST.MF Log Message: Load in Europa Webtools and fix the "jtes" bug re: dates (don't show the name of the day from 7 days ago, only 6) Index: MANIFEST.MF =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/WebContent/META-INF/MANIFEST.MF,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- MANIFEST.MF 16 Jan 2006 16:02:14 -0000 1.1 +++ MANIFEST.MF 10 Sep 2007 15:57:07 -0000 1.2 @@ -1,3 +1,2 @@ -Manifest-Version: 1.0 -Class-Path: - +Manifest-Version: 1.0 + |
|
From: Michael R H. <mic...@us...> - 2007-09-10 15:57:07
|
Update of /cvsroot/otgforum/jacob-wst In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5621 Modified Files: .classpath Log Message: Load in Europa Webtools and fix the "jtes" bug re: dates (don't show the name of the day from 7 days ago, only 6) Index: .classpath =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/.classpath,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- .classpath 1 Aug 2006 20:19:54 -0000 1.4 +++ .classpath 10 Sep 2007 15:57:07 -0000 1.5 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry output=".deployables/jacob-wst/WEB-INF/classes" kind="src" path="JavaSource"/> + <classpathentry kind="src" output=".deployables/jacob-wst/WEB-INF/classes" path="JavaSource"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v4.1"/> + <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.5"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> <classpathentry kind="output" path="bin"/> </classpath> |
|
From: Michael R H. <mic...@us...> - 2007-09-10 15:57:07
|
Update of /cvsroot/otgforum/jacob-wst/JavaSource/jacob/utensil In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5621/JavaSource/jacob/utensil Modified Files: DateUtil.java Log Message: Load in Europa Webtools and fix the "jtes" bug re: dates (don't show the name of the day from 7 days ago, only 6) Index: DateUtil.java =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/JavaSource/jacob/utensil/DateUtil.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- DateUtil.java 16 Jan 2006 19:35:28 -0000 1.2 +++ DateUtil.java 10 Sep 2007 15:57:07 -0000 1.3 @@ -20,7 +20,7 @@ public final static int MINUTE_MILLIS = 60 * SECOND_MILLIS; public final static int HOUR_MILLIS = 60 * MINUTE_MILLIS; public final static int DAY_MILLIS = 24 * HOUR_MILLIS; - public final static int WEEK_MILLIS = 7 * DAY_MILLIS; + public final static int WEEK_MILLIS = 6 * DAY_MILLIS; // change to "6" from "7" so we don't print "Friday" for last week's Friday public final static int MIDNIGHT = 0; public final static double NO_EXPIRATION = -1; |
|
From: Michael R H. <mic...@us...> - 2006-08-01 20:28:19
|
Update of /cvsroot/otgforum/jacob-wst/WebContent/includes In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19183/WebContent/includes Modified Files: pageHeader.jsp Log Message: Tweak the sign in bits. Index: pageHeader.jsp =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/WebContent/includes/pageHeader.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- pageHeader.jsp 16 Jan 2006 19:35:27 -0000 1.2 +++ pageHeader.jsp 1 Aug 2006 20:28:14 -0000 1.3 @@ -39,7 +39,11 @@ <TR class="quicklink"><TD NOWRAP><font size="-1"><A class="notsoimportant" HREF="<%= request.getContextPath() %>/newTopMessages.jsp?">New Top Messages</A></font></TR></TD> <TR class="quicklink"><TD NOWRAP><font size="-1"><A class="notsoimportant" HREF="<%= request.getContextPath() %>/viewTopMessages.jsp?sortMethod=Most+Recently+Active+Threads+First">Nested Top Threads</A></font></TR></TD> <TR class="quicklink"><TD NOWRAP><A class="notsoimportant"HREF="<%= request.getContextPath() %>/viewMessageIndex.jsp?sortMethod=Newest+Messages+First&<%= Constants.LIMIT %>=100">Message Index</A></TR></TD> - <TR class="quicklink"><TD NOWRAP><A class="realimportant" HREF="<%= request.getContextPath() %>/login.jsp">Login</A></TD></TR> + <% if (user != null) { %> + <TR class="quicklink"><TD NOWRAP><A class="notsoimportant" HREF="<%= request.getContextPath() %>/login.jsp">Sign In</A></TD></TR> + <% } else { %> + <TR class="quicklink"><TD NOWRAP><A class="realimportant" HREF="<%= request.getContextPath() %>/login.jsp">Sign In</A></TD></TR> + <% } %> <TR class="quicklink"><TD NOWRAP><A HREF="<%= request.getContextPath() %>/rssMessages.jsp"><img width="36" height="14" border="0" src="<%= request.getContextPath() %>/img/xml.gif" title="RSS/XML [messages]" alt="RSS/XML [messages]"/></A> <A HREF="<%= request.getContextPath() %>/rssThreads.jsp"><img width="36" height="14" border="0" src="<%= request.getContextPath() %>/img/xml.gif" alt="RSS/XML [threads]" title="RSS/XML [threads]"/></A></TD></TR> </TABLE> </TD> |
|
From: Michael R H. <mic...@us...> - 2006-08-01 20:28:17
|
Update of /cvsroot/otgforum/jacob-wst/WebContent In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19183/WebContent Modified Files: index.jsp Log Message: Tweak the sign in bits. Index: index.jsp =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/WebContent/index.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- index.jsp 16 Jan 2006 19:35:27 -0000 1.2 +++ index.jsp 1 Aug 2006 20:28:14 -0000 1.3 @@ -11,7 +11,7 @@ <DT><A HREF="<%= request.getContextPath() %>/login.jsp">login.jsp</A></DT> <DD>Log in to the system. You can view and post messages after logging in.</DD> <DT><A HREF="<%= request.getContextPath() %>/addUser.jsp">addUser.jsp</A></DT> - <DD>Create a new user for jacob. This automatically gets called if you login with an invalid username to login.jsp.</DD> + <DD>Create a new user for jacob. This automatically gets called if you sign in with an invalid username to login.jsp.</DD> <DT><A HREF="<%= request.getContextPath() %>/listUsers.jsp">listUsers.jsp</A></DT> <DD>Show all users of the system</DD> <DT><A HREF="http://otgforum.sourceforge.net">http://otgforum.sourceforge.net</A></DT> @@ -36,6 +36,9 @@ </HTML> <!-- $Log$ + Revision 1.3 2006/08/01 20:28:14 michaelrhead + Tweak the sign in bits. + Revision 1.2 2006/01/16 19:35:27 michaelrhead Here comes the boooom. |
|
From: Michael R H. <mic...@us...> - 2006-08-01 20:19:58
|
Update of /cvsroot/otgforum/jacob-wst/.settings In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15647/.settings Modified Files: .component Added Files: org.eclipse.ltk.core.refactoring.prefs org.eclipse.wst.validation.prefs Log Message: Eclipse 3.2's webtools are a little more fidgety about HTML... Index: .component =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/.settings/.component,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .component 24 May 2006 03:12:52 -0000 1.2 +++ .component 1 Aug 2006 20:19:54 -0000 1.3 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project-modules id="moduleCoreId"> +<project-modules id="moduleCoreId" project-version="1.5.0"> <wb-module deploy-name="jacob-wst"> <module-type module-type-id="jst.web"> <version>2.4</version> --- NEW FILE: org.eclipse.wst.validation.prefs --- #Tue Aug 01 16:08:49 EDT 2006 DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator; USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;org.eclipse.jst.j2ee.internal.web.validation.UIWarValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator; USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;org.eclipse.jst.j2ee.internal.web.validation.UIWarValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator; USER_PREFERENCE=overrideGlobalPreferencesfalse eclipse.preferences.version=1 --- NEW FILE: org.eclipse.ltk.core.refactoring.prefs --- #Tue Aug 01 16:08:51 EDT 2006 eclipse.preferences.version=1 org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false |
|
From: Michael R H. <mic...@us...> - 2006-08-01 20:19:58
|
Update of /cvsroot/otgforum/jacob-wst In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15647 Modified Files: .classpath Log Message: Eclipse 3.2's webtools are a little more fidgety about HTML... Index: .classpath =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .classpath 24 May 2006 03:12:52 -0000 1.3 +++ .classpath 1 Aug 2006 20:19:54 -0000 1.4 @@ -1,10 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Sun JDK 1.5.0"/> <classpathentry output=".deployables/jacob-wst/WEB-INF/classes" kind="src" path="JavaSource"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/j2sdk1.5-sun"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v4.1"/> - <classpathentry kind="lib" path="WebContent/WEB-INF/lib/jakarta-oro-2.0.7.jar"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> <classpathentry kind="output" path="bin"/> </classpath> |
|
From: Michael R H. <mic...@us...> - 2006-08-01 20:19:57
|
Update of /cvsroot/otgforum/jacob-wst/WebContent/includes In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15647/WebContent/includes Modified Files: pageFooter.jsp Log Message: Eclipse 3.2's webtools are a little more fidgety about HTML... Index: pageFooter.jsp =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/WebContent/includes/pageFooter.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pageFooter.jsp 16 Jan 2006 16:02:12 -0000 1.1 +++ pageFooter.jsp 1 Aug 2006 20:19:54 -0000 1.2 @@ -31,7 +31,7 @@ <OPTION>25</OPTION> <OPTION>50</OPTION> <OPTION SELECTED>100</OPTION> - <OPTION>1000</OPTION</OPTION> + <OPTION>1000</OPTION> </SELECT> <INPUT TYPE="hidden" NAME="<%= Constants.SORT_METHOD %>" VALUE="<%= selectedMethod %>"></INPUT> <% if(request.getParameter(Constants.MESSAGE_KEY) !=null) { %> |
|
From: Michael R H. <mic...@us...> - 2006-08-01 20:19:57
|
Update of /cvsroot/otgforum/jacob-wst/WebContent In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15647/WebContent Modified Files: addUser.jsp Log Message: Eclipse 3.2's webtools are a little more fidgety about HTML... Index: addUser.jsp =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/WebContent/addUser.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- addUser.jsp 16 Jan 2006 16:02:12 -0000 1.1 +++ addUser.jsp 1 Aug 2006 20:19:54 -0000 1.2 @@ -36,10 +36,11 @@ </ADDRESS> $Id$ </DIV> -</BODY> -</HTML> <!-- $Log$ + Revision 1.2 2006/08/01 20:19:54 michaelrhead + Eclipse 3.2's webtools are a little more fidgety about HTML... + Revision 1.1 2006/01/16 16:02:12 chambery port of jacob to wst default structure @@ -88,3 +89,6 @@ Touch up the ends of the files with a Log and a visible Id variable. --> + +</BODY> +</HTML> \ No newline at end of file |
|
From: Michael R H. <mic...@us...> - 2006-05-24 03:26:11
|
Update of /cvsroot/otgforum/jacob-wst/docs In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25210/docs Modified Files: dbCreation.script Log Message: Apparently NOW() in quotes is not a valid value for timestamp Index: dbCreation.script =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/docs/dbCreation.script,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- dbCreation.script 16 Jan 2006 19:03:51 -0000 1.1 +++ dbCreation.script 24 May 2006 03:26:02 -0000 1.2 @@ -1,7 +1,7 @@ create table Messages ( messagekey int not null, authorId varchar(40) default 'nobody here but us chickens' not null, - submissionDate timestamp default 'now()' not null, + submissionDate timestamp default NOW() not null, expiration double default -1 not null, messageText blob not null, action int default 0 not null, |
|
From: Michael R H. <mic...@us...> - 2006-05-24 03:26:10
|
Update of /cvsroot/otgforum/jacob-wst In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25210 Modified Files: README.txt Log Message: Apparently NOW() in quotes is not a valid value for timestamp Index: README.txt =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/README.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- README.txt 16 Jan 2006 20:44:42 -0000 1.1 +++ README.txt 24 May 2006 03:26:01 -0000 1.2 @@ -15,9 +15,6 @@ mysql> create database jacob; mysql> grant all privileges on jacob.* to jacob; mysql> grant all privileges on jacob.* to jacob@localhost; -mysql> grant all privileges on jacob.* to 'jacob@localhost'; - -(ok, one of the last two is not necessary, but I always forget which). Once that's done, you can use the handy dropCreatePopulate script to set up the tables. @@ -45,5 +42,5 @@ If you've set up the database on the server the same way as on the devel machine, you should be able to browse /jacob-wst/servlet/jacob.testing.TestPropertiesAndDatabaseServlet -and see a sucess message. If there are problems, that servlet will +and see a success message. If there are problems, that servlet will attempt to walk you through common errors. |
|
From: Michael R H. <mic...@us...> - 2006-05-24 03:13:06
|
Update of /cvsroot/otgforum/jacob-wst In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20833 Modified Files: .classpath Log Message: Had to diddle the classpath for the new ubuntu java packages. Index: .classpath =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/.classpath,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .classpath 16 Jan 2006 19:35:28 -0000 1.2 +++ .classpath 24 May 2006 03:12:52 -0000 1.3 @@ -2,8 +2,9 @@ <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Sun JDK 1.5.0"/> <classpathentry output=".deployables/jacob-wst/WEB-INF/classes" kind="src" path="JavaSource"/> - <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container/jacob-wst"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/j2sdk1.5-sun"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v4.1"/> + <classpathentry kind="lib" path="WebContent/WEB-INF/lib/jakarta-oro-2.0.7.jar"/> <classpathentry kind="output" path="bin"/> </classpath> |
|
From: Michael R H. <mic...@us...> - 2006-05-24 03:13:06
|
Update of /cvsroot/otgforum/jacob-wst/.settings In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20833/.settings Modified Files: .component Log Message: Had to diddle the classpath for the new ubuntu java packages. Index: .component =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/.settings/.component,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .component 16 Jan 2006 19:35:27 -0000 1.1 +++ .component 24 May 2006 03:12:52 -0000 1.2 @@ -6,7 +6,7 @@ </module-type> <wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> <wb-resource deploy-path="/" source-path="/WebContent"/> -<property name="context-root" value="jacob-wst"/> <property name="java-output-path" value="/bin/"/> +<property name="context-root" value="jacob-wst"/> </wb-module> </project-modules> |
|
From: Michael R H. <mic...@us...> - 2006-01-19 15:30:28
|
Update of /cvsroot/otgforum/jacob-wst/JavaSource/jacob/transform In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31986/JavaSource/jacob/transform Modified Files: WikiTransformer.java Log Message: Actually need to check for all of \r \n and \r\n in the split Index: WikiTransformer.java =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/JavaSource/jacob/transform/WikiTransformer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- WikiTransformer.java 18 Jan 2006 03:10:39 -0000 1.2 +++ WikiTransformer.java 19 Jan 2006 15:30:19 -0000 1.3 @@ -29,7 +29,7 @@ public String transform(String input) { // step 1, split on line breaks: StringBuffer output = new StringBuffer(); - String[] lines = input.split("\r|\n"); + String[] lines = input.split("(\r\n)|(\r)|(\n)"); Stack stack = new Stack(); boolean in_ul_context =false ; boolean in_ol_context =false; @@ -218,7 +218,7 @@ String textA = "Hello\nworld"; String textB = "Hello\r\nworld"; String textC = "Hello\rworld"; - String textD = "blah blah blah\nhttp://blah.com\n_guh_ [http://blah.com text] [[who] !notbig \n!!bigger \n!!!biggest \n''i'' __b__ {{tt}}\n* li 1\n * no li\n# number 1\n<should be escaped>\n'not it' ''it'' ''broken\ninput''\nok... '\n[http://slashdot.org]"; + String textD = "blah blah blah\n\r\nhttp://blah.com\n_guh_ [http://blah.com text] [[who] !notbig \n!!bigger \n!!!biggest \n''i'' __b__ {{tt}}\n* li 1\n * no li\n# number 1\n<should be escaped>\n'not it' ''it'' ''broken\ninput''\nok... '\n[http://slashdot.org]"; System.out.println("Text A:"); System.out.println(textA); System.out.println(t.transform(textA)); |
|
From: Michael R H. <mic...@us...> - 2006-01-18 03:14:53
|
Update of /cvsroot/otgforum/jacob-wst/WebContent/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30499/WebContent/includes Modified Files: writingInstructions.jsp Log Message: mention about listing and enumerating Index: writingInstructions.jsp =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/WebContent/includes/writingInstructions.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- writingInstructions.jsp 17 Jan 2006 07:05:30 -0000 1.1 +++ writingInstructions.jsp 18 Jan 2006 03:14:43 -0000 1.2 @@ -26,12 +26,20 @@ <td>[http://blah.com text] -> <a href="http://blah.com">text</a></td> </tr> <tr> -<td>To listify:</td> -<td><table><tr><td>#blah-> </td><td><ol><li>blah</li></ol></td></tr></table></tr> +<td>To enumerate:</td> +<td><table><tr><td>#blah-> </td><td><ol><li>blah</li></ol></td></tr></table></td> +</tr> +<tr> +<td>To itemize:</td> +<td><table><tr><td>*blah-> </td><td><ul><li>blah</li></ul></td></tr></table></td> +</tr> </table> <!-- $Log$ + Revision 1.2 2006/01/18 03:14:43 michaelrhead + mention about listing and enumerating + Revision 1.1 2006/01/17 07:05:30 michaelrhead Wikify with instructions. The old ways have been commented out. |
|
From: Michael R H. <mic...@us...> - 2006-01-18 03:10:47
|
Update of /cvsroot/otgforum/jacob-wst/JavaSource/jacob/transform In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29230/JavaSource/jacob/transform Modified Files: WikiTransformer.java Log Message: extra blank lines make extra br tags Index: WikiTransformer.java =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/JavaSource/jacob/transform/WikiTransformer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- WikiTransformer.java 17 Jan 2006 07:05:31 -0000 1.1 +++ WikiTransformer.java 18 Jan 2006 03:10:39 -0000 1.2 @@ -35,7 +35,10 @@ boolean in_ol_context =false; for (int i = 0; i < lines.length; i++) { String line = lines[i]; - if(line.length() ==0) continue; + if(line.length() ==0) { + output.append("<br>"); + continue; + } boolean waiting_it = false; boolean waiting_b = false; |
|
From: Michael R H. <mic...@us...> - 2006-01-17 07:05:42
|
Update of /cvsroot/otgforum/jacob-wst/WebContent/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23980/WebContent/includes Added Files: writingInstructions.jsp Log Message: Wikify with instructions. The old ways have been commented out. --- NEW FILE: writingInstructions.jsp --- <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <!-- $Id: writingInstructions.jsp,v 1.1 2006/01/17 07:05:30 michaelrhead Exp $ --> <table> <tr> <th>Syntax help:</th><th>[Mostly taken from <a href="http://www.jspwiki.org/wiki/TextFormattingRules">JSPWiki</a>]</th> </tr> <tr> <td>To italicize:</td> <td>''text'' -> <i>text</i></td> </tr> <tr> <td>To embolden:</td> <td>__text__ -> <b>text</b></td> </tr> <tr> <td>To monospace:</td> <td>{{text}} -> <tt>text</tt></td> </tr> <tr> <td>To link: </td> <td>[http://blah.com] -> <a href="http://blah.com">http://blah.com</a></td> </tr> <tr><td></td> <td>[http://blah.com text] -> <a href="http://blah.com">text</a></td> </tr> <tr> <td>To listify:</td> <td><table><tr><td>#blah-> </td><td><ol><li>blah</li></ol></td></tr></table></tr> </table> <!-- $Log: writingInstructions.jsp,v $ Revision 1.1 2006/01/17 07:05:30 michaelrhead Wikify with instructions. The old ways have been commented out. --> |
|
From: Michael R H. <mic...@us...> - 2006-01-17 07:05:41
|
Update of /cvsroot/otgforum/jacob-wst/JavaSource/jacob/transform In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23980/JavaSource/jacob/transform Added Files: WikiTransformer.java Log Message: Wikify with instructions. The old ways have been commented out. --- NEW FILE: WikiTransformer.java --- /* * $Id: WikiTransformer.java,v 1.1 2006/01/17 07:05:31 michaelrhead Exp $ */ package jacob.transform; import java.util.Stack; /** * Combine Marcus's and Todd's approaches. Eliminate the specialized MessageUtil, * but migrate out so it can be previewed. * * @author <a href="mailto:he...@ac...">Michael R. Head</a> * @version $Name: $ $Date: 2006/01/17 07:05:31 $ $Revision: 1.1 $ * */ public class WikiTransformer implements ITextTransformer { private static WikiTransformer instance = createInstance(); private static WikiTransformer createInstance() { return new WikiTransformer(); } private WikiTransformer() { } /* (non-Javadoc) * @see jacob.transform.ITextTransformer#transform(java.lang.String) */ public String transform(String input) { // step 1, split on line breaks: StringBuffer output = new StringBuffer(); String[] lines = input.split("\r|\n"); Stack stack = new Stack(); boolean in_ul_context =false ; boolean in_ol_context =false; for (int i = 0; i < lines.length; i++) { String line = lines[i]; if(line.length() ==0) continue; boolean waiting_it = false; boolean waiting_b = false; boolean waiting_tt = false; if(in_ul_context || in_ol_context) { if(in_ul_context && line.charAt(0) != '*') { output.append("</ul>"); in_ul_context = false; } else if(in_ol_context && line.charAt(0) != '#') { output.append("</ol>"); in_ol_context = false; } } else if(i>0) { output.append("<br>\n"); } switch(line.charAt(0)) { // Implement !, !!, !!! size rules case '!': if(line.length() > 2 && line.charAt(1) == '!') { if(line.length() >3 && line.charAt(2) == '!') { output.append("<H1>"); stack.push(("</H1>")); line = line.substring(3); } else { output.append("<H2>"); stack.push("</H2>"); line = line.substring(2); } } else { output.append("<H3>"); stack.push("</H3>"); line = line.substring(1); } break; case '*': if(!in_ul_context) { output.append("<ul>"); in_ul_context = true; } output.append("<li>"); stack.push("</li>"); line = line.substring(1); break; case '#': if(!in_ol_context) { output.append("<ol>"); in_ol_context = true; } output.append("<li>"); stack.push("</li>"); line = line.substring(1); break; default: break; } for(int j=0;j<line.length();j++) { switch(line.charAt(j)) { case '\'': if(line.indexOf('\'',j+1) == j+1) { if(!waiting_it) { output.append("<i>"); } else { output.append("</i>"); } waiting_it = !waiting_it; j++; } else { output.append('\''); } break; case '_': if(line.indexOf('_',j+1)==j+1) { if(!waiting_b) { output.append("<b>"); } else { output.append("</b>"); } waiting_b = !waiting_b; j++; } else { output.append('_'); } break; case '{': if(line.indexOf('{',j+1)==j+1) { if(!waiting_tt) { output.append("<tt>"); waiting_tt = !waiting_tt; } else { output.append("{{"); } j++; } else { output.append('{'); } break; case '}': if(line.indexOf('}',j+1) == j+1) { if(waiting_tt) { output.append("</tt>"); waiting_tt = !waiting_tt; } else { output.append("}}"); } j++; } else { output.append('}'); } break; case '[': if(line.indexOf('[',j+1)!=j+1) { if(line.indexOf(']',j+1) > -1) { int bracket_end = line.indexOf(']',j+1); int url_sep = line.indexOf(' ', j+1); String url; if(url_sep < 0) url = line.substring(j+1, bracket_end); else url = line.substring(j+1, Math.min(url_sep, bracket_end)); output.append("<a href=\""); output.append(url); output.append("\">"); if(url_sep > -1 && url_sep < bracket_end) { output.append(line.substring(url_sep, bracket_end)); } else { output.append(url); } output.append("</a>"); j = bracket_end+1; } else { output.append('['); } } else { output.append("[["); j++; } break; case '<': output.append("<"); break; case '>': output.append(">"); break; case '&': output.append("&"); break; default: output.append(line.charAt(j)); } } if(waiting_it) { output.append("</it>"); waiting_it = false; } if(waiting_b) { output.append("</b>"); waiting_b = false; } if(waiting_tt) { output.append("</tt>"); waiting_tt = false; } while(!stack.empty()) { output.append((String)stack.pop()); } } return output.toString(); } /** * @param args */ public static void main(String[] args) { WikiTransformer t = getInstance(); String textA = "Hello\nworld"; String textB = "Hello\r\nworld"; String textC = "Hello\rworld"; String textD = "blah blah blah\nhttp://blah.com\n_guh_ [http://blah.com text] [[who] !notbig \n!!bigger \n!!!biggest \n''i'' __b__ {{tt}}\n* li 1\n * no li\n# number 1\n<should be escaped>\n'not it' ''it'' ''broken\ninput''\nok... '\n[http://slashdot.org]"; System.out.println("Text A:"); System.out.println(textA); System.out.println(t.transform(textA)); System.out.println("Text B:"); System.out.println(textB); System.out.println(t.transform(textB)); System.out.println("Text C:"); System.out.println(textC); System.out.println(t.transform(textC)); System.out.println("Text D:"); System.out.println(textD); System.out.println(t.transform(textD)); } /** * @return */ public static WikiTransformer getInstance() { // TODO Auto-generated method stub return instance; } } |
|
From: Michael R H. <mic...@us...> - 2006-01-17 07:05:41
|
Update of /cvsroot/otgforum/jacob-wst/JavaSource/jacob/dataaccess/managers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23980/JavaSource/jacob/dataaccess/managers Modified Files: MessageManager.java Log Message: Wikify with instructions. The old ways have been commented out. Index: MessageManager.java =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/JavaSource/jacob/dataaccess/managers/MessageManager.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- MessageManager.java 16 Jan 2006 19:35:28 -0000 1.2 +++ MessageManager.java 17 Jan 2006 07:05:31 -0000 1.3 @@ -37,24 +37,17 @@ public class MessageManager extends JacobObjectManager{ - private List transformers; private static MessageManager INSTANCE = new MessageManager(); private MessageManager() { super(); - initTransformers(); } public static MessageManager getInstance() { return INSTANCE; } - private void initTransformers() { - List transformers = new ArrayList(); - transformers.add(URITransformer.getInstance()); - setTransformers(transformers); - } - + public boolean queryMessagesByUser(User user) { boolean containedMessage=false; Connection conn = null; @@ -121,7 +114,8 @@ public Message addMessage(String username, String messageText, String action, int parent, String sbj, long expiry, Timestamp subDate, int category) { Message message=new Message(); message.setAuthorId(username); - message.setMessageText(transformMessageText(messageText)); +// message.setMessageText(transformMessageText(messageText)); // Message is already transformed way out in the servlet (for previewability) + message.setMessageText(messageText); // message.setSubmissionDate(new Timestamp(System.currentTimeMillis())); message.setSubmissionDate(subDate); message.setExpiration(expiry); @@ -133,17 +127,17 @@ return insertMessage(message)?message:null; } - protected String transformMessageText(String messageText) { - String transformed = messageText; - List transformers = getTransformers(); - if (transformers != null) { - for (Iterator iter = transformers.iterator(); iter.hasNext();) { - ITextTransformer transformer = (ITextTransformer) iter.next(); - transformed = transformer.transform(transformed); - } - } - return transformed; - } +// protected String transformMessageText(String messageText) { +// String transformed = messageText; +// List transformers = getTransformers(); +// if (transformers != null) { +// for (Iterator iter = transformers.iterator(); iter.hasNext();) { +// ITextTransformer transformer = (ITextTransformer) iter.next(); +// transformed = transformer.transform(transformed); +// } +// } +// return transformed; +// } //this is a quick hack that won't work in general. //need to get the key for the latest date instead. @@ -341,24 +335,13 @@ return messageList; } - /** - * @param transformers The transformers to set. - */ - protected void setTransformers(List transformers) { - this.transformers = transformers; - } - - /** - * @return Returns the transformers. - */ - protected List getTransformers() { - return transformers; - } - }//MessageManager /* * $Log$ + * Revision 1.3 2006/01/17 07:05:31 michaelrhead + * Wikify with instructions. The old ways have been commented out. + * * Revision 1.2 2006/01/16 19:35:28 michaelrhead * Here comes the boooom. * |
|
From: Michael R H. <mic...@us...> - 2006-01-17 07:05:41
|
Update of /cvsroot/otgforum/jacob-wst/WebContent In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23980/WebContent Modified Files: postMessage.jsp postReply.jsp Log Message: Wikify with instructions. The old ways have been commented out. Index: postReply.jsp =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/WebContent/postReply.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- postReply.jsp 16 Jan 2006 16:02:12 -0000 1.1 +++ postReply.jsp 17 Jan 2006 07:05:31 -0000 1.2 @@ -63,6 +63,7 @@ <INPUT TYPE="hidden" NAME="<%= jacob.servlets.PostMessageServlet.CATEGORY_PNAME %>" VALUE="0"> </FORM> +<jsp:include page="/includes/writingInstructions.jsp" flush="true" /> <HR> <DIV class=footer> ©2001-2002 @@ -76,6 +77,9 @@ </HTML> <!-- $Log$ + Revision 1.2 2006/01/17 07:05:31 michaelrhead + Wikify with instructions. The old ways have been commented out. + Revision 1.1 2006/01/16 16:02:12 chambery port of jacob to wst default structure Index: postMessage.jsp =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/WebContent/postMessage.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- postMessage.jsp 16 Jan 2006 16:02:12 -0000 1.1 +++ postMessage.jsp 17 Jan 2006 07:05:31 -0000 1.2 @@ -32,7 +32,7 @@ <TD><INPUT TYPE="text" NAME="<%= jacob.servlets.PostMessageServlet.SUBJECT_PNAME %>" SIZE="40" VALUE="aint nobody here but us chikins"></TD> </TR> <TR> - <TD>Message (Now no need for <BR> tags! Newlines are automatically converted!)</TD> + <TD>Message</TD> <TD><TEXTAREA NAME="<%= jacob.servlets.PostMessageServlet.MESSAGETEXT_PNAME %>" ROWS="15" COLS="80" WRAP="virtual"></TEXTAREA></TD> </TR> <TR> @@ -46,6 +46,7 @@ </TABLE> <INPUT TYPE="hidden" NAME="<%= jacob.servlets.PostMessageServlet.NEXTPAGE_PNAME %>" VALUE="/newTopMessages.jsp?<%= jacob.servlets.Constants.SORT_METHOD %>=Most+Recently+Active+Threads+First"></INPUT> </FORM> +<jsp:include page="/includes/writingInstructions.jsp" flush="true" /> <HR> <DIV class=footer> ©2001-2002 @@ -59,6 +60,9 @@ </HTML> <!-- $Log$ + Revision 1.2 2006/01/17 07:05:31 michaelrhead + Wikify with instructions. The old ways have been commented out. + Revision 1.1 2006/01/16 16:02:12 chambery port of jacob to wst default structure |
|
From: Michael R H. <mic...@us...> - 2006-01-17 07:05:41
|
Update of /cvsroot/otgforum/jacob-wst/JavaSource/jacob/frontend/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23980/JavaSource/jacob/frontend/commands Modified Files: MungeMessageCommand.java Log Message: Wikify with instructions. The old ways have been commented out. Index: MungeMessageCommand.java =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/JavaSource/jacob/frontend/commands/MungeMessageCommand.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- MungeMessageCommand.java 16 Jan 2006 19:35:27 -0000 1.2 +++ MungeMessageCommand.java 17 Jan 2006 07:05:31 -0000 1.3 @@ -42,7 +42,8 @@ } public String mungeMessage(String msgText) throws JacobCommandException { - return MessageUtil.convertNLToHTMLBreak(msgText); + //return MessageUtil.convertNLToHTMLBreak(msgText); + return MessageUtil.transformMessageTest(msgText); } }// MungeMessageCommand |
|
From: Michael R H. <mic...@us...> - 2006-01-17 07:05:39
|
Update of /cvsroot/otgforum/jacob-wst/JavaSource/jacob/utensil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23980/JavaSource/jacob/utensil Modified Files: MessageUtil.java Log Message: Wikify with instructions. The old ways have been commented out. Index: MessageUtil.java =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/JavaSource/jacob/utensil/MessageUtil.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- MessageUtil.java 16 Jan 2006 16:02:12 -0000 1.1 +++ MessageUtil.java 17 Jan 2006 07:05:31 -0000 1.2 @@ -4,10 +4,18 @@ * $Id$ */ +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + import jacob.dataobjects.User; import jacob.frontend.JacobCommandException; import jacob.frontend.commands.LoginCommand; import jacob.servlets.LoginServlet; +import jacob.transform.ITextTransformer; +import jacob.transform.URITransformer; +import jacob.transform.WikiTransformer; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; @@ -20,36 +28,56 @@ *@created August 2, 2001 */ public class MessageUtil { - public static final String HTML_BREAK = "<BR>"; - public static final String HTML_PARA = "<P>"; - public static final String NEWLINE = System.getProperty("line.separator"); - // it's pretty obvious but these are prefs (mine) +// public static final String HTML_BREAK = "<BR>"; +// public static final String HTML_PARA = "<P>"; +// public static final String NEWLINE = System.getProperty("line.separator"); +// // it's pretty obvious but these are prefs (mine) public static final int MESSAGE_TRUNC_BYTE = 470; public static final int MAX_BREAKS = 8; - public static String convertNLToHTMLBreak(String msgText) { - StringBuffer sb = new StringBuffer(); - byte[] msgBytes = new byte[msgText.length()]; - msgBytes = msgText.getBytes(); - for (int i = 0; i < msgBytes.length; i++) { - byte temp = msgBytes[i]; - // need to change this to be the System.thing - // if two newlines in a row, sub with paragraph - if (temp == '\n') { - if (((i + 1) < msgBytes.length) && (msgBytes[i + 1] == '\n')) { - sb.append(HTML_PARA); - ++i; - } else { - sb.append(HTML_BREAK); - } - } else { - sb.append((char)temp); - } + private static final List transformers; + + static { + List trans = new ArrayList(); + trans.add(WikiTransformer.getInstance()); + //trans.add(URITransformer.getInstance()); + transformers = Collections.unmodifiableList(trans); + } + + public static String transformMessageTest(String msgText) { + for (Iterator iter = transformers.iterator();iter.hasNext();) { + ITextTransformer transform = (ITextTransformer)iter.next(); + msgText = transform.transform(msgText); } - - return sb.toString(); + return msgText; } + /* + * WikiTransformer will now take care of this automatically. + */ +// public static String convertNLToHTMLBreak(String msgText) { +// StringBuffer sb = new StringBuffer(); +// byte[] msgBytes = new byte[msgText.length()]; +// msgBytes = msgText.getBytes(); +// for (int i = 0; i < msgBytes.length; i++) { +// byte temp = msgBytes[i]; +// // need to change this to be the System.thing +// // if two newlines in a row, sub with paragraph +// if (temp == '\n') { +// if (((i + 1) < msgBytes.length) && (msgBytes[i + 1] == '\n')) { +// sb.append(HTML_PARA); +// ++i; +// } else { +// sb.append(HTML_BREAK); +// } +// } else { +// sb.append((char)temp); +// } +// } +// +// return sb.toString(); +// } + public static User getUser(HttpServletRequest req) { HttpSession session = req.getSession(); User user = (User)session.getAttribute(LoginServlet.USERS_SNAME); |
|
From: Michael R H. <mic...@us...> - 2006-01-16 21:14:40
|
Update of /cvsroot/otgforum/jacob-wst/WebContent/WEB-INF/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9315/WebContent/WEB-INF/lib Removed Files: jakarta-servletapi-3.3.1a-bin.jar Log Message: No need to include the servlet APIs as webtools handles it now. --- jakarta-servletapi-3.3.1a-bin.jar DELETED --- |
|
From: Michael R H. <mic...@us...> - 2006-01-16 21:14:40
|
Update of /cvsroot/otgforum/jacob-wst/.settings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9315/.settings Modified Files: org.eclipse.jdt.ui.prefs Log Message: No need to include the servlet APIs as webtools handles it now. Index: org.eclipse.jdt.ui.prefs =================================================================== RCS file: /cvsroot/otgforum/jacob-wst/.settings/org.eclipse.jdt.ui.prefs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org.eclipse.jdt.ui.prefs 16 Jan 2006 19:35:27 -0000 1.1 +++ org.eclipse.jdt.ui.prefs 16 Jan 2006 21:14:28 -0000 1.2 @@ -1,3 +1,4 @@ -#Mon Jan 16 13:02:28 EST 2006 +#Mon Jan 16 15:50:58 EST 2006 eclipse.preferences.version=1 internal.default.compliance=default +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/> |
|
From: Michael R H. <mic...@us...> - 2006-01-16 20:47:06
|
Update of /cvsroot/otgforum/jacob In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2286 Added Files: OBSOLETE Log Message: The jacob project is now considered obsolete. Please use the jacob-wst project --- NEW FILE: OBSOLETE --- This module is for historical use only. Please use eclipse with webtools to work with the jacob-wst module. Thank you, mike |