Menu
▾
▴
webmacro-cvs — receive cvs commit messages
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(11) |
Nov
(97) |
Dec
(35) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(12) |
Feb
(55) |
Mar
(21) |
Apr
(3) |
May
(7) |
Jun
(25) |
Jul
(108) |
Aug
(23) |
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2006 |
Jan
|
Feb
|
Mar
(6) |
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
(13) |
Feb
|
Mar
(257) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(38) |
Dec
|
| 2009 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
(63) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(1) |
| 2011 |
Jan
|
Feb
(1) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <dr...@us...> - 2002-12-15 06:45:50
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive
In directory sc8-pr-cvs1:/tmp/cvs-serv4648/src/org/webmacro/directive
Modified Files:
IncludeDirective.java
Log Message:
Eric, please learn to atleast try to compile the code before you commit it.
Index: IncludeDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/IncludeDirective.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** IncludeDirective.java 15 Dec 2002 06:40:20 -0000 1.16
--- IncludeDirective.java 15 Dec 2002 06:45:47 -0000 1.17
***************
*** 347,354 ****
if (_log.loggingDebug()) {
_log.debug("Including '" + _strFilename + "' as "
! + (_type == TYPE_MACRO) ? "MACRO"
: (_type == TYPE_TEMPLATE) ? "TEMPLATE"
: (_type == TYPE_TEXT) ? "TEXT"
! : "UNKNOWN. Throwing exceptin");
}
--- 347,354 ----
if (_log.loggingDebug()) {
_log.debug("Including '" + _strFilename + "' as "
! + ((_type == TYPE_MACRO) ? "MACRO"
: (_type == TYPE_TEMPLATE) ? "TEMPLATE"
: (_type == TYPE_TEXT) ? "TEXT"
! : "UNKNOWN. Throwing exceptin"));
}
|
|
From: <dr...@us...> - 2002-12-15 06:40:23
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive
In directory sc8-pr-cvs1:/tmp/cvs-serv774/src/org/webmacro/directive
Modified Files:
IncludeDirective.java
Log Message:
add some debug output to IncludeDirective.
Index: IncludeDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/IncludeDirective.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** IncludeDirective.java 11 Nov 2002 19:22:36 -0000 1.15
--- IncludeDirective.java 15 Dec 2002 06:40:20 -0000 1.16
***************
*** 205,208 ****
--- 205,210 ----
+ /** Logging can be good */
+ protected Log _log;
/** the included file type. one of TYPE_TEMPLATE, TYPE_STATIC, TYPE_MACRO, or TYPE_DYNAMIC */
protected int _type;
***************
*** 236,240 ****
public final Object build(DirectiveBuilder builder, BuildContext bc) throws BuildException {
Broker broker = bc.getBroker();
!
// build configuration key names, since they're based
// on the configured name of this directive
--- 238,242 ----
public final Object build(DirectiveBuilder builder, BuildContext bc) throws BuildException {
Broker broker = bc.getBroker();
! _log = bc.getLog("IncludeDirective");
// build configuration key names, since they're based
// on the configured name of this directive
***************
*** 331,339 ****
}
! // make sure we're not trying to include ourself.
! // maybe there is a better way to handle this?
! if (context.getCurrentLocation().indexOf(_strFilename) > -1) {
! String warning = context.getCurrentLocation() + " includes itself.";
! writeWarning(warning, context, out);
}
--- 333,341 ----
}
! if (_log.loggingDebug() && context.getCurrentLocation().indexOf(_strFilename) > -1) {
! // when in debug mode, output a warning if a template tries to include itself
! // there are situtations where this is desired, but it's good to make
! // the user aware of what they're doing
! _log.warning(context.getCurrentLocation() + " includes itself.");
}
***************
*** 342,345 ****
--- 344,355 ----
if (_type == TYPE_DYNAMIC)
_type = guessType(broker, _strFilename);
+
+ if (_log.loggingDebug()) {
+ _log.debug("Including '" + _strFilename + "' as "
+ + (_type == TYPE_MACRO) ? "MACRO"
+ : (_type == TYPE_TEMPLATE) ? "TEMPLATE"
+ : (_type == TYPE_TEXT) ? "TEXT"
+ : "UNKNOWN. Throwing exceptin");
+ }
Object toInclude = getThingToInclude(broker, _type, _strFilename);
|
|
From: <ke...@us...> - 2002-12-07 06:15:55
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro
In directory sc8-pr-cvs1:/tmp/cvs-serv24763
Modified Files:
Context.java
Log Message:
Reworked addTool method to avoid throwing exceptions and
generating spurious log messages when instantiating tools.
Index: Context.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/Context.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** Context.java 10 Nov 2002 20:51:12 -0000 1.56
--- Context.java 7 Dec 2002 06:15:52 -0000 1.57
***************
*** 567,571 ****
}
-
/**
* Attempts to instantiate the tool using three different constructors
--- 567,570 ----
***************
*** 589,594 ****
try {
c = _broker.classForName(className);
! }
! catch (ClassNotFoundException e) {
_log.warning("Context: Could not locate class for context tool "
+ className);
--- 588,592 ----
try {
c = _broker.classForName(className);
! } catch (ClassNotFoundException e) {
_log.warning("Context: Could not locate class for context tool "
+ className);
***************
*** 609,656 ****
}
Object instance = null;
- StringBuffer log = null;
- try {
- Constructor ctor = c.getConstructor(_ctorArgs1);
- Object[] args = new Object[2];
- args[0] = key;
- args[1] = new SubSettings(_broker.getSettings(), key);
- instance = ctor.newInstance(args);
- }
- catch (Exception e) {
- log = new StringBuffer();
- log.append("Error loading component key=");
- log.append(key);
- log.append(" class=");
- log.append(c.toString());
- log.append("\n");
- log.append("Trying 2-argument constructor: ");
- log.append(e.toString());
- log.append("\n");
- }
! if (instance == null) {
! try {
! Constructor ctor = c.getConstructor(_ctorArgs2);
! Object[] args = new Object[1];
! args[0] = key;
! instance = ctor.newInstance(args);
}
! catch (Exception e) {
! log.append("Trying 1-argument constructor: ");
! log.append(e.toString());
! log.append("\n");
}
}
-
if (instance == null) {
try {
instance = c.newInstance();
! }
! catch (Exception e) {
! log.append("Trying 0-argument constructor: ");
! log.append(e.toString());
! log.append("\n");
! _log.warning(log.toString());
return;
}
--- 607,660 ----
}
+ Constructor ctor = null;
+ Constructor[] ctors = c.getConstructors();
+ Class[] parmTypes = null;
Object instance = null;
! // check for 2 arg constructor
! for (int i=0; i<ctors.length; i++){
! parmTypes = ctors[i].getParameterTypes();
! if (parmTypes.length == 2
! && parmTypes[0].equals(_ctorArgs1[0])
! && parmTypes[1].equals(_ctorArgs1[1])){
! ctor = ctors[i];
! Object[] args = new Object[2];
! args[0] = key;
! args[1] = new SubSettings(_broker.getSettings(), key);
! try {
! instance = ctor.newInstance(args);
! }
! catch (Exception e){
! _log.error("Failed to instantiate tool "
! + key + " of class " + className + " using constructor "
! + ctor.toString(), e);
! }
}
! }
! if (instance == null){
! // check for 1 arg constructor
! for (int i=0; i<ctors.length; i++){
! parmTypes = ctors[i].getParameterTypes();
! if (parmTypes.length == 1 && parmTypes[0].equals(_ctorArgs1[0])){
! ctor = ctors[i];
! Object[] args = new Object[1];
! args[0] = key;
! try {
! instance = ctor.newInstance(args);
! }
! catch (Exception e){
! _log.error("Failed to instantiate tool "
! + key + " of class " + className + " using constructor "
! + ctor.toString(), e);
! }
! }
}
}
if (instance == null) {
+ // try no-arg constructor
try {
instance = c.newInstance();
! } catch (Exception e) {
! _log.error("Unable to construct tool " + key + " of class " + className, e);
return;
}
***************
*** 659,665 ****
_log.info("Registered ContextTool " + key);
}
!
!
!
//////////////////////////////////////////////////////////////
--- 663,667 ----
_log.info("Registered ContextTool " + key);
}
!
//////////////////////////////////////////////////////////////
|
|
From: <dr...@us...> - 2002-11-30 23:56:36
|
Update of /cvsroot/webmacro/webmacro
In directory sc8-pr-cvs1:/tmp/cvs-serv16285
Modified Files:
build.xml
Log Message:
- fixing issues with .zip/.tgz file organization (put everything in a subdirectory)
- fix test/build.xml:clean to clean up various .html files that get created during test
- have build.xml:clean call test/build.xml:clean
Index: build.xml
===================================================================
RCS file: /cvsroot/webmacro/webmacro/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** build.xml 27 Nov 2002 04:18:57 -0000 1.29
--- build.xml 30 Nov 2002 23:56:33 -0000 1.30
***************
*** 98,101 ****
--- 98,102 ----
<delete dir="${examples}/WEB-INF"/>
<delete dir="${tmpdir}"/>
+ <ant antfile="test/build.xml" target="unit-clean" />
</target>
***************
*** 154,157 ****
--- 155,160 ----
<target name="dist-binary" depends="prepare,compile,compile-examples,jar,javadoc">
+ <delete dir='${dist.binary}' />
+ <mkdir dir='${dist.binary}' />
<copy todir="${dist.binary}" file="${jar}"/>
<copy todir="${dist.binary}">
***************
*** 179,182 ****
--- 182,187 ----
<target name="dist-source" depends="prepare">
+ <delete dir='${dist.source}' />
+ <mkdir dir='${dist.source}' />
<copy todir="${dist.source}">
<fileset dir="distroot" />
***************
*** 192,196 ****
<mkdir dir="${dist.source}/test" />
<copy todir="${dist.source}/test">
! <fileset dir="test" />
</copy>
--- 197,201 ----
<mkdir dir="${dist.source}/test" />
<copy todir="${dist.source}/test">
! <fileset dir="test" includes='perf,unit' />
</copy>
***************
*** 215,231 ****
</target>
! <target name='release' depends='clean,test,dist-binary,dist-source'>
! <zip destfile='${dist.binary}.zip' basedir='${dist.binary}' />
! <zip destfile='${dist.source}.zip' basedir='${dist.source}' />
!
! <tar destfile='${dist.binary}.tar' basedir='${dist.binary}' />
! <gzip zipfile='${dist.binary}.tgz' src='${dist.binary}.tar' />
! <delete file='${dist.binary}.tar' />
!
! <tar destfile='${dist.source}.tar' basedir='${dist.source}' />
! <gzip zipfile='${dist.source}.tgz' src='${dist.source}.tar' />
! <delete file='${dist.source}.tar' />
</target>
<!--
--- 220,232 ----
</target>
+ <target name='zip.and.tar' depends='dist-binary,dist-source'>
+ <zip destfile='${dist.binary}.zip' basedir='.' includes='${dist.binary}/**/*' />
+ <zip destfile='${dist.source}.zip' basedir='.' includes='${dist.source}/**/*' />
! <tar destfile='${dist.binary}.tgz' longfile='gnu' compression='gzip' basedir='.' includes='${dist.binary}/**/*' />
! <tar destfile='${dist.source}.tgz' longfile='gnu' compression='gzip' basedir='.' includes='${dist.source}/**/*' />
</target>
+
+ <target name='release' depends='clean,test,dist-binary,dist-source,zip.and.tar' />
<!--
|
|
From: <dr...@us...> - 2002-11-30 23:56:36
|
Update of /cvsroot/webmacro/webmacro/test
In directory sc8-pr-cvs1:/tmp/cvs-serv16285/test
Modified Files:
build.xml
Log Message:
- fixing issues with .zip/.tgz file organization (put everything in a subdirectory)
- fix test/build.xml:clean to clean up various .html files that get created during test
- have build.xml:clean call test/build.xml:clean
Index: build.xml
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** build.xml 25 Nov 2002 05:12:32 -0000 1.7
--- build.xml 30 Nov 2002 23:56:33 -0000 1.8
***************
*** 29,32 ****
--- 29,36 ----
<delete dir="${unit.classes}"/>
<delete dir="${unit.reports}"/>
+ <delete file='LoadReport.html' />
+ <delete file='LoadReport.html' />
+ <delete file='PerformanceReport.html' />
+ <delete file='ecomm.html' />
</target>
|
|
From: <dr...@us...> - 2002-11-27 07:06:35
|
Update of /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/renderer
In directory sc8-pr-cvs1:/tmp/cvs-serv18187/src/org/tcdi/opensource/wiki/renderer
Modified Files:
HTMLPageRenderer.java TextPageRenderer.java
WikiPageRenderer.java
Log Message:
- make build.xml understand javacc so it can regen the parser
- added parser,builder,renderer support for bulleted lists.
- removed some debug output in SavePageAction.java
Index: HTMLPageRenderer.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/renderer/HTMLPageRenderer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** HTMLPageRenderer.java 5 Jan 2002 19:51:09 -0000 1.5
--- HTMLPageRenderer.java 27 Nov 2002 07:06:32 -0000 1.6
***************
*** 255,260 ****
protected String renderParagraphBreak() {
return "<br><br>";
! }
!
/**
* replace all occurrences of 'from' to 'to' in 'src'
--- 255,272 ----
protected String renderParagraphBreak() {
return "<br><br>";
! }
!
! protected String renderStartList() {
! return "<ul>";
! }
!
! protected String renderListItem() {
! return "<li>";
! }
!
! protected String renderEndList() {
! return "</ul>";
! }
!
/**
* replace all occurrences of 'from' to 'to' in 'src'
***************
*** 263,267 ****
* @param from substring that needs to be replaced
* @param to string to replace 'from' with
! * @returns String with all occurrences of 'from' replaced with 'to' or 'src' if 'from' not found
*/
private static final String replace (String src, String from, String to)
--- 275,279 ----
* @param from substring that needs to be replaced
* @param to string to replace 'from' with
! * @return String with all occurrences of 'from' replaced with 'to' or 'src' if 'from' not found
*/
private static final String replace (String src, String from, String to)
Index: TextPageRenderer.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/renderer/TextPageRenderer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TextPageRenderer.java 7 Nov 2002 18:15:27 -0000 1.4
--- TextPageRenderer.java 27 Nov 2002 07:06:32 -0000 1.5
***************
*** 159,163 ****
return "";
}
!
protected String renderLineBreak() {
return System.getProperty ("line.separator");
--- 159,175 ----
return "";
}
!
! protected String renderStartList() {
! return "\n";
! }
!
! protected String renderListItem() {
! return "* ";
! }
!
! protected String renderEndList() {
! return "";
! }
!
protected String renderLineBreak() {
return System.getProperty ("line.separator");
Index: WikiPageRenderer.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/renderer/WikiPageRenderer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** WikiPageRenderer.java 5 Jan 2002 20:35:45 -0000 1.4
--- WikiPageRenderer.java 27 Nov 2002 07:06:32 -0000 1.5
***************
*** 50,55 ****
* Default implementes for rendering to Text and HTML are provided.
*
! * @see com.tcdi.opensource.wiki.renderer.TextPageRenderer
! * @see com.tcdi.opensource.wiki.renderer.HTMLPageRenderer
* @author e_ridge
*/
--- 50,55 ----
* Default implementes for rendering to Text and HTML are provided.
*
! * @see org.tcdi.opensource.wiki.renderer.TextPageRenderer
! * @see org.tcdi.opensource.wiki.renderer.HTMLPageRenderer
* @author e_ridge
*/
***************
*** 157,161 ****
str = _urlRenderer.renderURL (data);
break;
!
// @deprecated "image" is now a URL type.
case WikiDataTypes.IMAGE:
--- 157,173 ----
str = _urlRenderer.renderURL (data);
break;
!
! case WikiDataTypes.START_LIST:
! str = renderStartList();
! break;
!
! case WikiDataTypes.LI:
! str = renderListItem();
! break;
!
! case WikiDataTypes.END_LIST:
! str = renderEndList();
! break;
!
// @deprecated "image" is now a URL type.
case WikiDataTypes.IMAGE:
***************
*** 227,232 ****
protected abstract String renderGT ();
protected abstract String renderUnknown (WikiData data);
!
!
protected abstract String renderBoldStart ();
protected abstract String renderBoldEnd ();
--- 239,247 ----
protected abstract String renderGT ();
protected abstract String renderUnknown (WikiData data);
!
! protected abstract String renderStartList();
! protected abstract String renderListItem();
! protected abstract String renderEndList();
!
protected abstract String renderBoldStart ();
protected abstract String renderBoldEnd ();
|
|
From: <dr...@us...> - 2002-11-27 07:06:35
|
Update of /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv18187/src/org/tcdi/opensource/wiki/servlet
Modified Files:
SavePageAction.java
Log Message:
- make build.xml understand javacc so it can regen the parser
- added parser,builder,renderer support for bulleted lists.
- removed some debug output in SavePageAction.java
Index: SavePageAction.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/servlet/SavePageAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SavePageAction.java 5 Jan 2002 20:27:29 -0000 1.3
--- SavePageAction.java 27 Nov 2002 07:06:32 -0000 1.4
***************
*** 97,105 ****
// create the page
- System.err.println ("pageName: " + pageName);
WikiPage newPage = wiki.createPage (pageName, editor, text);
newPage.setRelatedTitles (keywordsToStringArray(keywords));
newPage.setIsModerated(moderated);
! System.err.println ("pageName: " + newPage.getTitle());
// make sure to save the page
wiki.savePage (newPage);
--- 97,104 ----
// create the page
WikiPage newPage = wiki.createPage (pageName, editor, text);
newPage.setRelatedTitles (keywordsToStringArray(keywords));
newPage.setIsModerated(moderated);
!
// make sure to save the page
wiki.savePage (newPage);
|
|
From: <dr...@us...> - 2002-11-27 07:06:35
|
Update of /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/parser
In directory sc8-pr-cvs1:/tmp/cvs-serv18187/src/org/tcdi/opensource/wiki/parser
Modified Files:
WikiParser.java WikiParserConstants.java
WikiParserTokenManager.java wiki.jj
Log Message:
- make build.xml understand javacc so it can regen the parser
- added parser,builder,renderer support for bulleted lists.
- removed some debug output in SavePageAction.java
Index: WikiParser.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/parser/WikiParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** WikiParser.java 5 Jan 2002 19:51:09 -0000 1.4
--- WikiParser.java 27 Nov 2002 07:06:32 -0000 1.5
***************
*** 46,49 ****
--- 46,56 ----
import org.tcdi.opensource.wiki.builder.*;
+ /**
+ * Parse text that contains WMWiki-style syntax into a WikiPage that can be rendered
+ * using any org.tcdi.opensource.wiki.WikiPageRenderer implementation.
+ *
+ * @author eric b. ridge
+ * @author Christian Aust (<li> support, bugfixes)
+ */
public class WikiParser implements WikiParserConstants {
private String _headerName = null;
***************
*** 61,64 ****
--- 68,72 ----
case LT:
case GT:
+ case LI:
case COLOR:
case HEADER:
***************
*** 94,97 ****
--- 102,109 ----
builder.gt();
break;
+ case LI:
+ t = jj_consume_token(LI);
+ builder.li();
+ break;
case BOLD:
t = jj_consume_token(BOLD);
***************
*** 224,229 ****
private int jj_gen;
final private int[] jj_la1 = new int[2];
! final private int[] jj_la1_0 = {0xfffffe00,0xfffffe00,};
! final private int[] jj_la1_1 = {0x1,0x1,};
public WikiParser(java.io.InputStream stream) {
--- 236,241 ----
private int jj_gen;
final private int[] jj_la1 = new int[2];
! final private int[] jj_la1_0 = {0xfffffc00,0xfffffc00,};
! final private int[] jj_la1_1 = {0x7,0x7,};
public WikiParser(java.io.InputStream stream) {
***************
*** 323,328 ****
final public ParseException generateParseException() {
jj_expentries.removeAllElements();
! boolean[] la1tokens = new boolean[33];
! for (int i = 0; i < 33; i++) {
la1tokens[i] = false;
}
--- 335,340 ----
final public ParseException generateParseException() {
jj_expentries.removeAllElements();
! boolean[] la1tokens = new boolean[35];
! for (int i = 0; i < 35; i++) {
la1tokens[i] = false;
}
***************
*** 343,347 ****
}
}
! for (int i = 0; i < 33; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
--- 355,359 ----
}
}
! for (int i = 0; i < 35; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
Index: WikiParserConstants.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/parser/WikiParserConstants.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** WikiParserConstants.java 30 Sep 2001 08:28:29 -0000 1.1.1.1
--- WikiParserConstants.java 27 Nov 2002 07:06:32 -0000 1.2
***************
*** 49,80 ****
int TAB = 3;
int ALPHANUM = 4;
! int URLCHARS = 5;
! int UCASE_ALPHANUM = 6;
! int LCASE_ALPHANUM = 7;
! int NON_ALPHANUM = 8;
! int QUOTED_BLOCK = 9;
! int BOLD = 10;
! int UNDERLINE = 11;
! int ITALIC = 12;
! int LT = 13;
! int GT = 14;
! int COLOR = 15;
! int HEADER = 16;
! int COLOR_HEADER_TERMINATE = 17;
! int RULE = 18;
! int EMAIL = 19;
! int URL = 20;
! int WIKI_TERM = 21;
! int SHORT_WIKI_TERM = 22;
! int WORD = 23;
! int NEW_PARAGRAPH = 24;
! int LINE_BREAK = 25;
! int INDENT = 26;
! int WHITESPACE = 27;
! int ASTERISK = 28;
! int UNDERSCORE = 29;
! int CARET = 30;
! int DOUBLE_LBRACKET = 31;
! int DELIMITERS = 32;
int DEFAULT = 0;
--- 49,82 ----
int TAB = 3;
int ALPHANUM = 4;
! int MAILCHARS = 5;
! int URLCHARS = 6;
! int UCASE_ALPHANUM = 7;
! int LCASE_ALPHANUM = 8;
! int NON_ALPHANUM = 9;
! int QUOTED_BLOCK = 10;
! int BOLD = 11;
! int UNDERLINE = 12;
! int ITALIC = 13;
! int LT = 14;
! int GT = 15;
! int LI = 16;
! int COLOR = 17;
! int HEADER = 18;
! int COLOR_HEADER_TERMINATE = 19;
! int RULE = 20;
! int EMAIL = 21;
! int URL = 22;
! int WIKI_TERM = 23;
! int SHORT_WIKI_TERM = 24;
! int WORD = 25;
! int NEW_PARAGRAPH = 26;
! int LINE_BREAK = 27;
! int INDENT = 28;
! int WHITESPACE = 29;
! int ASTERISK = 30;
! int UNDERSCORE = 31;
! int CARET = 32;
! int DOUBLE_LBRACKET = 33;
! int DELIMITERS = 34;
int DEFAULT = 0;
***************
*** 86,89 ****
--- 88,92 ----
"\"\\t\"",
"<ALPHANUM>",
+ "<MAILCHARS>",
"<URLCHARS>",
"<UCASE_ALPHANUM>",
***************
*** 96,99 ****
--- 99,103 ----
"\"<\"",
"\">\"",
+ "<LI>",
"<COLOR>",
"<HEADER>",
Index: WikiParserTokenManager.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/parser/WikiParserTokenManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** WikiParserTokenManager.java 24 Oct 2002 16:23:37 -0000 1.3
--- WikiParserTokenManager.java 27 Nov 2002 07:06:32 -0000 1.4
***************
*** 54,122 ****
{
case 0:
! if ((active0 & 0x40000L) != 0L)
{
! jjmatchedKind = 32;
! return -1;
}
! if ((active0 & 0x40020000L) != 0L)
! return 10;
! if ((active0 & 0x80000000L) != 0L)
[...1249 lines suppressed...]
"DEFAULT",
};
private SimpleCharStream input_stream;
! private final int[] jjrounds = new int[53];
! private final int[] jjstateSet = new int[106];
protected char curChar;
public WikiParserTokenManager(SimpleCharStream stream)
***************
*** 855,859 ****
int i;
jjround = 0x80000001;
! for (i = 48; i-- > 0;)
jjrounds[i] = 0x80000000;
}
--- 886,890 ----
int i;
jjround = 0x80000001;
! for (i = 53; i-- > 0;)
jjrounds[i] = 0x80000000;
}
Index: wiki.jj
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/parser/wiki.jj,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wiki.jj 24 Oct 2002 16:23:38 -0000 1.6
--- wiki.jj 27 Nov 2002 07:06:32 -0000 1.7
***************
*** 48,51 ****
--- 48,58 ----
import org.tcdi.opensource.wiki.builder.*;
+ /**
+ * Parse text that contains WMWiki-style syntax into a WikiPage that can be rendered
+ * using any org.tcdi.opensource.wiki.WikiPageRenderer implementation.
+ *
+ * @author eric b. ridge
+ * @author Christian Aust (<li> support, bugfixes)
+ */
public class WikiParser {
private String _headerName = null;
***************
*** 60,63 ****
--- 67,71 ----
| < #TAB: "\t" >
| < #ALPHANUM: ["a"-"z", "A"-"Z", "0"-"9"] >
+ | < #MAILCHARS: <ALPHANUM> | [".", "_", "-"] >
| < #URLCHARS: <ALPHANUM> | ["/", ".", "?", "&", "%", "~", ":", "_", "-", "@", "=" ] >
| < #UCASE_ALPHANUM: ["A"-"Z", "0"-"9"] >
***************
*** 75,83 ****
| < LT: "<" >
| < GT: ">" >
| < COLOR: "^" (<ALPHANUM>)+ >
| < HEADER: "^@" (<ALPHANUM>)* >
| < COLOR_HEADER_TERMINATE: "^" >
| < RULE: "-----" >
! | < EMAIL: (<ALPHANUM>)+ "@" ((<ALPHANUM>)+ "." (<ALPHANUM>)+)+ >
| < URL: ((<ALPHANUM>)+ ":") ((<URLCHARS>)+ | ((<URLCHARS>)+ ( "(" (~[")", "\r", "\n"])+ ")" ))) >
| < WIKI_TERM: ((<UCASE_ALPHANUM>)+ (<LCASE_ALPHANUM>)+ (<UCASE_ALPHANUM>)*)+ >
--- 83,92 ----
| < LT: "<" >
| < GT: ">" >
+ | < LI: (<NL>)+ "-" (<WHITESPACE>)+ >
| < COLOR: "^" (<ALPHANUM>)+ >
| < HEADER: "^@" (<ALPHANUM>)* >
| < COLOR_HEADER_TERMINATE: "^" >
| < RULE: "-----" >
! | < EMAIL: (<MAILCHARS>)+ "@" ((<ALPHANUM>)+ "." (<ALPHANUM>)+)+ >
| < URL: ((<ALPHANUM>)+ ":") ((<URLCHARS>)+ | ((<URLCHARS>)+ ( "(" (~[")", "\r", "\n"])+ ")" ))) >
| < WIKI_TERM: ((<UCASE_ALPHANUM>)+ (<LCASE_ALPHANUM>)+ (<UCASE_ALPHANUM>)*)+ >
***************
*** 100,103 ****
--- 109,113 ----
t = <LT> { builder.lt(); }
| t = <GT> { builder.gt(); }
+ | t = <LI> { builder.li(); }
| t = <BOLD> { builder.bold(); }
| t = <UNDERLINE> { builder.underline(); }
|
|
From: <dr...@us...> - 2002-11-27 07:06:35
|
Update of /cvsroot/webmacro/wiki
In directory sc8-pr-cvs1:/tmp/cvs-serv18187
Modified Files:
build.xml
Log Message:
- make build.xml understand javacc so it can regen the parser
- added parser,builder,renderer support for bulleted lists.
- removed some debug output in SavePageAction.java
Index: build.xml
===================================================================
RCS file: /cvsroot/webmacro/wiki/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** build.xml 15 Oct 2001 06:39:57 -0000 1.8
--- build.xml 27 Nov 2002 07:06:31 -0000 1.9
***************
*** 1,2 ****
--- 1,5 ----
+ <!--
+ set the JAVACC_HOME environment variable to where you installed JavaCC
+ -->
<project name="wiki" default="compile" basedir=".">
<property name="app.name" value="wiki" />
***************
*** 4,9 ****
--- 7,16 ----
<property name="dir.src" value="./src" />
<property name="dir.lib" value="./lib" />
+ <property environment='ENV' />
<property name="file.jar" value="./wiki.jar" />
+ <property name="javacc.home" value="${ENV.JAVACC_HOME}" />
+
+ <taskdef name="javacc" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC" />
<path id="path.class">
***************
*** 16,28 ****
<target name="prepare">
<mkdir dir="${dir.class}" />
</target>
! <target name="clean">
<delete dir="${dir.class}" />
<delete file="${file.jar}" />
</target>
! <target name="compile" depends="prepare">
<javac destdir="${dir.class}"
debug="on"
--- 23,43 ----
<target name="prepare">
+ <available property="javacc.present" classname="COM.sun.labs.javacc.Main"
+ classpath="${javacc.home}/JavaCC.zip" />
+
<mkdir dir="${dir.class}" />
</target>
! <target name="clean">
<delete dir="${dir.class}" />
<delete file="${file.jar}" />
</target>
! <target name="precompile" depends="prepare" if='javacc.present'>
! <javacc target="src/org/tcdi/opensource/wiki/parser/wiki.jj"
! javacchome="${javacc.home}" />
! </target>
!
! <target name="compile" depends="prepare,precompile">
<javac destdir="${dir.class}"
debug="on"
***************
*** 36,40 ****
<target name="jar" depends="prepare,compile">
! <jar jarfile="${file.jar}"
basedir="${dir.class}"
/>
--- 51,55 ----
<target name="jar" depends="prepare,compile">
! <jar jarfile="${file.jar}"
basedir="${dir.class}"
/>
***************
*** 49,53 ****
<target name="install" depends="verify.dir.install,verify.site.name,prepare,compile,jar">
! <ant antfile="build.xml"
inheritAll="false"
dir="builds/${site.name}/">
--- 64,68 ----
<target name="install" depends="verify.dir.install,verify.site.name,prepare,compile,jar">
! <ant antfile="build.xml"
inheritAll="false"
dir="builds/${site.name}/">
|
|
From: <dr...@us...> - 2002-11-27 07:06:35
|
Update of /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki
In directory sc8-pr-cvs1:/tmp/cvs-serv18187/src/org/tcdi/opensource/wiki
Modified Files:
WikiDataTypes.java
Log Message:
- make build.xml understand javacc so it can regen the parser
- added parser,builder,renderer support for bulleted lists.
- removed some debug output in SavePageAction.java
Index: WikiDataTypes.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/WikiDataTypes.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** WikiDataTypes.java 30 Sep 2001 08:28:27 -0000 1.1.1.1
--- WikiDataTypes.java 27 Nov 2002 07:06:32 -0000 1.2
***************
*** 98,102 ****
public static final int START_QUOTE = 100;
public static final int END_QUOTE = 101;
!
public static final int EMAIL = 200;
public static final int QUOTED_BLOCK = 201;
--- 98,106 ----
public static final int START_QUOTE = 100;
public static final int END_QUOTE = 101;
!
! public final static int START_LIST = 110;
! public final static int LI = 111;
! public final static int END_LIST = 112;
!
public static final int EMAIL = 200;
public static final int QUOTED_BLOCK = 201;
|
|
From: <dr...@us...> - 2002-11-27 07:06:34
|
Update of /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/builder
In directory sc8-pr-cvs1:/tmp/cvs-serv18187/src/org/tcdi/opensource/wiki/builder
Modified Files:
DefaultPageBuilder.java WikiPageBuilder.java
Log Message:
- make build.xml understand javacc so it can regen the parser
- added parser,builder,renderer support for bulleted lists.
- removed some debug output in SavePageAction.java
Index: DefaultPageBuilder.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/builder/DefaultPageBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DefaultPageBuilder.java 18 Oct 2001 19:10:42 -0000 1.5
--- DefaultPageBuilder.java 27 Nov 2002 07:06:32 -0000 1.6
***************
*** 51,55 ****
public class DefaultPageBuilder implements WikiPageBuilder {
protected WikiTermMatcher _matcher;
! protected boolean _bold, _underline, _italic, _color, _header, _space;
protected String _currentHeader = null;
protected StringBuffer _text = new StringBuffer ();
--- 51,55 ----
public class DefaultPageBuilder implements WikiPageBuilder {
protected WikiTermMatcher _matcher;
! protected boolean _bold, _underline, _italic, _color, _header, _space, _list;
protected String _currentHeader = null;
protected StringBuffer _text = new StringBuffer ();
***************
*** 91,95 ****
_currentData.setType (WikiDataTypes.LT);
}
!
public void underline() {
newData ();
--- 91,105 ----
_currentData.setType (WikiDataTypes.LT);
}
!
! public void li() {
! if (!_list) {
! newData();
! _currentData.setType(WikiDataTypes.START_LIST);
! _list = true;
! }
! newData();
! _currentData.setType(WikiDataTypes.LI);
! }
!
public void underline() {
newData ();
***************
*** 159,162 ****
--- 169,178 ----
public void paragraph() {
finishFormatting ();
+ if (_list) {
+ newData();
+ _currentData.setType(WikiDataTypes.END_LIST);
+ _list = false;
+
+ }
newData ();
_currentData.setType (WikiDataTypes.PARAGRAPH_BREAK);
***************
*** 227,233 ****
public void indent(int many) {
! newData();
! _currentData.setType (WikiDataTypes.INDENT);
! _currentData.setData (""+many);
}
--- 243,251 ----
public void indent(int many) {
! if (!_list) {
! newData();
! _currentData.setType (WikiDataTypes.INDENT);
! _currentData.setData (""+many);
! }
}
Index: WikiPageBuilder.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/builder/WikiPageBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** WikiPageBuilder.java 18 Oct 2001 07:02:30 -0000 1.3
--- WikiPageBuilder.java 27 Nov 2002 07:06:32 -0000 1.4
***************
*** 106,110 ****
/** add the greater-than (>) symbol */
public void gt ();
!
/** add a URL */
public void url (String url);
--- 106,113 ----
/** add the greater-than (>) symbol */
public void gt ();
!
! /** a bulleted list item */
! public void li ();
!
/** add a URL */
public void url (String url);
|
|
From: <dr...@us...> - 2002-11-27 06:22:08
|
Update of /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki
In directory sc8-pr-cvs1:/tmp/cvs-serv4980/src/org/tcdi/opensource/wiki
Modified Files:
WikiSystem.java
Log Message:
javadoc cleanup
Index: WikiSystem.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/WikiSystem.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** WikiSystem.java 27 Nov 2002 06:21:41 -0000 1.3
--- WikiSystem.java 27 Nov 2002 06:22:06 -0000 1.4
***************
*** 171,175 ****
/**
! * @param the WikiUser to check for administrator access
* @return true is user is an administrator of this WikiSystem
*/
--- 171,175 ----
/**
! * @param user WikiUser to check for administrator access
* @return true is user is an administrator of this WikiSystem
*/
|
|
From: <dr...@us...> - 2002-11-27 06:21:44
|
Update of /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/servlet/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv4115/src/org/tcdi/opensource/wiki/servlet/admin
Added Files:
AdminAction.java UpdateUserAction.java UserListAction.java
Log Message:
Basic User Administration features.
- list all users
- view/edit/delete individual user
To get the admin options, make sure you're listed as an admin in Wiki.properties
--- NEW FILE: AdminAction.java ---
/*
* Created by IntelliJ IDEA.
* User: e_ridge
* Date: Nov 22, 2002
* Time: 1:15:50 AM
* To change template for new class use
* Code Style | Class Templates options (Tools | IDE Options).
*/
package org.tcdi.opensource.wiki.servlet.admin;
import org.tcdi.opensource.wiki.servlet.PageAction;
import org.tcdi.opensource.wiki.WikiSystem;
import org.tcdi.opensource.wiki.WikiUser;
import org.tcdi.opensource.wiki.WikiPage;
import org.webmacro.servlet.WebContext;
abstract class AdminAction implements PageAction {
protected abstract boolean internalAccept (WikiSystem wiki, WebContext wc, WikiUser user);
public final boolean accept(WikiSystem wiki, WebContext wc, WikiUser user) {
return wc.getRequest().getRequestURI().indexOf("/Admin") > -1 & wiki.isAdministrator(user) & internalAccept (wiki, wc, user);
}
}
--- NEW FILE: UpdateUserAction.java ---
/*
* Created by IntelliJ IDEA.
* User: e_ridge
* Date: Nov 22, 2002
* Time: 1:15:38 AM
* To change template for new class use
* Code Style | Class Templates options (Tools | IDE Options).
*/
package org.tcdi.opensource.wiki.servlet.admin;
import org.tcdi.opensource.wiki.WikiSystem;
import org.tcdi.opensource.wiki.WikiUser;
import org.tcdi.opensource.wiki.WikiPage;
import org.tcdi.opensource.wiki.WikiUtil;
import org.tcdi.opensource.wiki.servlet.PageAction;
import org.webmacro.servlet.WebContext;
public class UpdateUserAction extends AdminAction {
protected boolean internalAccept(WikiSystem wiki, WebContext wc, WikiUser user) {
return wc.getForm("user") != null;
}
public String getWikiPageName(WikiSystem wiki, WebContext wc) {
return "AdminUpdateUser";
}
public void perform(WikiSystem wiki, WebContext wc, WikiUser user, WikiPage page) throws PageAction.PageActionException {
String action = wc.getForm("ACTION");
String username = wc.getForm("user");
WikiUser userToUpdate = wiki.getUser(username);
if (userToUpdate == null)
throw new PageAction.PageActionException (username + " is not a valid user");
if ("Update".equals(action)) {
String password = wc.getForm("password").trim();
String email = wc.getForm("email");
String name = wc.getForm("name");
boolean isModerator = wc.getForm("moderator") != null;
userToUpdate.setName(name);
userToUpdate.setIsModerator(isModerator);
if (password.length() > 0)
userToUpdate.setPassword(WikiUtil.getMD5(password));
userToUpdate.setAttribute("email", email);
wiki.updateUser(userToUpdate);
wc.put ("Saved", Boolean.TRUE);
} else if ("Delete".equals(action)) {
wiki.deleteUser(userToUpdate.getIdentifier());
throw new PageAction.RedirectException("AdminUserList");
}
wc.put("UserToUpdate", userToUpdate);
}
public String getTemplateName(WikiSystem wiki, WikiPage page) {
return "admin/update_user.wm";
}
}
--- NEW FILE: UserListAction.java ---
/*
* Created by IntelliJ IDEA.
* User: e_ridge
* Date: Nov 22, 2002
* Time: 1:11:38 AM
* To change template for new class use
* Code Style | Class Templates options (Tools | IDE Options).
*/
package org.tcdi.opensource.wiki.servlet.admin;
import org.tcdi.opensource.wiki.servlet.PageAction;
import org.tcdi.opensource.wiki.WikiSystem;
import org.tcdi.opensource.wiki.WikiUser;
import org.tcdi.opensource.wiki.WikiPage;
import org.webmacro.servlet.WebContext;
public class UserListAction extends AdminAction {
public boolean internalAccept(WikiSystem wiki, WebContext wc, WikiUser user) {
return true;
}
public String getWikiPageName(WikiSystem wiki, WebContext wc) {
return "AdminUserList";
}
public void perform(WikiSystem wiki, WebContext wc, WikiUser user, WikiPage page) throws PageAction.PageActionException {
// nothing to do here
String prefix = wc.getForm("PREFIX");
if (prefix != null)
user.setAttribute("LastUserListLetter", prefix);
}
public String getTemplateName(WikiSystem wiki, WikiPage page) {
return "admin/user_list.wm";
}
}
|
|
From: <dr...@us...> - 2002-11-27 06:21:44
|
Update of /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv4115/src/org/tcdi/opensource/wiki/servlet
Modified Files:
LoginAction.java WikiServlet.java
Log Message:
Basic User Administration features.
- list all users
- view/edit/delete individual user
To get the admin options, make sure you're listed as an admin in Wiki.properties
Index: LoginAction.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/servlet/LoginAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LoginAction.java 5 Jan 2002 20:27:29 -0000 1.2
--- LoginAction.java 27 Nov 2002 06:21:41 -0000 1.3
***************
*** 105,109 ****
String userid = wc.getForm("username");
String password = wc.getForm("password");
!
if (userid == null || password == null) {
createCookie(wiki, wc, null);
--- 105,109 ----
String userid = wc.getForm("username");
String password = wc.getForm("password");
!
if (userid == null || password == null) {
createCookie(wiki, wc, null);
***************
*** 114,118 ****
if (user == null)
return false; // user not found
!
String userupw = user.getPassword().substring(0, 10);
String authupw = WikiUtil.getMD5 (password).substring(0, 10);
--- 114,118 ----
if (user == null)
return false; // user not found
!
String userupw = user.getPassword().substring(0, 10);
String authupw = WikiUtil.getMD5 (password).substring(0, 10);
***************
*** 122,126 ****
// convert to new md5 form
user.setPassword(WikiUtil.getMD5(password));
! // user.setPassword (password);
wiki.updateUser(user);
}
--- 122,126 ----
// convert to new md5 form
user.setPassword(WikiUtil.getMD5(password));
! // and save back into the user store
wiki.updateUser(user);
}
Index: WikiServlet.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/servlet/WikiServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WikiServlet.java 6 Oct 2001 07:28:46 -0000 1.2
--- WikiServlet.java 27 Nov 2002 06:21:41 -0000 1.3
***************
*** 133,139 ****
// something bad happened while performing the action
// TODO: Handle error and error template ourselves
- _log.error ("Could not perform action", e);
throw new HandlerException (e.toString());
! }
--- 133,141 ----
// something bad happened while performing the action
// TODO: Handle error and error template ourselves
throw new HandlerException (e.toString());
! } finally {
! if (user != null)
! _wiki.updateUser(user);
! }
***************
*** 172,176 ****
user.setAttribute("LastAccessed", new Date().toString());
user.setAttribute("IPAddress", wc.getRequest().getRemoteAddr());
- _wiki.updateUser(user);
}
--- 174,177 ----
|
|
From: <dr...@us...> - 2002-11-27 06:21:44
|
Update of /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki
In directory sc8-pr-cvs1:/tmp/cvs-serv4115/src/org/tcdi/opensource/wiki
Modified Files:
Wiki.java WikiSystem.java WikiUtil.java
Log Message:
Basic User Administration features.
- list all users
- view/edit/delete individual user
To get the admin options, make sure you're listed as an admin in Wiki.properties
Index: Wiki.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/Wiki.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Wiki.java 5 Jan 2002 20:17:41 -0000 1.7
--- Wiki.java 27 Nov 2002 06:21:41 -0000 1.8
***************
*** 184,187 ****
--- 184,219 ----
}
+ public Enumeration getUsers () {
+ return Collections.enumeration(getUserList(null));
+ }
+
+ public Enumeration getUsers(String prefix) {
+ return Collections.enumeration(getUserList(prefix));
+ }
+
+ private List getUserList(String match) {
+ List l = new ArrayList();
+ Enumeration enum = getUserNames();
+ while (enum.hasMoreElements()) {
+ String userName = (String) enum.nextElement();
+ if (userName == null)
+ continue;
+
+ WikiUser user = getUser(userName);
+ if (user == null)
+ continue;
+ if(match == null || match.trim().length()== 0 || match.trim().equals("*") || user.getIdentifier().toLowerCase().startsWith(match.toLowerCase()))
+ l.add (user);
+ }
+ Collections.sort(l, new Comparator() {
+ public int compare(Object o1, Object o2) {
+ WikiUser a = (WikiUser) o1;
+ WikiUser b = (WikiUser) o2;
+ return a.getIdentifier().toLowerCase().compareTo(b.getIdentifier().toLowerCase());
+ }
+ });
+ return l;
+ }
+
public void deleteUser(String uid) {
_userStore.remove(uid);
***************
*** 216,220 ****
return false;
! return _properties.getProperty("Administrators").indexOf(user.getIdentifier() + ";") > -1;
}
--- 248,258 ----
return false;
! String[] admins = org.webmacro.servlet.TextTool.split(_properties.getProperty("Administrators"), ";");
! for (int x=0; x<admins.length; x++) {
! if (admins[x].equals(user.getIdentifier()))
! return true;
! }
!
! return false;
}
Index: WikiSystem.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/WikiSystem.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WikiSystem.java 18 Oct 2001 06:57:17 -0000 1.2
--- WikiSystem.java 27 Nov 2002 06:21:41 -0000 1.3
***************
*** 134,138 ****
*/
public Enumeration getUserNames();
!
/**
* Delete a user from this wiki system
--- 134,149 ----
*/
public Enumeration getUserNames();
!
! /**
! * get an enumeration of all users in the system, sorted by their usernames
! */
! public Enumeration getUsers ();
!
! /**
! * get an enumeration of all users in the system who's username begins with the
! * specified prefix. Use <code>null</code> or <code>*</code> to get all users.
! */
! public Enumeration getUsers (String prefix);
!
/**
* Delete a user from this wiki system
***************
*** 141,145 ****
*/
public void deleteUser(String uid);
!
/**
* Register a new user in this wiki system
--- 152,156 ----
*/
public void deleteUser(String uid);
!
/**
* Register a new user in this wiki system
Index: WikiUtil.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/WikiUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WikiUtil.java 22 Nov 2002 05:37:23 -0000 1.2
--- WikiUtil.java 27 Nov 2002 06:21:41 -0000 1.3
***************
*** 198,200 ****
--- 198,210 ----
return chars;
}
+
+ /**
+ * Convernt an <code>Enumeration</code> into a List.
+ */
+ public static final List enumToList (Enumeration enum) {
+ List l = new ArrayList();
+ while (enum.hasMoreElements())
+ l.add (enum.nextElement());
+ return l;
+ }
}
|
|
From: <dr...@us...> - 2002-11-27 06:21:44
|
Update of /cvsroot/webmacro/wiki/builds/www.webmacro.org/templates/admin In directory sc8-pr-cvs1:/tmp/cvs-serv4115/builds/www.webmacro.org/templates/admin Added Files: update_user.wm user_list.wm Log Message: Basic User Administration features. - list all users - view/edit/delete individual user To get the admin options, make sure you're listed as an admin in Wiki.properties --- NEW FILE: update_user.wm --- #set $PageName = "User Admin" #parse "header.wm" <table border=0 width="100%"> <tr> <td class="LeftMenu" valign=top width="120"> #parse "leftmenu.wm" </td> <td width="8"> </td> <td valign=top> <form method='post' action='AdminUpdateUser'> <input type='hidden' name='user' value='$UserToUpdate.Identifier'> Username: <b>$UserToUpdate.Identifier</b><br> Name: <input type='text' name='name' value='$Text.HTMLEncode($UserToUpdate.Name)' size=45><br> Password: <input type='password' name='password' value=''><br> email: <input type='text' name='email' value='$Text.HTMLEncode($UserToUpdate.Attributes.email)' size=45><br> is moderator? <input type='checkbox' name='moderator' value='true' #if($UserToUpdate.IsModerator){ checked}><p> All Attributes:<br> #foreach $attribute in $UserToUpdate.Attributes.entrySet() { $attribute.Key = $attribute.Value<br> } <input type=button value='Back to User List' onClick='top.location.href="AdminUserList";'> <input type=submit name="ACTION" value='Delete' onClick='return confirm("Are you sure you want to delete this user?");'> <input type=submit name="ACTION" value='Update'> #if ($Saved) { <p align='center'><font color='red'><b>Saved</b></p> } </form> </td> </tr> </table> #parse "footer.wm" --- NEW FILE: user_list.wm --- #set $PageName = "User Admin" #parse "header.wm" <table border=0 width="100%"> <tr> <td class="LeftMenu" valign=top width="120"> #parse "leftmenu.wm" </td> <td width="8"> </td> <td valign=top> #set $prefix=$User.Attribute.LastUserListLetter #if ($Form.PREFIX) { #set $prefix="$Form.PREFIX" } #const $abc = "*ABCDEFGIJKLMNOPQRSTUVWXYZ" #foreach $letter in $abc.toCharArray() indexing $i from 0 { #if ($i>0) { | } #if ($prefix && ("$prefix"=="$letter" || "$prefix"=="" && "$letter"=="*")) { <b>$letter</b> } #else { <a href="$Request.RequestURI?PREFIX=$letter">$letter</a> } } <table border=0> <tr> <th>UID</th> <th>Name</th> <th>email</th> <th nowrap>Last Access</th> <th>Last IP</th> </tr> #alternate $bgcolor through ["#efefef", "#ffffff"] #foreach $user in $Wiki.getUsers($prefix) { <tr bgcolor="$bgcolor"> <td><a href='AdminUpdateUser?user=$Text.URLEncode($user.Identifier)'>#if($user.IsModerator){<font color='red'>}$user.Identifier</a></td> <td>#if($user.Name){$user.Name}</td> <td>#if($user.Attributes.email){$user.Attributes.email}</td> <td nowrap>#if($user.Attributes.lastaccessed){$user.Attributes.lastaccessed}</td> <td>#if($user.Attributes.ipaddress){$user.Attributes.ipaddress}</td> </tr> } </table> </td> </tr> </table> #parse "footer.wm" |
|
From: <dr...@us...> - 2002-11-27 06:21:44
|
Update of /cvsroot/webmacro/wiki/builds/www.webmacro.org/htdocs In directory sc8-pr-cvs1:/tmp/cvs-serv4115/builds/www.webmacro.org/htdocs Modified Files: site-style.css Log Message: Basic User Administration features. - list all users - view/edit/delete individual user To get the admin options, make sure you're listed as an admin in Wiki.properties Index: site-style.css =================================================================== RCS file: /cvsroot/webmacro/wiki/builds/www.webmacro.org/htdocs/site-style.css,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** site-style.css 15 Oct 2001 06:34:36 -0000 1.1 --- site-style.css 27 Nov 2002 06:21:41 -0000 1.2 *************** *** 29,33 **** TD { ! FONT-SIZE: 10.5pt; FONT-FAMILY: Arial } --- 29,33 ---- TD { ! FONT-SIZE: 9.5pt; FONT-FAMILY: Arial } *************** *** 76,80 **** .AdminOptions { ! FONT-SIZE: 7.5pt; COLOR: red } --- 76,80 ---- .AdminOptions { ! FONT-SIZE: 8pt; COLOR: red } *************** *** 87,90 **** --- 87,91 ---- TH { + FONT-SIZE:10.2pt; COLOR: white; BACKGROUND-COLOR: #b596cc |
|
From: <dr...@us...> - 2002-11-27 06:21:44
|
Update of /cvsroot/webmacro/wiki/builds/www.webmacro.org/templates In directory sc8-pr-cvs1:/tmp/cvs-serv4115/builds/www.webmacro.org/templates Modified Files: adminoptionsbar.wm error.wm recentchanges.wm Log Message: Basic User Administration features. - list all users - view/edit/delete individual user To get the admin options, make sure you're listed as an admin in Wiki.properties Index: adminoptionsbar.wm =================================================================== RCS file: /cvsroot/webmacro/wiki/builds/www.webmacro.org/templates/adminoptionsbar.wm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** adminoptionsbar.wm 15 Oct 2001 06:36:20 -0000 1.1 --- adminoptionsbar.wm 27 Nov 2002 06:21:41 -0000 1.2 *************** *** 1,7 **** ! <!--<table border=0 width="100%"> <td align=center> ! <a href="ControllerPage?user_admin=true"><span class="AdminOptions">User Administration</a></span> || ! <a href="ControllerPage?reparse=$PageName"><span class="AdminOptions">Reparse Page</span></a> || ! <a href="ControllerPage?reload_props=$PageName"><span class="AdminOptions">Reload .props</span></a> </td> </table> --- 1,5 ---- ! <table border=0 width="100%"> <td align=center> ! <a href="AdminUserList"><span class="AdminOptions">User Administration</a></span> </td> </table> *************** *** 12,14 **** </tr> </table> - --> \ No newline at end of file --- 10,11 ---- Index: error.wm =================================================================== RCS file: /cvsroot/webmacro/wiki/builds/www.webmacro.org/templates/error.wm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** error.wm 15 Oct 2001 06:36:20 -0000 1.1 --- error.wm 27 Nov 2002 06:21:41 -0000 1.2 *************** *** 2,9 **** #parse "header.wm" ! #if ($error.Message){ ! $error.Message ! } #else { ! $error ! } #parse "footer.wm" --- 2,6 ---- #parse "header.wm" ! $error ! #parse "footer.wm" Index: recentchanges.wm =================================================================== RCS file: /cvsroot/webmacro/wiki/builds/www.webmacro.org/templates/recentchanges.wm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** recentchanges.wm 15 Oct 2001 06:36:20 -0000 1.1 --- recentchanges.wm 27 Nov 2002 06:21:41 -0000 1.2 *************** *** 32,37 **** </tr> #foreach $page in $RecentChanges { ! <tr bgcolor="#ffffff"> <td align=left valign=top> <a href="$page.Title">$page.Title</a> --- 32,38 ---- </tr> + #alternate $bgcolor through ["#efefef", "#ffffff"] #foreach $page in $RecentChanges { ! <tr bgcolor="$bgcolor"> <td align=left valign=top> <a href="$page.Title">$page.Title</a> |
|
From: <dr...@us...> - 2002-11-27 06:21:43
|
Update of /cvsroot/webmacro/wiki/builds/www.webmacro.org/etc In directory sc8-pr-cvs1:/tmp/cvs-serv4115/builds/www.webmacro.org/etc Modified Files: Wiki.properties Log Message: Basic User Administration features. - list all users - view/edit/delete individual user To get the admin options, make sure you're listed as an admin in Wiki.properties Index: Wiki.properties =================================================================== RCS file: /cvsroot/webmacro/wiki/builds/www.webmacro.org/etc/Wiki.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Wiki.properties 18 Oct 2001 18:50:27 -0000 1.2 --- Wiki.properties 27 Nov 2002 06:21:41 -0000 1.3 *************** *** 12,15 **** --- 12,17 ---- org.tcdi.opensource.wiki.servlet.RegisterNewUserAction \ org.tcdi.opensource.wiki.servlet.RecentChangesAction \ + org.tcdi.opensource.wiki.servlet.admin.UpdateUserAction \ + org.tcdi.opensource.wiki.servlet.admin.UserListAction \ org.tcdi.opensource.wiki.servlet.ViewPageAction *************** *** 26,33 **** - # cookie options CookieName: WikiUserID ! CookieTimeout: 31536000 --- 28,34 ---- # cookie options CookieName: WikiUserID ! CookieTimeout: 31536000 *************** *** 39,44 **** WebMacro: webmacro.wm - - # Lucene Indexer options LuceneIndexer.IndexDirectory: @INSTALL_DIR@/index/ --- 40,43 ---- *************** *** 49,57 **** # who are the administrators? # administrators are allowed to do user-administration stuff ! Administrators: e_ridge;lane;justin;BrianGoetz; ! # where are javadoc: files located? # this is used by the o.t.o.w.r.HTMLPageRenderer when rendering javadoc: URL's JavaDocRoot: http://www.webmacro.org/api/ --- 48,56 ---- # who are the administrators? # administrators are allowed to do user-administration stuff ! Administrators: e_ridge;lane;justin;BrianGoetz ! # where are javadoc: files located? # this is used by the o.t.o.w.r.HTMLPageRenderer when rendering javadoc: URL's JavaDocRoot: http://www.webmacro.org/api/ |
|
From: <dr...@us...> - 2002-11-27 06:21:43
|
Update of /cvsroot/webmacro/wiki/builds/www.webmacro.org In directory sc8-pr-cvs1:/tmp/cvs-serv4115/builds/www.webmacro.org Modified Files: build.xml Log Message: Basic User Administration features. - list all users - view/edit/delete individual user To get the admin options, make sure you're listed as an admin in Wiki.properties Index: build.xml =================================================================== RCS file: /cvsroot/webmacro/wiki/builds/www.webmacro.org/build.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build.xml 15 Oct 2001 06:37:36 -0000 1.1 --- build.xml 27 Nov 2002 06:21:41 -0000 1.2 *************** *** 30,34 **** <!-- copy our "htdocs" directory to ${dir.install}/deploy --> ! <copy todir="${dir.install}/deploy"> <fileset dir="${dir.htdocs}" /> </copy> --- 30,34 ---- <!-- copy our "htdocs" directory to ${dir.install}/deploy --> ! <copy todir="${dir.install}/deploy" overwrite='true'> <fileset dir="${dir.htdocs}" /> </copy> *************** *** 37,41 **** directory into the WEB-INF/lib directory --> ! <copy todir="${dir.install}/deploy/WEB-INF/lib"> <fileset dir="${dir.wikiroot}/lib/" /> <fileset dir="${dir.wikiroot}" includes="*.jar" /> --- 37,41 ---- directory into the WEB-INF/lib directory --> ! <copy todir="${dir.install}/deploy/WEB-INF/lib" overwrite='true'> <fileset dir="${dir.wikiroot}/lib/" /> <fileset dir="${dir.wikiroot}" includes="*.jar" /> *************** *** 43,48 **** <!-- copy resources.jar into the WEB-INF/lib directory --> ! <copy todir="${dir.install}/deploy/WEB-INF/lib" ! file="${file.resources}" /> <!-- copy files from ${dir.etc} to ${dir.install}/deploy/WEB-INF, --- 43,47 ---- <!-- copy resources.jar into the WEB-INF/lib directory --> ! <copy todir="${dir.install}/deploy/WEB-INF/lib" file="${file.resources}" overwrite='true' /> <!-- copy files from ${dir.etc} to ${dir.install}/deploy/WEB-INF, *************** *** 50,54 **** property --> ! <copy todir="${dir.install}/deploy/WEB-INF"> <fileset dir="${dir.etc}" /> <filterset> --- 49,53 ---- property --> ! <copy todir="${dir.install}/deploy/WEB-INF" overwrite='true'> <fileset dir="${dir.etc}" /> <filterset> |
|
From: <dr...@us...> - 2002-11-27 06:19:59
|
Update of /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/servlet/admin In directory sc8-pr-cvs1:/tmp/cvs-serv3987/admin Log Message: Directory /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/servlet/admin added to the repository |
|
From: <dr...@us...> - 2002-11-27 06:19:22
|
Update of /cvsroot/webmacro/wiki/builds/www.webmacro.org/templates/admin In directory sc8-pr-cvs1:/tmp/cvs-serv3862/admin Log Message: Directory /cvsroot/webmacro/wiki/builds/www.webmacro.org/templates/admin added to the repository |
|
From: <dr...@us...> - 2002-11-27 04:24:55
|
Update of /cvsroot/webmacro/webmacro/distroot In directory sc8-pr-cvs1:/tmp/cvs-serv9855/distroot Modified Files: RELEASE-NOTES Log Message: more words Index: RELEASE-NOTES =================================================================== RCS file: /cvsroot/webmacro/webmacro/distroot/RELEASE-NOTES,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** RELEASE-NOTES 27 Nov 2002 04:18:57 -0000 1.16 --- RELEASE-NOTES 27 Nov 2002 04:24:52 -0000 1.17 *************** *** 42,45 **** --- 42,53 ---- - releases can now be downloaded in binary and/or source form. (eric) + - find out which version of WM you have with this simple command: + java -jar webmacro.jar + + - started a macros/ area to keep useful #macro's (lane) + + - additional unit tests for #macros, parser bugs, and other things (lane, eric) + + Changes Prior to this Release |
|
From: <dr...@us...> - 2002-11-27 04:19:01
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/resource
In directory sc8-pr-cvs1:/tmp/cvs-serv7055/src/org/webmacro/resource
Modified Files:
package.html
Log Message:
preparing for WM1.1b2 release.
- made following targets in build.xml
usage
print words to stdout
this is now the default target
dist-binary
does not include sources, not even webmacro-src.jar
dist-source
does not include binaries, not even javadocs
does include build.xml, examples, tutorial, test-suite
can compile,test, and build another distro from this download
release
build both of the above, and .zip and .tgz 'em
- do token replacement on @BUILD_DATE@ in source tree
- include a manifest in webmacro.jar that allows you to do this:
java -jar webmacro.jar
it gives you the version and the build date
- added more words to release notes
- fixed a javadoc type-o in StaticClassWrapper
- fixed html errors in org/webmacro/resource/package.html
- documented our external dependencies in lib/readme.txt
Index: package.html
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/resource/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** package.html 18 Jun 2001 04:54:22 -0000 1.1
--- package.html 27 Nov 2002 04:18:58 -0000 1.2
***************
*** 1,15 ****
!
What's in this directory:
-- Classes that relate to resources made available in the WebMacro
! system. These classes are modules implemented under the
! com.semiotek.util.ResourceBroker architecture. You will find
database modules, user databases, and other facilities here.
As a user of these classes you will be most interested in these classes:
! All of them. They are all available to you for use via the
WebMacro resource broker.
!
!
--- 1,15 ----
! <html><head></head><body>
What's in this directory:
-- Classes that relate to resources made available in the WebMacro
! system. These classes are modules implemented under the
! com.semiotek.util.ResourceBroker architecture. You will find
database modules, user databases, and other facilities here.
As a user of these classes you will be most interested in these classes:
! All of them. They are all available to you for use via the
WebMacro resource broker.
! </body>
! </html>
|
|
From: <dr...@us...> - 2002-11-27 04:19:01
|
Update of /cvsroot/webmacro/webmacro/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv7055/lib
Added Files:
readme.txt
Log Message:
preparing for WM1.1b2 release.
- made following targets in build.xml
usage
print words to stdout
this is now the default target
dist-binary
does not include sources, not even webmacro-src.jar
dist-source
does not include binaries, not even javadocs
does include build.xml, examples, tutorial, test-suite
can compile,test, and build another distro from this download
release
build both of the above, and .zip and .tgz 'em
- do token replacement on @BUILD_DATE@ in source tree
- include a manifest in webmacro.jar that allows you to do this:
java -jar webmacro.jar
it gives you the version and the build date
- added more words to release notes
- fixed a javadoc type-o in StaticClassWrapper
- fixed html errors in org/webmacro/resource/package.html
- documented our external dependencies in lib/readme.txt
--- NEW FILE: readme.txt ---
This directory contains external dependencies needed
to make WebMacro compile.
If you downloaded the source distribution and want things to compile,
you'll need to download the dependencies yourself. :) They are:
servlet-2.x.jar http://java.sun.com/products/servlet/download.html
If you plan on using the unit tests, you'll also need these:
junit_37.jar http://www.junit.org/
apache-regexp.jar http://jakarta.apache.org/regexp/index.html
If you plan on making changes to the parser, you'll want JavaCC:
http://www.webgain.com/download/javacc/details.html
|
6 messages has been excluded from this view by a project administrator.
