cvs commit: jakarta-commons/daemon/src/native/nt/procrun/apps/prunsrv prunsrv.c
mturk 2004/09/05 00:16:53 Modified:daemon/src/native/nt/procrun/apps/prunsrv prunsrv.c Log: Use return values. Revision ChangesPath 1.7 +18 -7 jakarta-commons/daemon/src/native/nt/procrun/apps/prunsrv/prunsrv.c Index: prunsrv.c === RCS file: /home/cvs/jakarta-commons/daemon/src/native/nt/procrun/apps/prunsrv/prunsrv.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- prunsrv.c 11 Aug 2004 06:36:43 - 1.6 +++ prunsrv.c 5 Sep 2004 07:16:53 - 1.7 @@ -1140,6 +1140,8 @@ void __cdecl main(int argc, char **argv) { +UINT rv = 0; + LPAPXCMDLINE lpCmdline; apxHandleManagerInitialize(); @@ -1149,12 +1151,14 @@ /* Parse the command line */ if ((lpCmdline = apxCmdlineParse(gPool, _options, _commands)) == NULL) { apxLogWrite(APXLOG_MARK_ERROR Invalid command line arguments); +rv = 1; goto cleanup; } apxCmdlineLoadEnvVars(lpCmdline); if (lpCmdline-dwCmdIndex 5 !loadConfiguration(lpCmdline)) { apxLogWrite(APXLOG_MARK_ERROR Load configuration failed); +rv = 2; goto cleanup; } /* Set console handler to capture CTRL events */ @@ -1171,27 +1175,34 @@ redirectStdStreams(gStdwrap); switch (lpCmdline-dwCmdIndex) { case 1: /* Run Service as console application */ -docmdDebugService(lpCmdline); +if (!docmdDebugService(lpCmdline)) +rv = 3; break; case 2: /* Run Service */ -docmdRunService(lpCmdline); +if (!docmdRunService(lpCmdline)) +rv = 4; break; case 3: /* Stop Service */ -docmdStopService(lpCmdline); +if (!docmdStopService(lpCmdline)) +rv = 5; break; case 4: /* Update Service parameters */ -docmdUpdateService(lpCmdline); +if (!docmdUpdateService(lpCmdline)) +rv = 6; break; case 5: /* Install Service */ -docmdInstallService(lpCmdline); +if (!docmdInstallService(lpCmdline)) +rv = 7; break; case 6: /* Delete Service */ -docmdDeleteService(lpCmdline); +if (!docmdDeleteService(lpCmdline)) +rv = 8; break; default: /* Unknow command option */ apxLogWrite(APXLOG_MARK_ERROR Unknown command line option); printUsage(lpCmdline); +rv = 99; break; } @@ -1202,5 +1213,5 @@ apxLogClose(NULL); apxHandleManagerDestroy(); cleanupStdStreams(gStdwrap); -ExitProcess(0); +ExitProcess(rv); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/daemon/src/native/nt/procrun/apps/prunmgr prunmgr.c
mturk 2004/09/05 00:55:00 Modified:daemon/src/native/nt/procrun/apps/prunmgr prunmgr.c Log: Display taskbar entry if not started from try. Revision ChangesPath 1.4 +1 -1 jakarta-commons/daemon/src/native/nt/procrun/apps/prunmgr/prunmgr.c Index: prunmgr.c === RCS file: /home/cvs/jakarta-commons/daemon/src/native/nt/procrun/apps/prunmgr/prunmgr.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- prunmgr.c 25 Jun 2004 10:25:28 - 1.3 +++ prunmgr.c 5 Sep 2004 07:55:00 - 1.4 @@ -1414,7 +1414,7 @@ psH.dwSize = sizeof(PROPSHEETHEADER); psH.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK | PSH_NOCONTEXTHELP; -psH.hwndParent = hWnd; +psH.hwndParent = bEnableTry ? hWnd : NULL; psH.hInstance= _gui_store-hInstance; psH.pszIcon = MAKEINTRESOURCEW(IDI_MAINICON); psH.pszCaption = szT; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jexl/xdocs/reference syntax.xml
dion2004/09/05 02:00:56 Modified:jexl/xdocs/reference syntax.xml Log: Docs on ant-style properties Revision ChangesPath 1.12 +9 -0 jakarta-commons/jexl/xdocs/reference/syntax.xml Index: syntax.xml === RCS file: /home/cvs/jakarta-commons/jexl/xdocs/reference/syntax.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- syntax.xml23 Aug 2004 00:55:09 - 1.11 +++ syntax.xml5 Sep 2004 09:00:55 - 1.12 @@ -57,6 +57,15 @@ liValid: codevar1/code,code_a99/code,code$1/code/li liInvalid: code9v/code,code!a99/code,code1$/code/li /ul +p + JEXL also supports codeant-style/code variables, e.g. sourcemy.dotted.var/source + is a valid variable name. +/p +p + strongNOTE:/strong JEXL does not support variables with hyphens in them, e.g. + sourcecommons-logging/source is not a valid variable, but instead is treated as a + subtraction of the variable codelogging/code from the variable codecommons/code +/p /td /tr tr - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jexl project.xml
dion2004/09/05 03:47:01 Modified:jexl project.xml Log: add me as a developer Revision ChangesPath 1.25 +14 -8 jakarta-commons/jexl/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/jexl/project.xml,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- project.xml 1 Sep 2004 00:38:43 - 1.24 +++ project.xml 5 Sep 2004 10:47:01 - 1.25 @@ -79,16 +79,22 @@ branches/ developers developer + namedIon Gillard/name + iddion/id + email[EMAIL PROTECTED]/email + organizationApache Software Foundation/organization +/developer +developer nameGeir Magnusson Jr./name idgeirm/id email[EMAIL PROTECTED]/email organizationindependent/organization /developer developer - nameJames Strachan/name - idjstrachan/id - email[EMAIL PROTECTED]/email - organizationSpiritSoft, Inc./organization + nameTim O'Brien/name + idtobrien/id + email[EMAIL PROTECTED]/email + organizationindependent/organization /developer developer namePeter Royal/name @@ -97,10 +103,10 @@ organizationPace Systems Group, Inc./organization /developer developer - nameTim O'Brien/name - idtobrien/id - email[EMAIL PROTECTED]/email - organizationindependent/organization + nameJames Strachan/name + idjstrachan/id + email[EMAIL PROTECTED]/email + organizationSpiritSoft, Inc./organization /developer /developers dependencies - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/java/org/apache/commons/jelly JellyContext.java
dion2004/09/05 04:14:23 Modified:jelly/src/java/org/apache/commons/jelly JellyContext.java Log: Factor out constant Revision ChangesPath 1.55 +9 -7 jakarta-commons/jelly/src/java/org/apache/commons/jelly/JellyContext.java Index: JellyContext.java === RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/JellyContext.java,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- JellyContext.java 30 Aug 2004 02:16:37 - 1.54 +++ JellyContext.java 5 Sep 2004 11:14:23 - 1.55 @@ -88,7 +88,9 @@ */ protected boolean useContextClassLoader = false; - +/** String used to denote a script can't be parsed */ +private static final String BAD_PARSE = Could not parse Jelly script; + public JellyContext() { this.currentURL = rootURL; init(); @@ -440,9 +442,9 @@ try { script = parser.parse(in); } catch (IOException e) { -throw new JellyException(Could not parse Jelly script,e); +throw new JellyException(JellyContext.BAD_PARSE, e); } catch (SAXException e) { -throw new JellyException(Could not parse Jelly script,e); +throw new JellyException(JellyContext.BAD_PARSE, e); } return script.compile(); @@ -460,9 +462,9 @@ try { script = parser.parse(url.toString()); } catch (IOException e) { -throw new JellyException(Could not parse Jelly script,e); +throw new JellyException(JellyContext.BAD_PARSE, e); } catch (SAXException e) { -throw new JellyException(Could not parse Jelly script,e); +throw new JellyException(JellyContext.BAD_PARSE, e); } return script.compile(); @@ -480,9 +482,9 @@ try { script = parser.parse(source); } catch (IOException e) { -throw new JellyException(Could not parse Jelly script,e); +throw new JellyException(JellyContext.BAD_PARSE, e); } catch (SAXException e) { -throw new JellyException(Could not parse Jelly script,e); +throw new JellyException(JellyContext.BAD_PARSE, e); } return script.compile(); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression CompositeExpression.java
dion2004/09/05 04:14:46 Modified:jelly/src/java/org/apache/commons/jelly/expression CompositeExpression.java Log: Remove unused variable Revision ChangesPath 1.11 +0 -8 jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/CompositeExpression.java Index: CompositeExpression.java === RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/CompositeExpression.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- CompositeExpression.java 29 Aug 2004 13:20:54 - 1.10 +++ CompositeExpression.java 5 Sep 2004 11:14:46 - 1.11 @@ -124,11 +124,8 @@ while(curlen) { c = text.charAt(cur); -boolean escape = false; - switch ( c ) { case('\\'): -escape = true; ++cur; expr.append(c); break; @@ -137,7 +134,6 @@ expr.append(c); break DOUBLE_QUOTE; default: -escape=false; ++cur; expr.append(c); } // switch @@ -151,11 +147,8 @@ while(curlen) { c = text.charAt(cur); -boolean escape = false; - switch ( c ) { case('\\'): -escape = true; ++cur; expr.append(c); break; @@ -164,7 +157,6 @@ expr.append(c); break SINGLE_QUOTE; default: -escape=false; ++cur; expr.append(c); } // switch - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression ExpressionSupport.java
dion2004/09/05 04:35:45 Modified:jelly/src/java/org/apache/commons/jelly/expression ExpressionSupport.java Log: Simplify code Revision ChangesPath 1.14 +4 -11 jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/ExpressionSupport.java Index: ExpressionSupport.java === RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/ExpressionSupport.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ExpressionSupport.java31 Aug 2004 04:55:02 - 1.13 +++ ExpressionSupport.java5 Sep 2004 11:35:45 - 1.14 @@ -77,20 +77,13 @@ // return Boolean.getBoolean( (String) value ); String str = (String) value; -if ( str.equals( on ) +return ( str.equalsIgnoreCase( on ) || - str.equals( yes ) + str.equalsIgnoreCase( yes ) || str.equals( 1 ) || - str.equals( true ) ) -{ -return true; -} -else -{ -return false; -} + str.equalsIgnoreCase( true ) ); } return false; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl DynamicBeanTag.java
dion2004/09/05 04:39:51 Modified:jelly/src/java/org/apache/commons/jelly/impl DynamicBeanTag.java Log: Fix imports Revision ChangesPath 1.15 +0 -4 jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl/DynamicBeanTag.java Index: DynamicBeanTag.java === RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl/DynamicBeanTag.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- DynamicBeanTag.java 24 Feb 2004 14:03:06 - 1.14 +++ DynamicBeanTag.java 5 Sep 2004 11:39:51 - 1.15 @@ -23,17 +23,13 @@ import java.util.Set; import org.apache.commons.beanutils.ConvertingWrapDynaBean; - import org.apache.commons.collections.BeanMap; - import org.apache.commons.jelly.DynaBeanTagSupport; import org.apache.commons.jelly.JellyTagException; import org.apache.commons.jelly.MissingAttributeException; import org.apache.commons.jelly.Tag; import org.apache.commons.jelly.XMLOutput; import org.apache.commons.jelly.expression.Expression; -import org.apache.commons.jelly.impl.BeanSource; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/java/org/apache/commons/jelly TagSupport.java
dion2004/09/05 05:00:25 Modified:jelly/src/java/org/apache/commons/jelly/tags/core FileTag.java jelly/src/java/org/apache/commons/jelly TagSupport.java Log: Pull up escaping of text to TagSupport Revision ChangesPath 1.14 +0 -21 jakarta-commons/jelly/src/java/org/apache/commons/jelly/tags/core/FileTag.java Index: FileTag.java === RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/tags/core/FileTag.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- FileTag.java 24 Feb 2004 14:10:38 - 1.13 +++ FileTag.java 5 Sep 2004 12:00:24 - 1.14 @@ -46,9 +46,6 @@ private boolean prettyPrint; private String encoding; -// should text be escaped - default to true for compatability -private boolean escapeText = true; - public FileTag(){ } @@ -132,24 +129,6 @@ public void setVar(String var) { this.var = var; } - -/** - * Returns whether the body of this tag will be escaped or not. - */ -public boolean isEscapeText() { -return escapeText; -} - -/** - * Sets whether the body of the tag should be escaped as text (so that lt; and gt; are - * escaped as amp;lt; and amp;gt;), which is the default or leave the text as XML. - */ -public void setEscapeText(boolean escapeText) { -this.escapeText = escapeText; -} - -// Implementation methods -//- /** * Writes the body fo this tag to the given Writer 1.31 +21 -5 jakarta-commons/jelly/src/java/org/apache/commons/jelly/TagSupport.java Index: TagSupport.java === RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/TagSupport.java,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- TagSupport.java 12 Aug 2004 05:07:53 - 1.30 +++ TagSupport.java 5 Sep 2004 12:00:24 - 1.31 @@ -46,6 +46,9 @@ protected JellyContext context; +/** whether xml text should be escaped */ +private boolean escapeText = true; + /** * Searches up the parent hierarchy from the given tag * for a Tag of the given type @@ -219,9 +222,7 @@ * @return the text evaluation of the body */ protected String getBodyText() throws JellyTagException { -StringWriter writer = new StringWriter(); -invokeBody(XMLOutput.createXMLOutput(writer)); -return writer.toString(); +return getBodyText(escapeText); } /** @@ -233,7 +234,7 @@ */ protected String getBodyText(boolean shouldEscape) throws JellyTagException { StringWriter writer = new StringWriter(); -invokeBody(XMLOutput.createXMLOutput(writer,shouldEscape)); +invokeBody(XMLOutput.createXMLOutput(writer, shouldEscape)); return writer.toString(); } @@ -291,4 +292,19 @@ } } } + +/** + * Returns whether the body of this tag will be escaped or not. + */ +public boolean isEscapeText() { +return escapeText; +} + +/** + * Sets whether the body of the tag should be escaped as text (so that lt; and gt; are + * escaped as amp;lt; and amp;gt;), which is the default or leave the text as XML. + */ +public void setEscapeText(boolean escapeText) { +this.escapeText = escapeText; +} } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/sql project.xml
dion2004/09/05 05:23:04 Modified:jelly/jelly-tags/sql project.xml Log: Add back JDBC jar to test under 1.3 Revision ChangesPath 1.11 +4 -3 jakarta-commons/jelly/jelly-tags/sql/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/project.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- project.xml 12 Aug 2004 03:40:33 - 1.10 +++ project.xml 5 Sep 2004 12:23:04 - 1.11 @@ -45,11 +45,12 @@ /dependency !-- unneeded at least for java 1.4 -- -!-- dependency - idjdbc/id + groupIdjdbc/groupId + artifactIdjdbc/artifactId version2.0/version -/dependency -- + !-- this is jdbc2_0-stdext.jar -- +/dependency !-- END for compilation -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/test/org/apache/commons/jelly/expression TestExpressions.java
dion2004/09/05 05:28:58 Modified:jelly/src/test/org/apache/commons/jelly/expression TestExpressions.java Log: Ant support is dependent on the 1.0 release of JEXL. Revision ChangesPath 1.14 +2 -4 jakarta-commons/jelly/src/test/org/apache/commons/jelly/expression/TestExpressions.java Index: TestExpressions.java === RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/expression/TestExpressions.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- TestExpressions.java 29 Aug 2004 13:25:42 - 1.13 +++ TestExpressions.java 5 Sep 2004 12:28:58 - 1.14 @@ -88,7 +88,7 @@ } public void testNotConditionsWithDot() throws Exception { -// # re-enable commented out lines once the Jexl sub-resolver work is complete! +// # re-enable commented out lines once the Jexl release is complete! context.setVariable(x.a, Boolean.TRUE); context.setVariable(x.b, Boolean.FALSE); context.setVariable(x.c, true); @@ -106,7 +106,7 @@ } public void testNull() throws Exception { -// # re-enable commented out lines once the Jexl sub-resolver work is complete! +// # re-enable commented out lines once the Jexl release is complete! context.setVariable(something.blank, ); context.setVariable(something.ok, cheese); @@ -122,11 +122,9 @@ Expression expression = CompositeExpression.parse(expressionText, factory); assertTrue( Created a valid expression for: + expressionText, expression != null ); Object value = expression.evaluate(context); -//assertEquals( Expression for: + expressionText + is: + expression, expectedValue, value ); assertEquals( Wrong result for expression: + expressionText, expectedValue, value ); String text = expression.getExpressionText(); assertEquals( Wrong textual representation for expression text: , expressionText, text); } - } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (JELLY-87) jelly can't resolve vars with dots (.) in the name, in function calls
The following comment has been added to this issue: Author: dion gillard Created: Sun, 5 Sep 2004 5:33 AM Body: Waiting on JEXL 1.0 to uncomment stuff in TestExpressions - View this comment: http://issues.apache.org/jira/browse/JELLY-87?page=comments#action_52835 - View the issue: http://issues.apache.org/jira/browse/JELLY-87 Here is an overview of the issue: - Key: JELLY-87 Summary: jelly can't resolve vars with dots (.) in the name, in function calls Type: Bug Status: Open Priority: Major Project: jelly Components: core / taglib.core Fix Fors: 1.0 Versions: 1.0-beta-4 Assignee: dion gillard Reporter: Alexey Krasnoriadtsev Created: Wed, 24 Sep 2003 6:38 PM Updated: Sun, 5 Sep 2004 5:33 AM Environment: ANY Description: [EMAIL PROTECTED]:test]$ cat maven.xml ?xml version=1.0 encoding=ISO-8859-1? project default=mytest xmlns:j=jelly:core xmlns:u=jelly:util xmlns:maven=jelly:maven xmlns:ant=jelly:ant xmlns:i=jelly:interaction goal name=mytest echopom.repository.url: ${pom.repository.url}/echo j:set var=pom.repository.url value= / echoafter setting to empty string ${pom.repository.url}/echo echois empty? ${empty(pom.repository.url)} /echo echolength ${pom.repository.url.length()} /echo echo / j:set var=pom.custom.name value=test here / echopom.cutom.namE: ${pom.custom.name}/echo echois empty? :${empty(pom.custom.name)} /echo echolength ${pom.custom.name.length()} /echo echo / j:set var=customname value=test / echocutomname: ${customname}/echo echois empty? :${empty(customname)} /echo echolength ${customname.length()} /echo echo / j:set var=customname value= / echocutomname: ${customname}/echo echois empty? :${empty(customname)} /echo echolength ${customname.length()} /echo /goal /project [EMAIL PROTECTED]:test]$ maven -X __ __ | \/ |__ _Apache__ ___ | |\/| / _` \ V / -_) ' \ ~ intelligent projects ~ |_| |_\__,_|\_/\___|_||_| v. 1.0-beta-10 [DEBUG] Adding reference: maven.dependency.classpath - /export/tools/maven-1.0-beta-10/repository/ant/jars/ant-1.5.3-1.jar:/export/tools/maven-1.0-beta-10/repository/oracle/jars/classes12-9.2.0.3-1.2.zip [DEBUG] Adding reference: maven-classpath - mytest: [echo] pom.repository.url: [echo] after setting to empty string [echo] is empty? false [echo] length [echo] [echo] pom.cutom.namE: test here [echo] is empty? :false [echo] length [echo] [echo] cutomname: test [echo] is empty? :false [echo] length 4 [echo] [echo] cutomname: [echo] is empty? :true [echo] length 0 BUILD SUCCESSFUL Total time: 7 seconds - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/java/org/apache/commons/jelly JellyContext.java
dion2004/09/05 07:08:17 Modified:jelly/src/java/org/apache/commons/jelly JellyContext.java Log: Some docs and refactor out system property and exception handling Revision ChangesPath 1.56 +39 -14 jakarta-commons/jelly/src/java/org/apache/commons/jelly/JellyContext.java Index: JellyContext.java === RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/JellyContext.java,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- JellyContext.java 5 Sep 2004 11:14:23 - 1.55 +++ JellyContext.java 5 Sep 2004 14:08:17 - 1.56 @@ -90,22 +90,42 @@ /** String used to denote a script can't be parsed */ private static final String BAD_PARSE = Could not parse Jelly script; - + +/** + * Create a new context with the currentURL set to the rootURL + */ public JellyContext() { this.currentURL = rootURL; init(); } +/** + * Create a new context with the given rootURL + * @param rootURL the root URL used in resolving absolute resources i.e. those starting with '/' + */ public JellyContext(URL rootURL) { this( rootURL, rootURL ); } +/** + * Create a new context with the given rootURL and currentURL + * @param rootURL the root URL used in resolving absolute resources i.e. those starting with '/' + * @param currentURL the root URL used in resolving relative resources + */ public JellyContext(URL rootURL, URL currentURL) { this.rootURL = rootURL; this.currentURL = currentURL; init(); } + +/** + * Create a new context with the given parent context. + * The parent's rootURL and currentURL are set on the child, and the parent's variables are + * available in the child context under the name codeparentScope/code. + * + * @param parent the parent context for the newly created context. + */ public JellyContext(JellyContext parent) { this.parent = parent; this.rootURL = parent.rootURL; @@ -130,7 +150,7 @@ try { variables.put(systemScope, System.getProperties() ); } catch (SecurityException e) { - // ignore security exceptions +log.debug(security exception accessing system properties, e); } } @@ -172,12 +192,7 @@ } // ### this is a hack - remove this when we have support for pluggable Scopes if ( answer == null ) { -try { -answer = System.getProperty(name); -} -catch (SecurityException e) { -// ignore security exceptions -} +answer = getSystemProperty(name); } if (log.isDebugEnabled()) { @@ -203,17 +218,27 @@ // ### this is a hack - remove this when we have support for pluggable Scopes if ( value == null ) { -try { -value = System.getProperty(name); -} -catch (SecurityException e) { -// ignore security exceptions -} +value = getSystemProperty(name); } return value; } +/** + * Get a system property and handle security exceptions + * @param name the name of the property to retrieve + * @return the value of the property, or null if a SecurityException occurs + */ +private Object getSystemProperty(String name) { +try { +return System.getProperty(name); +} +catch (SecurityException e) { +log.debug(security exception accessing system properties, e); +} +return null; +} + /** * @return the value of the given variable name in the given variable scope * @param name is the name of the variable - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Bug report for Commons [2004/09/05]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal ENH=Enhancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 6508|Ass|Enh|2002-02-17|HttpClient now supports proxyHost and proxyPort - | | 6826|Ass|Enh|2002-03-04|Need to have xml files validated against DTDs as p| | 6829|Ass|Enh|2002-03-04|Allow easier way of user specified tests | | 7069|Ass|Enh|2002-03-13|DTD and DOM Validators| | 7135|Opn|Enh|2002-03-14|[beanutils] Misleading error message when beaninfo| | 7226|Opn|Enh|2002-03-19|Nested Bean Collection| | 7367|New|Nor|2002-03-22|[unspecified] ServiceManager not actually serializ| | 7465|New|Nor|2002-03-25|Need better 'dist' build | | 7981|Ver|Nor|2002-04-11|[codec][PATCH] add 2 new methods for encoding stri| | 8140|Ver|Nor|2002-04-16|Incorrect credentials loop infinitely | |10319|New|Enh|2002-06-28|Instantiate property if null in form bean | |10793|New|Enh|2002-07-15|User definable default headers support| |10810|New|Enh|2002-07-15|Response handlers | |10813|New|Enh|2002-07-15|RFC 2965 Support (Port sensitive cookies) | |10815|New|Enh|2002-07-15|Instrumentation for Timings | |10825|Opn|Cri|2002-07-15|NullPointException when Logger.getClassLoader retu| |10957|New|Nor|2002-07-18|Change Header/HeaderElement to handle a list as th| |12807|New|Nor|2002-09-19|[PATCH] x 2 Update build.xml to use commons-loggin| |13031|New|Enh|2002-09-26|Use regular expression (regex) pattern matching fo| |13390|New|Nor|2002-10-07|ResponseHeaderHandler and ResponseHeaderValidator | |13426|New|Enh|2002-10-08|[PATCH] xml-reference.xml responseHeader addition | |13743|Opn|Enh|2002-10-17|Need getPropertyType(Class theClass, String propNa| |14036|New|Enh|2002-10-29|MultipartPostMethod does not check for error messa| |14394|Ver|Nor|2002-11-08|Excessive exceptions log under security manager | |14471|Opn|Enh|2002-11-12|validator-rules.xml JavaScript fails when field no| |14667|Ver|Maj|2002-11-19|PropertyUtils.copyProperties does not copy to Dyna| |15451|Opn|Enh|2002-12-17|Multiple mapped properties not possible / Direct m| |15519|Ver|Maj|2002-12-19|PropertyUtils.getPropertyType() for java.util.Coll| |15534|New|Nor|2002-12-19|Inadequate HTTP proxy server support in HttpClient| |15744|New|Nor|2002-12-31|[unspecified] Scaffold ResultSet used after statem| |15895|Unc|Nor|2003-01-08|In BeanMap all properties are writable (some with | |16038|Opn|Enh|2003-01-13|[beanutils] LocaleBeanUtils.copyProperties() does | |16132|New|Maj|2003-01-15|[Jelly] core:file convert html to lt;htmlgt; | |16394|New|Enh|2003-01-24|Enhance the IndexedListProperty to handle nested l| |16525|Opn|Enh|2003-01-29|BeanUtils.setProperty is over-zealous at convertin| |16600|New|Nor|2003-01-30|JUnitTestAdapter throws SAXException because no DT| |16859|New|Nor|2003-02-06|[unspecified] Can't supply a javax.mail.Session to| |16873|New|Enh|2003-02-07|Specifying a different latka.properties file | |16907|New|Enh|2003-02-08|Introduce Aspect oriented programming | |16920|Opn|Enh|2003-02-10|Declaration of Locale (language/country) in valida| |17002|Opn|Enh|2003-02-12|Problem with index property | |17102|New|Enh|2003-02-15|Can't embed characters in paramValue data. | |17306|Opn|Enh|2003-02-22|extend field tag with forward attribute for er| |17416|New|Enh|2003-02-26|Send InputStreams instead of files in MultipartPos| |17501|New|Enh|2003-02-27|Add dynamic discovery of mapped properties to Prop| |17619|New|Nor|2003-03-03|[jelly] ClassLoader Problems with XMLParser and XM| |17650|New|Nor|2003-03-04|[unspecified] Make Messages pay attention to retur| |17662|New|Nor|2003-03-05|unknown options are ignored instead of throwing Un| |17682|New|Nor|2003-03-05|HelpFormatter does not wrap lines correctly after | |17769|New|Blk|2003-03-07|[unspecified] pre-mature closing of Statement and | |17956|Ass|Nor|2003-03-13|[jelly] resource lookup in compiled scripts does n|
cvs commit: jakarta-commons/jelly/src/java/org/apache/commons/jelly JellyContext.java
dion2004/09/05 07:17:33 Modified:jelly/src/java/org/apache/commons/jelly JellyContext.java Log: More docs Revision ChangesPath 1.57 +31 -3 jakarta-commons/jelly/src/java/org/apache/commons/jelly/JellyContext.java Index: JellyContext.java === RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/JellyContext.java,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- JellyContext.java 5 Sep 2004 14:08:17 - 1.56 +++ JellyContext.java 5 Sep 2004 14:17:33 - 1.57 @@ -31,7 +31,8 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; -/** pcodeJellyContext/code represents the Jelly context./p +/** + * pcodeJellyContext/code represents the Jelly context./p * * @author a href=mailto:[EMAIL PROTECTED]James Strachan/a * @version $Revision$ @@ -135,17 +136,38 @@ init(); } +/** + * Create a new context with the given parent context. + * The parent's rootURL are set on the child, and the parent's variables are + * available in the child context under the name codeparentScope/code. + * + * @param parentJellyContext the parent context for the newly created context. + * @param currentURL the root URL used in resolving relative resources + */ public JellyContext(JellyContext parentJellyContext, URL currentURL) { this(parentJellyContext); this.currentURL = currentURL; } +/** + * Create a new context with the given parent context. + * The parent's variables are available in the child context under the name codeparentScope/code. + * + * @param parentJellyContext the parent context for the newly created context. + * @param rootURL the root URL used in resolving absolute resources i.e. those starting with '/' + * @param currentURL the root URL used in resolving relative resources + */ public JellyContext(JellyContext parentJellyContext, URL rootURL, URL currentURL) { this(parentJellyContext, currentURL); this.rootURL = rootURL; } - private void init() { +/** + * Initialize the context. + * This includes adding the context to itself under the name codecontext/code and + * making the System Properties available as codesystemScope/code + */ +private void init() { variables.put(context,this); try { variables.put(systemScope, System.getProperties() ); @@ -255,7 +277,7 @@ -/** Sets the value of the given variable name */ +/** Sets the value of the named variable */ public void setVariable(String name, Object value) { if ( isExport() ) { getParent().setVariable( name, value ); @@ -814,6 +836,9 @@ this.export = export; } +/** + * @return whether we should export variable definitions to our parent context + */ public boolean isExport() { return this.export; } @@ -825,6 +850,9 @@ this.inherit = inherit; } +/** + * @return whether we should inherit variables from our parent context + */ public boolean isInherit() { return this.inherit; } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/java/org/apache/commons/jelly/parser XMLParser.java
dion2004/09/05 07:25:51 Modified:jelly/src/java/org/apache/commons/jelly/parser XMLParser.java Log: Make namespaces a Map, not a HashMap Revision ChangesPath 1.54 +2 -2 jakarta-commons/jelly/src/java/org/apache/commons/jelly/parser/XMLParser.java Index: XMLParser.java === RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/parser/XMLParser.java,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- XMLParser.java2 Sep 2004 07:27:37 - 1.53 +++ XMLParser.java5 Sep 2004 14:25:51 - 1.54 @@ -147,7 +147,7 @@ * is required because documents can declare nested uses of the same * prefix for different Namespace URIs). */ -protected HashMap namespaces = new HashMap(); +protected Map namespaces = new HashMap(); /** The Map of the namespace prefix -gt; URIs defined for the current element */ private Map elementNamespaces; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl StaticTag.java
dion2004/09/05 07:32:16 Modified:jelly/src/java/org/apache/commons/jelly/impl StaticTag.java Log: Bad code Revision ChangesPath 1.18 +2 -1 jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl/StaticTag.java Index: StaticTag.java === RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl/StaticTag.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- StaticTag.java24 Feb 2004 14:03:06 - 1.17 +++ StaticTag.java5 Sep 2004 14:32:16 - 1.18 @@ -116,6 +116,7 @@ public void setLocalName(String localName) { this.localName = localName; +// FIXME This just doesn't seem right or work... if (qname == null || !qname.endsWith(localName)) { localName = qname; } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/bin jelly jelly.bat
dion2004/09/05 07:53:04 Modified:jellyproject.xml jelly/src/bin jelly jelly.bat Log: upgrade to forehead 1.0-beta-5 Revision ChangesPath 1.146 +2 -2 jakarta-commons/jelly/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/jelly/project.xml,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- project.xml 1 Sep 2004 01:59:45 - 1.145 +++ project.xml 5 Sep 2004 14:53:04 - 1.146 @@ -325,8 +325,8 @@ !-- for the jelly startup scripts -- dependency idforehead/id - version1.0-beta-2/version - urlhttp://forehead.sf.net//url + version1.0-beta-5/version + urlhttp://forehead.werken.com//url /dependency /dependencies 1.5 +1 -1 jakarta-commons/jelly/src/bin/jelly Index: jelly === RCS file: /home/cvs/jakarta-commons/jelly/src/bin/jelly,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jelly 25 Feb 2004 00:56:04 - 1.4 +++ jelly 5 Sep 2004 14:53:04 - 1.5 @@ -19,7 +19,7 @@ FOREHEAD_CONF=${JELLY_HOME}/bin/forehead.conf fi -$JAVA_HOME/bin/java -classpath ${CLASSPATH}:${JELLY_HOME}/lib/forehead.jar \ +$JAVA_HOME/bin/java -classpath ${CLASSPATH}:${JELLY_HOME}/lib/forehead-1.0-beta-5.jar \ -Dforehead.conf.file=${FOREHEAD_CONF} \ -Dant.home=${ANT_HOME} -Djelly.home=${JELLY_HOME} \ -Dtools.jar=${JAVA_HOME}/lib/tools.jar \ 1.8 +1 -1 jakarta-commons/jelly/src/bin/jelly.bat Index: jelly.bat === RCS file: /home/cvs/jakarta-commons/jelly/src/bin/jelly.bat,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jelly.bat 25 Feb 2004 00:56:04 - 1.7 +++ jelly.bat 5 Sep 2004 14:53:04 - 1.8 @@ -17,5 +17,5 @@ if %FOREHEAD_CONF%== set FOREHEAD_CONF=%JELLY_HOME%\bin\forehead.conf -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;%JELLY_HOME%\lib\forehead-1.0-beta-2.jar -Dforehead.conf.file=%FOREHEAD_CONF% -Dant.home=%ANT_HOME% -Djelly.home=%JELLY_HOME% -Dtools.jar=%JAVA_HOME%\lib\tools.jar %JELLY_OPTS% com.werken.forehead.Forehead %* +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;%JELLY_HOME%\lib\forehead-1.0-beta-5.jar -Dforehead.conf.file=%FOREHEAD_CONF% -Dant.home=%ANT_HOME% -Djelly.home=%JELLY_HOME% -Dtools.jar=%JAVA_HOME%\lib\tools.jar %JELLY_OPTS% com.werken.forehead.Forehead %* - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/bin jelly forehead.conf jelly.bat
dion2004/09/05 08:00:56 Modified:jelly/src/bin jelly forehead.conf jelly.bat Log: Remove requirement of ANT_HOME env var Revision ChangesPath 1.6 +1 -1 jakarta-commons/jelly/src/bin/jelly Index: jelly === RCS file: /home/cvs/jakarta-commons/jelly/src/bin/jelly,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jelly 5 Sep 2004 14:53:04 - 1.5 +++ jelly 5 Sep 2004 15:00:56 - 1.6 @@ -21,7 +21,7 @@ $JAVA_HOME/bin/java -classpath ${CLASSPATH}:${JELLY_HOME}/lib/forehead-1.0-beta-5.jar \ -Dforehead.conf.file=${FOREHEAD_CONF} \ - -Dant.home=${ANT_HOME} -Djelly.home=${JELLY_HOME} \ + -Djelly.home=${JELLY_HOME} \ -Dtools.jar=${JAVA_HOME}/lib/tools.jar \ ${JELLY_OPTS} \ com.werken.forehead.Forehead $* 1.4 +0 -1 jakarta-commons/jelly/src/bin/forehead.conf Index: forehead.conf === RCS file: /home/cvs/jakarta-commons/jelly/src/bin/forehead.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- forehead.conf 25 Feb 2004 01:13:33 - 1.3 +++ forehead.conf 5 Sep 2004 15:00:56 - 1.4 @@ -23,7 +23,6 @@ [root] [root.jelly] - ${ant.home}/lib/*.jar ${jelly.home}/lib/*.jar ${jelly.home}/custom/*.jar 1.9 +1 -1 jakarta-commons/jelly/src/bin/jelly.bat Index: jelly.bat === RCS file: /home/cvs/jakarta-commons/jelly/src/bin/jelly.bat,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jelly.bat 5 Sep 2004 14:53:04 - 1.8 +++ jelly.bat 5 Sep 2004 15:00:56 - 1.9 @@ -17,5 +17,5 @@ if %FOREHEAD_CONF%== set FOREHEAD_CONF=%JELLY_HOME%\bin\forehead.conf -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;%JELLY_HOME%\lib\forehead-1.0-beta-5.jar -Dforehead.conf.file=%FOREHEAD_CONF% -Dant.home=%ANT_HOME% -Djelly.home=%JELLY_HOME% -Dtools.jar=%JAVA_HOME%\lib\tools.jar %JELLY_OPTS% com.werken.forehead.Forehead %* +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;%JELLY_HOME%\lib\forehead-1.0-beta-5.jar -Dforehead.conf.file=%FOREHEAD_CONF% -Djelly.home=%JELLY_HOME% -Dtools.jar=%JAVA_HOME%\lib\tools.jar %JELLY_OPTS% com.werken.forehead.Forehead %* - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/bin forehead.conf
dion2004/09/05 08:05:24 Modified:jelly/src/bin forehead.conf Log: Remove requirement of ANT_HOME env var Revision ChangesPath 1.5 +0 -1 jakarta-commons/jelly/src/bin/forehead.conf Index: forehead.conf === RCS file: /home/cvs/jakarta-commons/jelly/src/bin/forehead.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- forehead.conf 5 Sep 2004 15:00:56 - 1.4 +++ forehead.conf 5 Sep 2004 15:05:24 - 1.5 @@ -14,7 +14,6 @@ # limitations under the License. # -+ant.home +jelly.home +tools.jar - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly commonDependencies.ent
dion2004/09/05 08:06:53 Modified:jelly/jelly-tags tag-project.xml jellycommonDependencies.ent Log: Move to released dom4j 1.5 Revision ChangesPath 1.11 +1 -1 jakarta-commons/jelly/jelly-tags/tag-project.xml Index: tag-project.xml === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/tag-project.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- tag-project.xml 2 Sep 2004 02:25:43 - 1.10 +++ tag-project.xml 5 Sep 2004 15:06:53 - 1.11 @@ -268,7 +268,7 @@ dependency iddom4j/id - version20040902.021138/version + version1.5/version /dependency dependency 1.15 +1 -1 jakarta-commons/jelly/commonDependencies.ent Index: commonDependencies.ent === RCS file: /home/cvs/jakarta-commons/jelly/commonDependencies.ent,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- commonDependencies.ent2 Sep 2004 02:25:43 - 1.14 +++ commonDependencies.ent5 Sep 2004 15:06:53 - 1.15 @@ -48,7 +48,7 @@ dependency iddom4j/id - version20040902.021138/version + version1.5/version /dependency dependency - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (JELLY-123) var and resource support for images
The following comment has been added to this issue: Author: dion gillard Created: Sun, 5 Sep 2004 8:14 AM Body: Could you provide an updated patch against the existing source? If not, just let me know. - View this comment: http://issues.apache.org/jira/browse/JELLY-123?page=comments#action_52838 - View the issue: http://issues.apache.org/jira/browse/JELLY-123 Here is an overview of the issue: - Key: JELLY-123 Summary: var and resource support for images Type: Improvement Status: Unassigned Priority: Minor Project: jelly Components: taglib.swt Versions: swt-1.0 Assignee: Reporter: Marcus Crafter Created: Tue, 31 Aug 2004 7:39 AM Updated: Sun, 5 Sep 2004 8:14 AM Environment: All Description: Bugzilla http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24492 includes a patch for var and resource support for SWT image tags. var support lets you reference an image later in a jelly script, and the resource support lets you specify a resource url rather than an absolute/relative path to an image file. Cheers, Marcus - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-commons/jexl/xdocs/reference syntax.xml
Hi Dion, Just one question: How is it possible to support at the same time variables in ant-style and the syntax to access properties (http://jakarta.apache.org/commons/jexl/reference/examples.html#Example%20Expressions)? How do I make the difference between a variable named x.y and a variable x with a getter getY() ?? I had a problem with this in Maven plugins. I had a bug because I used a dotted variable name. Is there a difference between variables names and properties names ? Arnaud On 5 Sep 2004 09:00:56 -, [EMAIL PROTECTED] [EMAIL PROTECTED] wrote: dion2004/09/05 02:00:56 Modified:jexl/xdocs/reference syntax.xml Log: Docs on ant-style properties Revision ChangesPath 1.12 +9 -0 jakarta-commons/jexl/xdocs/reference/syntax.xml Index: syntax.xml === RCS file: /home/cvs/jakarta-commons/jexl/xdocs/reference/syntax.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- syntax.xml23 Aug 2004 00:55:09 - 1.11 +++ syntax.xml5 Sep 2004 09:00:55 - 1.12 @@ -57,6 +57,15 @@ liValid: codevar1/code,code_a99/code,code$1/code/li liInvalid: code9v/code,code!a99/code,code1$/code/li /ul +p + JEXL also supports codeant-style/code variables, e.g. sourcemy.dotted.var/source + is a valid variable name. +/p +p + strongNOTE:/strong JEXL does not support variables with hyphens in them, e.g. + sourcecommons-logging/source is not a valid variable, but instead is treated as a + subtraction of the variable codelogging/code from the variable codecommons/code +/p /td /tr tr - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Assigned: (JELLY-124) Support for SWT Color objects
Message: The following issue has been re-assigned. Assignee: dion gillard (mailto:[EMAIL PROTECTED]) - View the issue: http://issues.apache.org/jira/browse/JELLY-124 Here is an overview of the issue: - Key: JELLY-124 Summary: Support for SWT Color objects Type: Improvement Status: Open Priority: Minor Project: jelly Components: taglib.swt Versions: swt-1.0 Assignee: dion gillard Reporter: Marcus Crafter Created: Tue, 31 Aug 2004 7:41 AM Updated: Sun, 5 Sep 2004 8:18 AM Environment: All Description: Bugzilla http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24495 includes support for SWT Color objects in SWT scripts. Cheers, Marcus - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swt/xdocs - New directory
dion2004/09/05 08:19:05 jakarta-commons/jelly/jelly-tags/swt/xdocs - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swt/xdocs changes.xml
dion2004/09/05 08:19:10 Added: jelly/jelly-tags/swt/xdocs changes.xml Log: Docs Revision ChangesPath 1.1 jakarta-commons/jelly/jelly-tags/swt/xdocs/changes.xml Index: changes.xml === ?xml version=1.0 encoding=UTF-8? !-- /* * Copyright 2001-2004 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the License); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an AS IS BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -- document properties titleChanges/title author email=[EMAIL PROTECTED]dIon Gillard/author /properties body release version=1.0-SNAPSHOT date=in CVS action dev=dion type=fix issue=JELLY-124 due-to=Marcus CrafterSupport for SWT Color objects/action /release /body /document - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt WidgetTag.java
dion2004/09/05 08:19:26 Modified:jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt WidgetTag.java Log: Apply Jelly-124 Revision ChangesPath 1.13 +7 -3 jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/WidgetTag.java Index: WidgetTag.java === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/WidgetTag.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- WidgetTag.java25 Feb 2004 01:31:55 - 1.12 +++ WidgetTag.java5 Sep 2004 15:19:26 - 1.13 @@ -141,18 +141,22 @@ Control control = (Control) bean; // Special handling of size property as the Control object breaks the -// JavaBean naming conventions by overloading the setSize() method +// JavaBean naming conventions by overloading the setSize() method Object size = attributes.remove(size); setSize(control, size); // Special handling of color property as the Control object breaks the // JavaBean naming conventions by overloading the setBackground() or setForeground() method Object colorValue = attributes.remove(background); -Color background = getColor(control, colorValue); +Color background = +(colorValue instanceof Color) +? (Color) colorValue : getColor(control, colorValue); control.setBackground(background); colorValue = attributes.remove(foreground); -Color foreground = getColor(control, colorValue); +Color foreground = +(colorValue instanceof Color) +? (Color) colorValue : getColor(control, colorValue); control.setForeground(foreground); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Assigned: (JELLY-125) Support for SWT Font objects
Message: The following issue has been re-assigned. Assignee: dion gillard (mailto:[EMAIL PROTECTED]) - View the issue: http://issues.apache.org/jira/browse/JELLY-125 Here is an overview of the issue: - Key: JELLY-125 Summary: Support for SWT Font objects Type: Improvement Status: Open Priority: Minor Project: jelly Components: taglib.swt Versions: swt-1.0 Assignee: dion gillard Reporter: Marcus Crafter Created: Tue, 31 Aug 2004 7:43 AM Updated: Sun, 5 Sep 2004 8:26 AM Environment: All Description: Bugzilla http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24499 includes support for SWT Font objects in jelly SWT scripts. This lets you specify the type of font you'd like to use in your SWT gui. Cheers, Marcus - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt ColorTag.java FontTag.java
dion2004/09/05 08:25:02 Added: jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt ColorTag.java FontTag.java Log: Add new tags Revision ChangesPath 1.1 jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/ColorTag.java Index: ColorTag.java === /* * Copyright 2002,2004 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the License); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an AS IS BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.apache.commons.jelly.tags.swt; import org.apache.commons.jelly.JellyTagException; import org.apache.commons.jelly.TagSupport; import org.apache.commons.jelly.XMLOutput; import org.apache.commons.jelly.tags.swt.converters.ColorConverter; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.widgets.Widget; /** * Class to create a [EMAIL PROTECTED] Color} instance within Jelly SWT. * * @author a href=mailto:[EMAIL PROTECTED]Marcus Crafter/a * @author Written with much help thanks to the ImageTag class * @version CVS $Id: ColorTag.java,v 1.1 2004/09/05 15:25:02 dion Exp $ */ public class ColorTag extends TagSupport { /** RGB value */ private String rgb; /** Variable name */ private String var; /** * Sets the RGB value for this [EMAIL PROTECTED] Color} instance * * @param rgb value (eg. #66); */ public void setRgb(final String rgb) { this.rgb = rgb; } /** * Obtain the RGB value for this [EMAIL PROTECTED] Color} instance * * @return the RGB value (eg. #66) */ public String getRgb() { return this.rgb; } /** * Sets the variable name * * @param var the variable name of this [EMAIL PROTECTED] Color} instance */ public void setVar(final String var) { this.var = var; } /** * Obtain the variable name. * * @return the variable name of this [EMAIL PROTECTED] Color} instance */ public String getVar() { return this.var; } /** * @return the parent widget which this widget will be added to. */ public Widget getParentWidget() { final WidgetTag tag = (WidgetTag) findAncestorWithClass(WidgetTag.class); if (tag != null) { return tag.getWidget(); } return null; } // Tag interface //- /** * Creates a [EMAIL PROTECTED] Color} instance as defined by the RGB attribute. * Stores this [EMAIL PROTECTED] Color} instance in the Context so that it can be * referenced in the Jelly script. * * @param output [EMAIL PROTECTED] XMLOutput} reference * @throws JellyTagException if an error occurs * @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput) */ public void doTag(final XMLOutput output) throws JellyTagException { // invoke by body just in case some nested tag configures me invokeBody(output); final Widget parent = getParentWidget(); if (parent == null) { throw new JellyTagException( This tag must be nested within a Widget or a Window ); } if (var == null) { throw new JellyTagException(This tag requires a context variable name); } final Color color = new Color( parent.getDisplay(), ColorConverter.getInstance().parse(getRgb()) ); // store the Color in the context context.setVariable(var, color); } } 1.1 jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/FontTag.java Index: FontTag.java === /* * Copyright 2002,2004 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the License); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * *
cvs commit: jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt SwtTagLibrary.java
dion2004/09/05 08:25:19 Modified:jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt SwtTagLibrary.java Log: Jelly-125 Revision ChangesPath 1.11 +3 -0 jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/SwtTagLibrary.java Index: SwtTagLibrary.java === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/SwtTagLibrary.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- SwtTagLibrary.java25 Feb 2004 01:31:55 - 1.10 +++ SwtTagLibrary.java5 Sep 2004 15:25:18 - 1.11 @@ -143,6 +143,9 @@ // other tags registerTag(image, ImageTag.class); +registerTag(font, FontTag.class); +registerTag(color, ColorTag.class); +registerTag(colour, FontTag.class); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swt/xdocs changes.xml
dion2004/09/05 08:26:18 Modified:jelly/jelly-tags/swt/xdocs changes.xml Log: Docs Revision ChangesPath 1.2 +1 -0 jakarta-commons/jelly/jelly-tags/swt/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swt/xdocs/changes.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- changes.xml 5 Sep 2004 15:19:09 - 1.1 +++ changes.xml 5 Sep 2004 15:26:18 - 1.2 @@ -25,6 +25,7 @@ /properties body release version=1.0-SNAPSHOT date=in CVS + action dev=dion type=fix issue=JELLY-125 due-to=Marcus CrafterSupport for SWT Font objects/action action dev=dion type=fix issue=JELLY-124 due-to=Marcus CrafterSupport for SWT Color objects/action /release /body - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (JELLY-125) Support for SWT Font objects
Message: The following issue has been closed. Resolver: dion gillard Date: Sun, 5 Sep 2004 8:28 AM Applied - View the issue: http://issues.apache.org/jira/browse/JELLY-125 Here is an overview of the issue: - Key: JELLY-125 Summary: Support for SWT Font objects Type: Improvement Status: Closed Priority: Minor Resolution: FIXED Project: jelly Components: taglib.swt Fix Fors: 1.0-beta-4 Versions: swt-1.0 Assignee: dion gillard Reporter: Marcus Crafter Created: Tue, 31 Aug 2004 7:43 AM Updated: Sun, 5 Sep 2004 8:28 AM Environment: All Description: Bugzilla http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24499 includes support for SWT Font objects in jelly SWT scripts. This lets you specify the type of font you'd like to use in your SWT gui. Cheers, Marcus - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-commons/jexl/xdocs/reference syntax.xml
On Sun, 5 Sep 2004 17:15:50 +0200, Arnaud HERITIER [EMAIL PROTECTED] wrote: Hi Dion, Just one question: How is it possible to support at the same time variables in ant-style and the syntax to access properties Properties will get precedence. How do I make the difference between a variable named x.y and a variable x with a getter getY() ?? There is none. The property will win. I had a problem with this in Maven plugins. I had a bug because I used a dotted variable name. Is there a difference between variables names and properties names ? No The problem you had was with the empty function and dotted variables. This has very recently been fixed in JEXL, and not yet incorporated into Jelly. Once JEXL is released, and Jelly picks up that, your original code will work as you expected. -- http://www.multitask.com.au/people/dion/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt GCTag.java SwtTagLibrary.java
dion2004/09/05 08:32:55 Modified:jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt SwtTagLibrary.java Added: jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt GCTag.java Log: Jelly-126 Revision ChangesPath 1.12 +3 -2 jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/SwtTagLibrary.java Index: SwtTagLibrary.java === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/SwtTagLibrary.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- SwtTagLibrary.java5 Sep 2004 15:25:18 - 1.11 +++ SwtTagLibrary.java5 Sep 2004 15:32:54 - 1.12 @@ -142,10 +142,11 @@ registerTag(onEvent, OnEventTag.class); // other tags -registerTag(image, ImageTag.class); -registerTag(font, FontTag.class); registerTag(color, ColorTag.class); registerTag(colour, FontTag.class); +registerTag(font, FontTag.class); +registerTag(gc, GCTag.class); +registerTag(image, ImageTag.class); } 1.1 jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/GCTag.java Index: GCTag.java === /* * Copyright 2002,2004 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the License); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an AS IS BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.apache.commons.jelly.tags.swt; import org.apache.commons.jelly.JellyTagException; import org.apache.commons.jelly.TagSupport; import org.apache.commons.jelly.XMLOutput; import org.eclipse.swt.graphics.Drawable; import org.eclipse.swt.graphics.GC; /** * Class to create a [EMAIL PROTECTED] GC} instance within Jelly SWT. * * @author a href=mailto:[EMAIL PROTECTED]Marcus Crafter/a * @version CVS $Id: GCTag.java,v 1.1 2004/09/05 15:32:54 dion Exp $ */ public class GCTag extends TagSupport { /** Drawable name */ private Drawable drawable; /** Variable name */ private String var; /** * Obtain the [EMAIL PROTECTED] Drawable} name for this [EMAIL PROTECTED] GC}. * * @return a [EMAIL PROTECTED] GC} [EMAIL PROTECTED] Drawable} */ public Drawable getDrawable() { return this.drawable; } /** * Set the [EMAIL PROTECTED] Drawable} name for this [EMAIL PROTECTED] GC}. * * @param drawable a [EMAIL PROTECTED] GC} [EMAIL PROTECTED] Drawable} */ public void setDrawable(final Drawable drawable) { this.drawable = drawable; } /** * Sets the variable name. * * @param var the variable name of this [EMAIL PROTECTED] GC} instance */ public void setVar(final String var) { this.var = var; } /** * Obtain the variable name. * * @return the variable name of this [EMAIL PROTECTED] GC} instance */ public String getVar() { return this.var; } // Tag interface //- /** * Creates a [EMAIL PROTECTED] GC} instance and stores it in the Context under a * particular variable name. Note, [EMAIL PROTECTED] GC} objects can only be created on * [EMAIL PROTECTED] Drawable} objects. * * @param output [EMAIL PROTECTED] XMLOutput} reference * @throws JellyTagException if an error occurs * @see org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput) */ public void doTag(final XMLOutput output) throws JellyTagException { // invoke by body just in case some nested tag configures me invokeBody(output); final boolean nullDrawable = drawable == null; final boolean drawableParent = drawable instanceof Drawable; if (nullDrawable || !drawableParent) { throw new JellyTagException( This tag must specify a Drawable attribute (ie. Image or Control) ); } if (var == null) { throw new
[jira] Closed: (JELLY-126) Support for SWT GC objects
Message: The following issue has been closed. Resolver: dion gillard Date: Sun, 5 Sep 2004 8:35 AM Applied - View the issue: http://issues.apache.org/jira/browse/JELLY-126 Here is an overview of the issue: - Key: JELLY-126 Summary: Support for SWT GC objects Type: Improvement Status: Closed Priority: Minor Resolution: FIXED Project: jelly Components: taglib.swt Fix Fors: 1.0-beta-4 Versions: swt-1.0 Assignee: Reporter: Marcus Crafter Created: Tue, 31 Aug 2004 7:44 AM Updated: Sun, 5 Sep 2004 8:35 AM Environment: All Description: Bugzilla http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24541 includes support for using SWT GC objects in jelly SWT scripts. This allows you to create a reference to a GC object for doing low level graphics manipulations to objects from within jelly scripts. Cheers, Marcus - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-commons/jexl/xdocs/reference syntax.xml
Just one question: How is it possible to support at the same time variables in ant-style and the syntax to access properties Properties will get precedence. ok. How do I make the difference between a variable named x.y and a variable x with a getter getY() ?? There is none. The property will win. ok it's logic. I had a problem with this in Maven plugins. I had a bug because I used a dotted variable name. Is there a difference between variables names and properties names ? No The problem you had was with the empty function and dotted variables. This has very recently been fixed in JEXL, and not yet incorporated into Jelly. Once JEXL is released, and Jelly picks up that, your original code will work as you expected. I understand. thanks for the explanation. Arnaud - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swt/src/test/org/apache/commons/jelly/tags/swt example.jelly
dion2004/09/05 08:36:02 Modified:jelly/jelly-tags/swt/src/test/org/apache/commons/jelly/tags/swt example.jelly Log: failing due to toolTipText not being a table column property Revision ChangesPath 1.6 +2 -2 jakarta-commons/jelly/jelly-tags/swt/src/test/org/apache/commons/jelly/tags/swt/example.jelly Index: example.jelly === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swt/src/test/org/apache/commons/jelly/tags/swt/example.jelly,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- example.jelly 1 Mar 2004 12:35:18 - 1.5 +++ example.jelly 5 Sep 2004 15:36:02 - 1.6 @@ -58,8 +58,8 @@ gridData style=fill_both/ - tableColumn text=Name width=100 toolTipText=This is the name column/ - tableColumn text=Age width=40 toolTipText=This is the age column/ + tableColumn text=Name width=100 / + tableColumn text=Age width=40 / !-- we'd normally use some Java bean model to implement the next bit -- tableItem var=row/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swt/xdocs changes.xml
dion2004/09/05 08:36:33 Modified:jelly/jelly-tags/swt/xdocs changes.xml Log: Docs Revision ChangesPath 1.3 +1 -0 jakarta-commons/jelly/jelly-tags/swt/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swt/xdocs/changes.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- changes.xml 5 Sep 2004 15:26:18 - 1.2 +++ changes.xml 5 Sep 2004 15:36:33 - 1.3 @@ -25,6 +25,7 @@ /properties body release version=1.0-SNAPSHOT date=in CVS + action dev=dion type=fix issue=JELLY-126 due-to=Marcus CrafterSupport for SWT GC objects/action action dev=dion type=fix issue=JELLY-125 due-to=Marcus CrafterSupport for SWT Font objects/action action dev=dion type=fix issue=JELLY-124 due-to=Marcus CrafterSupport for SWT Color objects/action /release - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt DialogTag.java
dion2004/09/05 08:40:27 Added: jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt DialogTag.java Log: Jelly-48 Revision ChangesPath 1.1 jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/DialogTag.java Index: DialogTag.java === /* * Copyright 2002,2004 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the License); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an AS IS BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.apache.commons.jelly.tags.swt; import java.util.Map; import org.apache.commons.jelly.JellyTagException; import org.apache.commons.jelly.XMLOutput; import org.eclipse.swt.widgets.Dialog; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Widget; /** * This tag creates an SWT dialog. * * @author a href=mailto:[EMAIL PROTECTED]Christiaan ten Klooster/a * */ public class DialogTag extends WidgetTag { /** * @param widgetClass * @param style */ public DialogTag(Class widgetClass, int style) { super(widgetClass, style); } /** * @param widgetClass */ public DialogTag(Class widgetClass) { super(widgetClass); } // Implementation methods //- /** * Factory method to create a new dialog */ protected Object newInstance(Class theClass, Map attributes, XMLOutput output) throws JellyTagException { int style = getStyle(attributes); // now lets call the constructor with the parent Widget parent = getParentWidget(); boolean isParentShell = parent instanceof Shell; if (parent == null || !isParentShell) { throw new JellyTagException(This tag must be nested within a Shell); } Dialog dialog = (Dialog) createWidget(theClass, parent, style); return dialog; } } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt SwtTagLibrary.java
dion2004/09/05 08:45:57 Modified:jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt SwtTagLibrary.java Log: Jelly-42 Revision ChangesPath 1.14 +4 -0 jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/SwtTagLibrary.java Index: SwtTagLibrary.java === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/SwtTagLibrary.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- SwtTagLibrary.java5 Sep 2004 15:40:38 - 1.13 +++ SwtTagLibrary.java5 Sep 2004 15:45:57 - 1.14 @@ -25,6 +25,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.CTabFolder; +import org.eclipse.swt.custom.CTabItem; import org.eclipse.swt.custom.ScrolledComposite; import org.eclipse.swt.custom.TableTree; import org.eclipse.swt.custom.TableTreeItem; @@ -124,6 +126,8 @@ registerWidgetTag( treeItem, TreeItem.class ); // custom widgets +registerWidgetTag( cTabFolder, CTabFolder.class ); +registerWidgetTag( cTabItem, CTabItem.class ); registerWidgetTag( tableTree, TableTree.class ); registerWidgetTag( tableTreeItem, TableTreeItem.class ); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swt/xdocs changes.xml
dion2004/09/05 08:46:47 Modified:jelly/jelly-tags/swt/xdocs changes.xml Log: Jelly-42 Revision ChangesPath 1.5 +1 -0 jakarta-commons/jelly/jelly-tags/swt/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swt/xdocs/changes.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- changes.xml 5 Sep 2004 15:42:36 - 1.4 +++ changes.xml 5 Sep 2004 15:46:47 - 1.5 @@ -25,6 +25,7 @@ /properties body release version=1.0-SNAPSHOT date=in CVS + action dev=dion type=fix issue=JELLY-42 due-to=Christiaan ten Kloosteradd cTabFolder + cTabItem widgets/action action dev=dion type=fix issue=JELLY-48 due-to=Christiaan ten Kloosterdialog tag/action action dev=dion type=fix issue=JELLY-126 due-to=Marcus CrafterSupport for SWT GC objects/action action dev=dion type=fix issue=JELLY-125 due-to=Marcus CrafterSupport for SWT Font objects/action - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (JELLY-42) [SWT taglib] add cTabFolder + cTabItem widgets
Message: The following issue has been closed. Resolver: dion gillard Date: Sun, 5 Sep 2004 8:47 AM Applied - View the issue: http://issues.apache.org/jira/browse/JELLY-42 Here is an overview of the issue: - Key: JELLY-42 Summary: [SWT taglib] add cTabFolder + cTabItem widgets Type: New Feature Status: Closed Priority: Major Resolution: FIXED Project: jelly Components: taglib.swt Fix Fors: 1.0-beta-4 Assignee: james strachan Reporter: Christiaan ten Klooster Created: Wed, 5 Mar 2003 11:03 AM Updated: Sun, 5 Sep 2004 8:47 AM Description: - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/lang/src/test/org/apache/commons/lang/time StopWatchTest.java
bayard 2004/09/05 12:55:29 Modified:lang/src/test/org/apache/commons/lang/time StopWatchTest.java Log: tests the state checking and uses SplitTime Revision ChangesPath 1.8 +72 -4 jakarta-commons/lang/src/test/org/apache/commons/lang/time/StopWatchTest.java Index: StopWatchTest.java === RCS file: /home/cvs/jakarta-commons/lang/src/test/org/apache/commons/lang/time/StopWatchTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- StopWatchTest.java18 Feb 2004 23:03:03 - 1.7 +++ StopWatchTest.java5 Sep 2004 19:55:29 - 1.8 @@ -73,14 +73,13 @@ watch.start(); try {Thread.sleep(550);} catch (InterruptedException ex) {} watch.split(); -long splitTime = watch.getTime(); +long splitTime = watch.getSplitTime(); try {Thread.sleep(550);} catch (InterruptedException ex) {} watch.unsplit(); try {Thread.sleep(550);} catch (InterruptedException ex) {} watch.stop(); long totalTime = watch.getTime(); -//System.err.println(splitTime + +totalTime); assertTrue(splitTime = 500); assertTrue(splitTime 700); assertTrue(totalTime = 1500); @@ -99,11 +98,80 @@ watch.stop(); long totalTime = watch.getTime(); -//System.err.println(suspendTime + +totalTime); assertTrue(suspendTime = 500); assertTrue(suspendTime 700); assertTrue(totalTime = 1000); assertTrue(totalTime 1300); +} + +// test bad states +public void testBadStates() { +StopWatch watch = new StopWatch(); +try { +watch.stop(); +fail(Calling stop on an unstarted StopWatch should throw an exception. ); +} catch(IllegalStateException ise) { +// expected +} + +try { +watch.stop(); +fail(Calling stop on an unstarted StopWatch should throw an exception. ); +} catch(IllegalStateException ise) { +// expected +} + +try { +watch.suspend(); +fail(Calling suspend on an unstarted StopWatch should throw an exception. ); +} catch(IllegalStateException ise) { +// expected +} + +try { +watch.unsplit(); +fail(Calling unsplit on an unsplit StopWatch should throw an exception. ); +} catch(IllegalStateException ise) { +// expected +} + +try { +watch.resume(); +fail(Calling resume on an unsuspended StopWatch should throw an exception. ); +} catch(IllegalStateException ise) { +// expected +} + +watch.start(); + +try { +watch.start(); +fail(Calling start on an started StopWatch should throw an exception. ); +} catch(IllegalStateException ise) { +// expected +} + +try { +watch.unsplit(); +fail(Calling unsplit on an unsplit StopWatch should throw an exception. ); +} catch(IllegalStateException ise) { +// expected +} + +try { +watch.getSplitTime(); +fail(Calling getSplitTime on an unsplit StopWatch should throw an exception. ); +} catch(IllegalStateException ise) { +// expected +} + +try { +watch.resume(); +fail(Calling resume on an unsuspended StopWatch should throw an exception. ); +} catch(IllegalStateException ise) { +// expected +} + } } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/lang/src/java/org/apache/commons/lang StringEscapeUtils.java
bayard 2004/09/05 13:09:33 Modified:lang/src/java/org/apache/commons/lang StringEscapeUtils.java Log: No longer Antony\'s email Revision ChangesPath 1.29 +2 -2 jakarta-commons/lang/src/java/org/apache/commons/lang/StringEscapeUtils.java Index: StringEscapeUtils.java === RCS file: /home/cvs/jakarta-commons/lang/src/java/org/apache/commons/lang/StringEscapeUtils.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- StringEscapeUtils.java18 Feb 2004 22:59:50 - 1.28 +++ StringEscapeUtils.java5 Sep 2004 20:09:33 - 1.29 @@ -29,7 +29,7 @@ * @author Purple Technology * @author a href=mailto:[EMAIL PROTECTED]Henri Yandell/a * @author a href=mailto:[EMAIL PROTECTED]Alexander Day Chaffee/a - * @author a href=mailto:[EMAIL PROTECTED]Antony Riley/a + * @author Antony Riley * @author Helge Tesgaard * @author a href=[EMAIL PROTECTED]Sean Brown/a * @author a href=mailto:[EMAIL PROTECTED]Gary Gregory/a - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/lang/src/java/org/apache/commons/lang CharUtils.java
bayard 2004/09/05 13:38:36 Modified:lang/src/java/org/apache/commons/lang CharUtils.java Log: typo Revision ChangesPath 1.10 +2 -2 jakarta-commons/lang/src/java/org/apache/commons/lang/CharUtils.java Index: CharUtils.java === RCS file: /home/cvs/jakarta-commons/lang/src/java/org/apache/commons/lang/CharUtils.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- CharUtils.java24 May 2004 00:10:15 - 1.9 +++ CharUtils.java5 Sep 2004 20:38:36 - 1.10 @@ -16,7 +16,7 @@ package org.apache.commons.lang; /** - * pOperations on char primitives and Char objects./p + * pOperations on char primitives and Character objects./p * * pThis class tries to handle codenull/code input gracefully. * An exception will not be thrown for a codenull/code input. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[RESULT][VOTE] Release Digester 1.6.0
by my count, 4 +1's where the only votes cast. therefore, the release vote passed. http://nagoya.apache.org/eyebrowse/BrowseList?listName=commons- [EMAIL PROTECTED]by=threadfrom=875355 (unless there are any objections from the pmc) i will cut this release no earlier than 2300 hours on monday 6, september. - robert - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/lang/xdocs userguide.xml
bayard 2004/09/05 14:47:37 Modified:lang/xdocs userguide.xml Log: updated user guide Revision ChangesPath 1.2 +67 -15jakarta-commons/lang/xdocs/userguide.xml Index: userguide.xml === RCS file: /home/cvs/jakarta-commons/lang/xdocs/userguide.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- userguide.xml 5 Sep 2004 01:43:45 - 1.1 +++ userguide.xml 5 Sep 2004 21:47:37 - 1.2 @@ -26,30 +26,79 @@ section name=Description pThe Commons Lang library provides much needed additions to the standard JDK's java.lang package. Very generic, very reusable components for everyday use./p - pThe top level package contains various Utils classes, whilst there are various subpackages including enums, exception and builder. Using the Utils classes is generally simplicity itself. They are the equivalent of global functions in another language, a collection of stand-alone, thread-safe, static methods. In contrast, subpackages contain interfaces which may have to be implemented or classes which may need to be extended to get the full functionality from the code. /p - /section + pThe top level package contains various Utils classes, whilst there are various subpackages including enums, exception and builder. Using the Utils classes is generally simplicity itself. They are the equivalent of global functions in another language, a collection of stand-alone, thread-safe, static methods. In contrast, subpackages may contain interfaces which may have to be implemented or classes which may need to be extended to get the full functionality from the code. They may, however, contain more global-like functions. /p + pLang seeks to support Java 1.2 onwards, so although you may have seen features in later versions of Java, such as split methods and nested exceptions, Lang still maintains non-java.lang versions for users of earlier versions of Java. /p + pYou will find deprecated methods as you stroll through the Lang documentation. These are removed in the next major release. /p + pBefore we begin, it's a good time to mention the Utils classes. They all contain empty public constructors with warnings not to use. This may seem an odd thing to do, but it allows tools like Velocity to access the class as if it were a bean. In other words, yes we know abbout private constructors. /p + /section section name=lang.* -subsection name=String classes - pThe first thing for me at the top level is StringUtils. I'm partizan here as it's one of the ones I had a lions share in. Oodles and oodles of functions here which tweak, transform, squeeze and cuddle java.lang.Strings. Throw in RandomStringUtils and CharSetUtils to complete the 'String' trilogy. /p - pMost developers have their own, most of them are tiny and small. The Jakarta ones are guaranteed to be used in a larger audience and have subtle issues like using toTitleCase in StringUtils.capitalise and not toUpperCase (Yugoslavians[Bad term now. Research which languages are affected] will thank you). /p +subsection name=String manipulation - StringUtils, StringEscapeUtils, RandomStringUtils, Tokenizer, WordUtils + pLang has a series of String utilities. The first is StringUtils, oodles and oodles of functions which tweak, transform, squeeze and cuddle java.lang.Strings. In addition to StringUtils, there are a series of other String manipulating classes; RandomStringUtils, StringEscapeUtils and Tokenizer. RandomStringUtils speaks for itself. It's provides ways in which to generate pieces of text, such as might be used for default passwords. StringEscapeUtils contains methods to escape and unescape Java, JavaScript, HTML, XML and SQL. Tokenizer is an improved alternative to java.util.StringTokenizer. /p + pThese are ideal classes to start using if you're looking to get into Lang. StringUtils' capitalize, substringBetween/Before/After, split and join are good methods to begin with. If you use java.sql.Statements a lot, StringEscapeUtils.escapeSql might be of interest. /p + pIn addition to these classes, WordUtils is another String manipulator. It works on Strings at the word level, for example WordUtils.capitalize will capitalize every word in a piece of text. WordUtils also contains methods to wrap text. /p +/subsection + +subsection name=Character handling - CharSetUtils, CharSet, CharRange, CharUtils + pIn addition to dealing with Strings, it's also important to deal with chars and Characters. CharUtils exists for this purpose, while CharSetUtils exists for set-manipulation of Strings. Be careful, although CharSetUtils takes an argument of type String, it is only as a set of characters. For example, 'CharSetUtils.delete(testtest, tr)' will remove all t's and all r's from the
cvs commit: jakarta-commons/lang/xdocs developerguide.xml navigation.xml
bayard 2004/09/05 14:48:08 Modified:lang/xdocs navigation.xml Added: lang/xdocs developerguide.xml Removed: lang DEVELOPERS-GUIDE.html Log: developer guide moved to the site and hooked into the navigation Revision ChangesPath 1.9 +1 -0 jakarta-commons/lang/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/jakarta-commons/lang/xdocs/navigation.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- navigation.xml5 Sep 2004 01:43:45 - 1.8 +++ navigation.xml5 Sep 2004 21:48:08 - 1.9 @@ -31,6 +31,7 @@ menu name=Commons Lang item name=Overview href=/index.html/ item name=Users guide href=/userguide.html/ + item name=Developers guide href=/developerguide.html/ item name=Javadoc (2.0 release) href=api/index.html/ item name=Mailing lists href=/mail-lists.html/ item name=Team href=/team-list.html/ 1.1 jakarta-commons/lang/xdocs/developerguide.xml Index: developerguide.xml === !-- Copyright 2002-2004 The Apache Software Foundation. Licensed under the Apache License, Version 2.0 (the License); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -- document properties titleDeveloper guide for Jakarta Commons Lang/title /properties body section name='Developers guide for Jakarta Commons Lang' div align=center h1The Jakarta Commons emLang/em Package/h1 h2Developers Guide/h2 $Id: developerguide.xml,v 1.1 2004/09/05 21:48:08 bayard Exp $br / a href=#Introduction[Introduction]/a a href=#PackageStructure[Package Structure]/a a href=#UtilityClasses[Utility Classes]/a a href=#Javadoc[Javadoc]/a br /br / /div a name=Introduction/a h31. INTRODUCTION/h3 pThe emLang/em package contains a set of Java classes that extend the basic JDK classes. This developers guide seeks to set out rules for the naming of classes and methods within the package. The purpose of this, as with all naming standards, is to improve the coherency and consistency of the whole API./p pThe philosophy of the naming standards is to follow those of the JDK if possible./p a name=PackageStructure/a h32. PACKAGE STRUCTURE/h3 pThe main package for Lang is codeorg.apache.commons.lang/code. Subpackages should be created for each group of related items. /p pEach package should have a codepackage.html/code file for javadoc. This should describe the use of the package and its scope./p a name=UtilityClasses/a h33. UTILITY CLASSES/h3 pUtility classes provide additional functionality around a class or interface. Examples include StringUtils and SerializationUtils./p pEach class shall follow the naming pattern XxxUtils where Xxx relates to the class or interface that the utility services. Variations on a theme (codeInteger/code as opposed to codeNumber/code) should be dealt with in one Utils class where possible. Each Utils class shall:/p ul libe a single, static method based, class/li lihave a name consisting of the interface name plus 'Utils'/li lideal with one class or interface and its variations (subclasses)/li liprovide methods that perform useful utility functions/li lithe class will not be final/li lifor null parameters, rather than throwing an Exception, consider performing a Null patterned concept, such as returning 0 or /li /ul pA utility class can act as a factory for specific implementations of a class or interface. In such cases the implementations should be non-public, static, inner classes of the utility class. However, if warranted due to maintenance or other reasons, these decorator classes may be moved to top-level classes in a subpackage. The naming of such a subpackage should be discussed and agreed upon on the developers mailing list./p pIf different overloaded variants of a method are desired, with the same method signature, it should not be indicated via a boolean argument, but via a more focused method name. Rather than replace(boolean repeat), replace and replaceAll, or replaceOnce and replace. /p a name=Javadoc/a h34. JAVADOC/h3 pThe Sun javadoc guidelines are the starting point for Lang. These points are an extension to make it easier for users reading the
cvs commit: jakarta-commons/lang/xdocs userguide.xml
bayard 2004/09/05 14:48:48 Modified:lang/xdocs userguide.xml Log: put section in the wrong place Revision ChangesPath 1.3 +4 -3 jakarta-commons/lang/xdocs/userguide.xml Index: userguide.xml === RCS file: /home/cvs/jakarta-commons/lang/xdocs/userguide.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- userguide.xml 5 Sep 2004 21:47:37 - 1.2 +++ userguide.xml 5 Sep 2004 21:48:48 - 1.3 @@ -140,11 +140,12 @@ section name=lang.time.* pLang 2.0 saw the arrival of a time package. It contains some basic utilities for manipulating time (a delorean, police box and [hgwells lookup needed]?). These include a StopWatch for simple performance measurements and an optimised FastDateFormat class. /p /section - section name=Next version of Lang -pThe next version of Lang will be 2.1. The most notable addition is a mutable package, but there are also new classes such as DurationFormatUtils [and ...]. /p - /section section name=lang.text.* + /section + + section name=Next version of Lang +pThe next version of Lang will be 2.1. The most notable addition is a mutable package, but there are also new classes such as DurationFormatUtils [and ...]. /p /section /body - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [feedparser] Attaching patch again
That regular expression is meant to catch things like the following: http://www.somehost.com/blog/blosxom.cgi We want to strip off the trailing filename so that we just get the path. I added the test for the double slashes because I was finding that the expression was matching the following, which it shouldn't: http://somehost.com If someone puts a double slash for the first example: http://somehost.com/blog//blosxom.cgi Then it would prevent this from matching, which is a bug; thanx for finding that. I think I need to change the regex to not match if the section in parentheses is preceded by a colon and two slashes. What do you think? Hope you're having a good weekend, Brad --- Kevin A. Burton [EMAIL PROTECTED] wrote: Brad Neuberg wrote: +private static Pattern patternToStrip = Pattern.compile([^/](/\\w*\\.\\w*$)); Brad... Won't the above regexp prevent: http://foo.com//bar from matching? Usually the HTTP server will just do a 302 redir when using two slashes. /** * A regex to extract the user from a Xanga URL @@ -143,7 +143,8 @@ new FeedReference(index.rss, FeedReference.RSS_MEDIA_TYPE), new FeedReference(rss.xml, FeedReference.RSS_MEDIA_TYPE), new FeedReference(index.rdf, FeedReference.RSS_MEDIA_TYPE), - new FeedReference(index.xml, FeedReference.XML_MEDIA_TYPE) }; + new FeedReference(index.xml, FeedReference.RSS_MEDIA_TYPE), Wondering if we should have a new media type... POTENTIAL_RSS_MEDIA_TYPE ... this way we can just note that this MIGHT be a feed. Other than that looks good. -- Please reply using PGP. http://peerfear.org/pubkey.asc NewsMonster - http://www.newsmonster.org/ Kevin A. Burton, Location - San Francisco, CA, Cell - 415.595.9965 AIM/YIM - sfburtonator, Web - http://peerfear.org/ GPG fingerprint: 5FB2 F3E2 760E 70A8 6174 D393 E84D 8D04 99F1 4412 IRC - freenode.net #infoanarchy | #p2p-hackers | #newsmonster - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [feedparser] Attaching patch again
Brad Neuberg wrote: It looks like attachments are stripped out of the mailing list; here is the patch in unified diff format: I rewrote getFeedPath 1. it was using duplicate indexOf queries for the same value. Wasted CPU :-/ Also I used lastIndexOf to start scan from the end of the string. 2. It stripped text after # or ? but not both... so http://foo.com?cat=dog#here would not work... Here is the new method body: protected static String getFeedPath( String resource ) throws MalformedURLException { // strip off any query string or anchors int end = resource.lastIndexOf( # ); if ( end != -1 ) resource = resource.substring( 0, end ); end = resource.lastIndexOf( ? ); if ( end != -1 ) resource = resource.substring( 0, end ); if ( ! resource.endsWith( blosxom.cgi ) ) { Matcher fileMatcher = patternToStrip.matcher(resource); resource = fileMatcher.replaceAll(); } if ( ! resource.endsWith( / ) ) { resource = resource + /; } return resource; } Kevin -- Please reply using PGP. http://peerfear.org/pubkey.asc NewsMonster - http://www.newsmonster.org/ Kevin A. Burton, Location - San Francisco, CA, Cell - 415.595.9965 AIM/YIM - sfburtonator, Web - http://peerfear.org/ GPG fingerprint: 5FB2 F3E2 760E 70A8 6174 D393 E84D 8D04 99F1 4412 IRC - freenode.net #infoanarchy | #p2p-hackers | #newsmonster - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/feedparser/src/java/org/apache/commons/feedparser/test TestProbeLocator.java
burton 2004/09/05 14:55:51 Modified:feedparser TODO feedparser/src/java/org/apache/commons/feedparser/locate ProbeLocator.java feedparser/src/java/org/apache/commons/feedparser/test TestProbeLocator.java Log: 1/2 of brads patches Revision ChangesPath 1.13 +6 -0 jakarta-commons-sandbox/feedparser/TODO Index: TODO === RCS file: /home/cvs/jakarta-commons-sandbox/feedparser/TODO,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- TODO 3 Sep 2004 19:46:47 - 1.12 +++ TODO 5 Sep 2004 21:55:51 - 1.13 @@ -1,4 +1,10 @@ +- BUG: + +Make SURE that all these tests + + http://diveintomark.org/tests/client/autodiscovery/ + - BUG: what happens when I put a comment after a UTF-16 BOM?! - Support Base64 Atom values and the ability to enable them. 1.11 +28 -37 jakarta-commons-sandbox/feedparser/src/java/org/apache/commons/feedparser/locate/ProbeLocator.java Index: ProbeLocator.java === RCS file: /home/cvs/jakarta-commons-sandbox/feedparser/src/java/org/apache/commons/feedparser/locate/ProbeLocator.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ProbeLocator.java 2 Sep 2004 00:36:25 - 1.10 +++ ProbeLocator.java 5 Sep 2004 21:55:51 - 1.11 @@ -69,7 +69,7 @@ /** * A regex to find any trailing filename and strip it */ -private static Pattern patternToStrip = Pattern.compile(/\\w*\\.\\w*$); +private static Pattern patternToStrip = Pattern.compile([^/](/\\w*\\.\\w*$)); /** * A regex to extract the user from a Xanga URL @@ -143,7 +143,8 @@ new FeedReference(index.rss, FeedReference.RSS_MEDIA_TYPE), new FeedReference(rss.xml, FeedReference.RSS_MEDIA_TYPE), new FeedReference(index.rdf, FeedReference.RSS_MEDIA_TYPE), - new FeedReference(index.xml, FeedReference.XML_MEDIA_TYPE) }; + new FeedReference(index.xml, FeedReference.RSS_MEDIA_TYPE), + new FeedReference(xml/rss.xml, FeedReference.RSS_MEDIA_TYPE) }; probeMapping.put( BlogService.BLOSXOM,blosxomLocations ); @@ -192,6 +193,7 @@ mapping = (FeedReference[])probeMapping.get( blogService ); log.info( mapping = + mapping ); +log.info( baseFeedPath = + baseFeedPath ); // try out each mapping for (int i = 0; i mapping.length; i++) { @@ -285,7 +287,9 @@ * and gets the path necessary to build up a feed, such as * http://www.codinginparadise.org/;. Basicly it appends a slash to the end if there * is not one, and removes any file names that might be at the end, such as - * myweblog.php. The one special exception is for some Blosxom blogs, + * myweblog.php. + * + * There is a special exception for some Blosxom blogs, * which have things inside of a cgi-script and 'hang' their RSS files * off of this cgi-bin. For example, * http://www.bitbucketheaven.com/cgi-bin/blosxom.cgi has its RSS file @@ -297,31 +301,40 @@ * * @author Brad Neuberg, [EMAIL PROTECTED] */ -protected static String getFeedPath(String resource) +protected static String getFeedPath( String resource ) throws MalformedURLException { // strip off any query string or anchors -int startStripAt = resource.indexOf(#); +int end = resource.lastIndexOf( # ); + +if ( end != -1 ) +resource = resource.substring( 0, end ); -if ( startStripAt == -1 ) { - startStripAt = resource.indexOf(?); -} -if (startStripAt != -1) { -resource = resource.substring(0, startStripAt); -} +end = resource.lastIndexOf( ? ); -if (!resource.endsWith(blosxom.cgi)) { +if ( end != -1 ) +resource = resource.substring( 0, end ); + +if ( ! resource.endsWith( blosxom.cgi ) ) { Matcher fileMatcher = patternToStrip.matcher(resource); resource = fileMatcher.replaceAll(); } -if ( !resource.endsWith( / ) ) { +if ( ! resource.endsWith( / ) ) { resource = resource + /; } return resource; } - + +public static void main( String[] args ) throws Exception { + +System.out.println( asdf ); +System.out.println(
cvs commit: jakarta-commons-sandbox/feedparser/src/java/org/apache/commons/feedparser/test TestProbeLocator.java
burton 2004/09/05 15:01:33 Modified:feedparser/src/java/org/apache/commons/feedparser/test TestProbeLocator.java Log: ... Revision ChangesPath 1.4 +51 -1 jakarta-commons-sandbox/feedparser/src/java/org/apache/commons/feedparser/test/TestProbeLocator.java Index: TestProbeLocator.java === RCS file: /home/cvs/jakarta-commons-sandbox/feedparser/src/java/org/apache/commons/feedparser/test/TestProbeLocator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TestProbeLocator.java 5 Sep 2004 21:55:51 - 1.3 +++ TestProbeLocator.java 5 Sep 2004 22:01:33 - 1.4 @@ -852,6 +852,30 @@ assertNotNull(rssFeed); assertEquals(rssFeed.type, FeedReference.RSS_MEDIA_TYPE); assertEquals(rssFeed.resource, http://bamph.com/index.xml;); + +// This site should have a single RSS feed +resource = http://bamph.com;; +content = getContent(resource); +assertNotNull(content); +blogService = BlogServiceDiscovery.discover(resource, content); +assertEquals(blogService, BlogService.UNKNOWN); +list = new FeedList(); +ProbeLocator.locate(resource, content, list); +assertEquals(list.size(), 1); +feeds = (FeedReference[])list.toArray(new FeedReference[list.size()]); +assertEquals(feeds.length, 1); +assertEquals(feeds[0].method, FeedReference.METHOD_PROBE_DISCOVERY); +assertNull(feeds[0].title, null); +assertEquals(feeds[0].type, FeedReference.RSS_MEDIA_TYPE); +assertEquals(feeds[0].resource, http://bamph.com/index.xml;); +/* test through the FeedLocator */ +list = FeedLocator.locate(resource); +atomFeed = list.getAdAtomFeed(); +rssFeed = list.getAdRSSFeed(); +assertNull(atomFeed); +assertNotNull(rssFeed); +assertEquals(rssFeed.type, FeedReference.RSS_MEDIA_TYPE); +assertEquals(rssFeed.resource, http://bamph.com/index.xml;); BlogService blogService = null; FeedReference feeds[] = null; FeedReference rssFeed, atomFeed; @@ -1002,6 +1026,32 @@ /* test through the FeedLocator */ list = FeedLocator.locate(resource); atomFeed = list.getAdAtomFeed(); +public static void main( String[] args ) throws Exception { + +TestProbeLocator test = new TestProbeLocator( null ); + +/*test.test( http://xanga.com/home.aspx?user=joe;, + BlogService.XANGA, + 1 ); + +test.test( http://www.xanga.com/home.aspx?user=joe;, + BlogService.XANGA, + 1 );*/ + +test.testBlogger(); +test.testLiveJournal(); +test.testDiaryLand(); +test.testMovableType(); +test.testXanga(); +test.testWordPress(); +test.testAOLJournal(); +test.testTypePad(); +test.testGreyMatter(); +test.testPMachine(); +test.testBlosxom(); +test.testRadioUserland(); +test.testTextPattern(); +} rssFeed = list.getAdRSSFeed(); assertNull(atomFeed); assertNotNull(rssFeed); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/feedparser/xdocs index.xml
burton 2004/09/05 15:06:38 Modified:feedparser/xdocs index.xml Log: updated index.xml... Revision ChangesPath 1.3 +125 -34 jakarta-commons-sandbox/feedparser/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-commons-sandbox/feedparser/xdocs/index.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.xml 25 May 2004 17:30:42 - 1.2 +++ index.xml 5 Sep 2004 22:06:38 - 1.3 @@ -1,39 +1,130 @@ ?xml version=1.0? - document +properties +author email=burton at apache.orgKevin A. Burton/author +titleOverview - Jakarta FeedParser/title +/properties +body + +section name=Jakarta FeedParser + +p +Jakarta FeedParser is a Java RSS/Atom parser designed to +elegantly support all versions of RSS (0.9, 0.91, 0.92, 1.0, and +2.0), Atom 0.3 (and future versions) as well as easy ad hoc +extension and RSS 1.0 modules capability. +/p + +p +FeedParser was the parser API designed from a +href=http://newsmonster.org;NewsMonster/a and has been +donated to the ASF in order to continue development. +/p + +p +FeedParser differs from most other RSS/Atom parsers in that it +is not DOM based but event based (similar to SAX). Instead of +the low level startElement() API present in SAX, we provide high +level events based on RSS parsing information. +/p + +p +Events are also given to the caller independent of the +underlying format. This is accomplished by a Feed Event Model +that isolates your application from the underlying feed format. +This enables your applications to transparently support all RSS +versions and Atom. We also hide format specific implementation +such as dates (RFC 822 in RSS 2.0 and 0.9x and ISO 8601 in RSS +1.0 and Atom). +/p + +p +The FeedParser distribution also includes: + +/p + +ol +liAn implementation of RSS and Atom autodiscovery./li + +liSupport for all content modules including xhtml:body, +mod_content (RDF and inline), and atom:content /li + +li +Atom 1.0 link API as well as RSS 1.0 mod_link API +/li + +li +Outline Parser Markup Language (OPML) +/li + +li +An HTML link parser for finding all links in an HTML source +file and expanding them to become full +/li + +/ol + +/section + +section name=Example + +p +Developers place all their logic in a FeedParserListener which +receives callbacks from the FeedParser. They then pass the +FeedParser an InputStream and they are ready to get events: +/p + +source +FeedParser parser = FeedParserFactory.newFeedParser(); + +FeedParserListener listener = new DefaultFeedParserListener() { + +public void onItem( FeedParserState state, +String title, +String link, +String description, +String permalink ) throws FeedParserException { + +System.out.println( Found a new published article: + permalink ); + +} + +}; + +parser.parse( listener, new URL( http://peerfear.org/rss/index.rss; ).openStream() ); + +/source + +p +Of course this is just a trivial example from the +HelloFeedParser demo distributed with the app. Other events +such as onChannel, onImage, onLink can be used to obtain +additional metadata. +/p + +/section + +section name=Future Directions + +p +ol +li +Support FOAF parsing which correct RDF handling. +/li + +li + +Better support for unique Atom features such as +atom:summary. + +/li + +/ol + +/p + +/section - properties -
Re: [digester]RE: [lang] MappedMessageFormat
On Sun, 2004-09-05 at 05:08, Gary Gregory wrote: Simon and [digester], Since we are on this topic; are there any other features implemented in Digester that you feel should be in Java and therefore in [lang]? No, there's nothing else I can think of. Unless someone wishes to argue that the whole of Digester should be included in the standard Java distro :-) Regards, Simon - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[VOTE] JEXL 1.0
The JEXL release candidate has been in the wild for a week or so now, and there have been no new issues raised. I'd like to cut the 1.0 release from CVS HEAD in the next few days. Here's my +1. [ ] +1 - Yes, Release the current code as 1.0. [ ] +0 - Can't see why not [ ] -1 - Please don't. Here's why:. -- http://www.multitask.com.au/people/dion/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] JEXL 1.0
+1. Quoting Dion Gillard [EMAIL PROTECTED]: The JEXL release candidate has been in the wild for a week or so now, and there have been no new issues raised. I'd like to cut the 1.0 release from CVS HEAD in the next few days. Here's my +1. [ ] +1 - Yes, Release the current code as 1.0. [ ] +0 - Can't see why not [ ] -1 - Please don't. Here's why:. -- http://www.multitask.com.au/people/dion/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/impl GridBagConstraintBean.java
dion2004/09/05 17:21:11 Modified:jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/impl GridBagConstraintBean.java Log: Apply Jelly-127 Revision ChangesPath 1.5 +32 -0 jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/impl/GridBagConstraintBean.java Index: GridBagConstraintBean.java === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/impl/GridBagConstraintBean.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- GridBagConstraintBean.java25 Feb 2004 01:31:59 - 1.4 +++ GridBagConstraintBean.java6 Sep 2004 00:21:10 - 1.5 @@ -139,6 +139,22 @@ return west; case NORTHWEST : return northwest; +case LINE_START : +return line_start; +case LINE_END : +return line_end; +case PAGE_START : +return page_start; +case PAGE_END : +return page_end; +case FIRST_LINE_START : +return first_line_start; +case FIRST_LINE_END : +return first_line_end; +case LAST_LINE_START : +return last_line_start; +case LAST_LINE_END : +return last_line_end; default : throw new IllegalArgumentException(Anchor must be one of the GridBagLayout constants: CENTER, NORTH, NORTHEAST, EAST, SOUTHEAST, SOUTH, SOUTHWEST, WEST, or NORTHWEST.); } @@ -170,6 +186,22 @@ this.anchor = WEST; else if (lcAnchorString.equals(northwest)) this.anchor = NORTHWEST; +else if (lcAnchorString.equals(page_start)) +this.anchor = PAGE_START; +else if (lcAnchorString.equals(page_end)) +this.anchor = PAGE_END; +else if (lcAnchorString.equals(line_start)) +this.anchor = LINE_START; +else if (lcAnchorString.equals(line_end)) +this.anchor = LINE_END; +else if (lcAnchorString.equals(first_line_start)) +this.anchor = FIRST_LINE_START; +else if (lcAnchorString.equals(first_line_end)) +this.anchor = FIRST_LINE_END; +else if (lcAnchorString.equals(last_line_end)) +this.anchor = LAST_LINE_END; +else if (lcAnchorString.equals(last_line_start)) +this.anchor = LAST_LINE_START; else throw new IllegalArgumentException(Anchor must be the name of one of the GridBagLayoutConstants (case doesn't matter): center, north, northeast, east, southeast, south, southwest, west, or northwest.); this.anchorSet = true; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (JELLY-128) Layout constraints don't work with RootPaneContainer classes like JFrame
Message: A new issue has been created in JIRA. - View the issue: http://issues.apache.org/jira/browse/JELLY-128 Here is an overview of the issue: - Key: JELLY-128 Summary: Layout constraints don't work with RootPaneContainer classes like JFrame Type: Bug Status: Unassigned Priority: Major Project: jelly Components: taglib.swing Versions: 1.0-beta-4 Assignee: Reporter: Hans Gilde Created: Sun, 5 Sep 2004 5:24 PM Updated: Sun, 5 Sep 2004 5:24 PM Description: The ComponentTag is broken such that components that implement RootPaneContainer, like JFrame and JDialog don't work with layout constraints like borderAlign or gbc. - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (JELLY-127) Add relative constraints to the GBC tag
Message: The following issue has been closed. Resolver: dion gillard Date: Sun, 5 Sep 2004 5:25 PM Jelly must be jdk1.3 compliant - View the issue: http://issues.apache.org/jira/browse/JELLY-127 Here is an overview of the issue: - Key: JELLY-127 Summary: Add relative constraints to the GBC tag Type: Improvement Status: Closed Priority: Minor Resolution: WON'T FIX Project: jelly Components: taglib.swing Fix Fors: 1.0-beta-4 Versions: 1.0-beta-4 Assignee: Reporter: Hans Gilde Created: Sun, 5 Sep 2004 5:05 PM Updated: Sun, 5 Sep 2004 5:25 PM Description: GBCTag doesn't support some constraints like LINE_START LINE_END - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (JELLY-128) Layout constraints don't work with RootPaneContainer classes like JFrame
The following issue has been updated: Updater: Hans Gilde (mailto:[EMAIL PROTECTED]) Date: Sun, 5 Sep 2004 5:24 PM Comment: here's the fix Changes: Attachment changed to rootrpanecontainer-fix.txt - For a full history of the issue, see: http://issues.apache.org/jira/browse/JELLY-128?page=history - View the issue: http://issues.apache.org/jira/browse/JELLY-128 Here is an overview of the issue: - Key: JELLY-128 Summary: Layout constraints don't work with RootPaneContainer classes like JFrame Type: Bug Status: Unassigned Priority: Major Project: jelly Components: taglib.swing Versions: 1.0-beta-4 Assignee: Reporter: Hans Gilde Created: Sun, 5 Sep 2004 5:24 PM Updated: Sun, 5 Sep 2004 5:24 PM Description: The ComponentTag is broken such that components that implement RootPaneContainer, like JFrame and JDialog don't work with layout constraints like borderAlign or gbc. - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/lang/xdocs userguide.xml
bayard 2004/09/05 17:41:02 Modified:lang/xdocs userguide.xml Log: added classes to write about Revision ChangesPath 1.4 +57 -2 jakarta-commons/lang/xdocs/userguide.xml Index: userguide.xml === RCS file: /home/cvs/jakarta-commons/lang/xdocs/userguide.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- userguide.xml 5 Sep 2004 21:48:48 - 1.3 +++ userguide.xml 6 Sep 2004 00:41:02 - 1.4 @@ -95,10 +95,24 @@ /section section name=lang.builder.* + !-- + CompareToBuilder + EqualsBuilder + HashCodeBuilder + ReflectionToStringBuilder + StandardToStringStyle + ToStringBuilder + ToStringStyle + -- pWhen you write a hashcode, do you check Bloch's Effective Java? No? You just hack in a quick number? Well HashCodeBuilder will save your day. It, and its buddies (EqualsBuilder, CompareToBuilder, ToStringBuilder), take care of the nasty bits while you focus on the important bits, like which fields will go into making up the hashcode./p /section - section name=lang.enums (formerly lang.enum) + section name=lang.enums.* (formerly lang.enum) + !-- + Enum + EnumUtils + ValuedEnum + -- pEnums are an old C thing. Very useful. One of the major uses is to give type to your constants, and even more, to give them order. For example:/p h5A simple Enum/h5 source @@ -124,24 +138,65 @@ /section section name=lang.exception.* + !-- + ExceptionUtils + Nestable + NestableDelegate + NestableError + NestableException + NestableRuntimeException + -- pJDK 1.4 brought us NestedExceptions, that is an Exception which can link to another Exception. This subpackage provides it to those of us who have to code to something other than JDK 1.4 (most reusable code libaries are aimed at JDK 1.2)./p pIt isn't just a nested exception framework though, it uses reflection to allow it to handle many nested exception frameworks, including JDK 1.4's./p pThe reflection ability is one of the more interesting tricks hidden in the reflection sub-package, and of much use to writers of applications such as Tomcat or IDEs, in fact any code which has to catch 'Exception' from an unknown source and then wanting to display in a novel way./p /section section name=lang.math.* + !-- + DoubleRange + FloatRange + Fraction + IntRange + JVMRandom + LongRange + NumberRange + NumberUtils + RandomUtils + Range + -- pAlthough Commons-Math also exists, some basic mathematical functions are contained within Lang. These include classes to represent ranges of numbers, a Fraction class, various utilities for random numbers, and the flagship class, NumberUtils which contains a handful of classic number functions. /p pThere are two aspects of this package I would like to highlight. The first is NumberUtils.createNumber(String), a method which does its best to convert a String into a Number object. You have no idea what type of Number it will return, so you should call the relevant xxxValue method when you reach the point of needing a number. NumberUtils also has a related isNumber method. The second is the JVMRandom class. This is an instance of Random which relies on the Math.random() method for its implementation and so gives the developer access to the JVM's random seed. If you try to create Random objects in the same millisecond, they will give the same answer; so quickly you will find yourself caching that Random object. Rather than caching your own object, simply use the one the JVM is caching already. The RandomUtils provides a static access to the JVMRandom class, which may be easier to use. /p /section section name=lang.mutable.* + !-- + Mutable + MutableByte + MutableDouble + MutableFloat + MutableInt + MutableLong + MutableObject + MutableShort + -- /section section name=lang.time.* -pLang 2.0 saw the arrival of a time package. It contains some basic utilities for manipulating time (a delorean, police box and [hgwells lookup needed]?). These include a StopWatch for simple performance measurements and an optimised FastDateFormat class. /p + !-- + DateFormatUtils + DateUtils + DurationFormatUtils + FastDateFormat + StopWatch + -- +pLang 2.0 saw the arrival of a time package. It contains some basic utilities for manipulating time (a delorean, police box and grandfather clock?). These include a StopWatch for simple performance measurements and an optimised FastDateFormat class. /p /section section name=lang.text.* + !-- + Interpolation + MappedMessageFormat + -- /section
cvs commit: jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/impl GridBagConstraintBean.java
dion2004/09/05 17:41:07 Modified:jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/impl GridBagConstraintBean.java Log: Rollback Jelly-127 as it is JDK 1.4 specific Revision ChangesPath 1.6 +0 -32 jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/impl/GridBagConstraintBean.java Index: GridBagConstraintBean.java === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/impl/GridBagConstraintBean.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- GridBagConstraintBean.java6 Sep 2004 00:21:10 - 1.5 +++ GridBagConstraintBean.java6 Sep 2004 00:41:07 - 1.6 @@ -139,22 +139,6 @@ return west; case NORTHWEST : return northwest; -case LINE_START : -return line_start; -case LINE_END : -return line_end; -case PAGE_START : -return page_start; -case PAGE_END : -return page_end; -case FIRST_LINE_START : -return first_line_start; -case FIRST_LINE_END : -return first_line_end; -case LAST_LINE_START : -return last_line_start; -case LAST_LINE_END : -return last_line_end; default : throw new IllegalArgumentException(Anchor must be one of the GridBagLayout constants: CENTER, NORTH, NORTHEAST, EAST, SOUTHEAST, SOUTH, SOUTHWEST, WEST, or NORTHWEST.); } @@ -186,22 +170,6 @@ this.anchor = WEST; else if (lcAnchorString.equals(northwest)) this.anchor = NORTHWEST; -else if (lcAnchorString.equals(page_start)) -this.anchor = PAGE_START; -else if (lcAnchorString.equals(page_end)) -this.anchor = PAGE_END; -else if (lcAnchorString.equals(line_start)) -this.anchor = LINE_START; -else if (lcAnchorString.equals(line_end)) -this.anchor = LINE_END; -else if (lcAnchorString.equals(first_line_start)) -this.anchor = FIRST_LINE_START; -else if (lcAnchorString.equals(first_line_end)) -this.anchor = FIRST_LINE_END; -else if (lcAnchorString.equals(last_line_end)) -this.anchor = LAST_LINE_END; -else if (lcAnchorString.equals(last_line_start)) -this.anchor = LAST_LINE_START; else throw new IllegalArgumentException(Anchor must be the name of one of the GridBagLayoutConstants (case doesn't matter): center, north, northeast, east, southeast, south, southwest, west, or northwest.); this.anchorSet = true; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (JELLY-129) GBC and borderAlign have incorrect error message
Message: A new issue has been created in JIRA. - View the issue: http://issues.apache.org/jira/browse/JELLY-129 Here is an overview of the issue: - Key: JELLY-129 Summary: GBC and borderAlign have incorrect error message Type: Bug Status: Unassigned Priority: Minor Project: jelly Components: taglib.swing Versions: 1.0-beta-4 Assignee: Reporter: Hans Gilde Created: Sun, 5 Sep 2004 5:42 PM Updated: Sun, 5 Sep 2004 5:42 PM Description: Both the GBC and borderAlign tags throw errors that say this tag must be nested within a tr tag, although they work fine otherwise. - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 28938] - [primitives] [PATCH] IntHashMap -- A hash map that uses primitive interger for the key rather than objects.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=28938. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=28938 [primitives] [PATCH] IntHashMap -- A hash map that uses primitive interger for the key rather than objects. --- Additional Comments From [EMAIL PROTECTED] 2004-09-06 01:07 --- I made a velocity-based primitives collections API: http://gleamynode.net/dev/projects/collections/ I think XXX2YYYMap will be very useful to Commons Primitives. Please let me know if there is (or isn't) any plan to provide primitive maps. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (JELLY-130) GBC relative constraints by reflection?
Message: A new issue has been created in JIRA. - View the issue: http://issues.apache.org/jira/browse/JELLY-130 Here is an overview of the issue: - Key: JELLY-130 Summary: GBC relative constraints by reflection? Type: Improvement Status: Unassigned Priority: Minor Project: jelly Components: taglib.swing Assignee: Reporter: Hans Gilde Created: Sun, 5 Sep 2004 6:40 PM Updated: Sun, 5 Sep 2004 6:40 PM Description: Normally I wouldn't push something like this, but I have a few developers using the Swing tags and this is the most requested feature. Feel free to reject it, I just thought that if we want it so much, maybe others do too. This patch uses reflection to access the statics, so it'll work under 1.3. - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (JELLY-130) GBC relative constraints by reflection?
The following issue has been updated: Updater: Hans Gilde (mailto:[EMAIL PROTECTED]) Date: Sun, 5 Sep 2004 6:40 PM Changes: Attachment changed to gbc-relative-reflection.txt - For a full history of the issue, see: http://issues.apache.org/jira/browse/JELLY-130?page=history - View the issue: http://issues.apache.org/jira/browse/JELLY-130 Here is an overview of the issue: - Key: JELLY-130 Summary: GBC relative constraints by reflection? Type: Improvement Status: Unassigned Priority: Minor Project: jelly Components: taglib.swing Assignee: Reporter: Hans Gilde Created: Sun, 5 Sep 2004 6:40 PM Updated: Sun, 5 Sep 2004 6:40 PM Description: Normally I wouldn't push something like this, but I have a few developers using the Swing tags and this is the most requested feature. Feel free to reject it, I just thought that if we want it so much, maybe others do too. This patch uses reflection to access the statics, so it'll work under 1.3. - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [feedparser] Attaching patch again
Hi Kevin. Did you rerun the unit tests after that change to make sure they work? Brad --- Kevin A. Burton [EMAIL PROTECTED] wrote: Brad Neuberg wrote: It looks like attachments are stripped out of the mailing list; here is the patch in unified diff format: I rewrote getFeedPath 1. it was using duplicate indexOf queries for the same value. Wasted CPU :-/ Also I used lastIndexOf to start scan from the end of the string. 2. It stripped text after # or ? but not both... so http://foo.com?cat=dog#here would not work... Here is the new method body: protected static String getFeedPath( String resource ) throws MalformedURLException { // strip off any query string or anchors int end = resource.lastIndexOf( # ); if ( end != -1 ) resource = resource.substring( 0, end ); end = resource.lastIndexOf( ? ); if ( end != -1 ) resource = resource.substring( 0, end ); if ( ! resource.endsWith( blosxom.cgi ) ) { Matcher fileMatcher = patternToStrip.matcher(resource); resource = fileMatcher.replaceAll(); } if ( ! resource.endsWith( / ) ) { resource = resource + /; } return resource; } Kevin -- Please reply using PGP. http://peerfear.org/pubkey.asc NewsMonster - http://www.newsmonster.org/ Kevin A. Burton, Location - San Francisco, CA, Cell - 415.595.9965 AIM/YIM - sfburtonator, Web - http://peerfear.org/ GPG fingerprint: 5FB2 F3E2 760E 70A8 6174 D393 E84D 8D04 99F1 4412 IRC - freenode.net #infoanarchy | #p2p-hackers | #newsmonster - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (JELLY-130) GBC relative constraints by reflection?
The following comment has been added to this issue: Author: dion gillard Created: Sun, 5 Sep 2004 7:36 PM Body: Looks good other than the exception handling. - View this comment: http://issues.apache.org/jira/browse/JELLY-130?page=comments#action_52852 - View the issue: http://issues.apache.org/jira/browse/JELLY-130 Here is an overview of the issue: - Key: JELLY-130 Summary: GBC relative constraints by reflection? Type: Improvement Status: Unassigned Priority: Minor Project: jelly Components: taglib.swing Assignee: Reporter: Hans Gilde Created: Sun, 5 Sep 2004 6:40 PM Updated: Sun, 5 Sep 2004 7:36 PM Description: Normally I wouldn't push something like this, but I have a few developers using the Swing tags and this is the most requested feature. Feel free to reject it, I just thought that if we want it so much, maybe others do too. This patch uses reflection to access the statics, so it'll work under 1.3. - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (JELLY-130) GBC relative constraints by reflection?
The following issue has been updated: Updater: Hans Gilde (mailto:[EMAIL PROTECTED]) Date: Sun, 5 Sep 2004 7:48 PM Comment: better? Changes: Attachment changed to gbc-relative-reflection2.txt - For a full history of the issue, see: http://issues.apache.org/jira/browse/JELLY-130?page=history - View the issue: http://issues.apache.org/jira/browse/JELLY-130 Here is an overview of the issue: - Key: JELLY-130 Summary: GBC relative constraints by reflection? Type: Improvement Status: Unassigned Priority: Minor Project: jelly Components: taglib.swing Assignee: Reporter: Hans Gilde Created: Sun, 5 Sep 2004 6:40 PM Updated: Sun, 5 Sep 2004 7:48 PM Description: Normally I wouldn't push something like this, but I have a few developers using the Swing tags and this is the most requested feature. Feel free to reject it, I just thought that if we want it so much, maybe others do too. This patch uses reflection to access the statics, so it'll work under 1.3. - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swing project.xml
dion2004/09/05 19:51:06 Modified:jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/impl GridBagConstraintBean.java jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing GbcTag.java jelly/jelly-tags/swing project.xml Log: Apply Jelly-130, make GbcTag jdk 1.3 compliant Revision ChangesPath 1.7 +72 -12 jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/impl/GridBagConstraintBean.java Index: GridBagConstraintBean.java === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/impl/GridBagConstraintBean.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- GridBagConstraintBean.java6 Sep 2004 00:41:07 - 1.6 +++ GridBagConstraintBean.java6 Sep 2004 02:51:06 - 1.7 @@ -17,6 +17,10 @@ import java.awt.GridBagConstraints; import java.awt.Insets; +import java.lang.reflect.Field; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * This class is a simple bean-wrapper for the [EMAIL PROTECTED] GridBagConstraints} class @@ -28,16 +32,19 @@ */ public class GridBagConstraintBean extends GridBagConstraints { -private boolean gridxSet = false, -gridySet = false, -gridwidthSet = false, -gridheightSet = false, -weightxSet = false, -weightySet = false, -ipadxSet = false, -ipadySet = false, -anchorSet = false, -fillSet = false; +private boolean gridxSet = false; +private boolean gridySet = false; +private boolean gridwidthSet = false; +private boolean gridheightSet = false; +private boolean weightxSet = false; +private boolean weightySet = false; +private boolean ipadxSet = false; +private boolean ipadySet = false; +private boolean anchorSet = false; +private boolean fillSet = false; + +/** Logging output */ +private static final Log LOG = LogFactory.getLog(GridBagConstraintBean.class); public GridBagConstraintBean() { } @@ -139,9 +146,26 @@ return west; case NORTHWEST : return northwest; -default : -throw new IllegalArgumentException(Anchor must be one of the GridBagLayout constants: CENTER, NORTH, NORTHEAST, EAST, SOUTHEAST, SOUTH, SOUTHWEST, WEST, or NORTHWEST.); } + +if (this.anchor == getByReflection(LINE_START)) +return line_start; +else if (this.anchor == getByReflection(LINE_END)) +return line_end; +else if (this.anchor == getByReflection(PAGE_START)) +return page_start; +else if (this.anchor == getByReflection(PAGE_END)) +return page_end; +else if (this.anchor == getByReflection(FIRST_LINE_START)) +return first_line_start; +else if (this.anchor == getByReflection(FIRST_LINE_END)) +return first_line_end; +else if (this.anchor == getByReflection(LAST_LINE_START)) +return last_line_start; +else if (this.anchor == getByReflection(LAST_LINE_END)) +return last_line_end; + +throw new IllegalArgumentException(Anchor must be one of the GridBagLayout constants: CENTER, NORTH, NORTHEAST, EAST, SOUTHEAST, SOUTH, SOUTHWEST, WEST, or NORTHWEST.); } /** Accepts one of the strings with the same name as the constants @@ -170,6 +194,22 @@ this.anchor = WEST; else if (lcAnchorString.equals(northwest)) this.anchor = NORTHWEST; +else if (lcAnchorString.equals(page_start)) +this.anchor = getByReflection(PAGE_START); +else if (lcAnchorString.equals(page_end)) +this.anchor = getByReflection(PAGE_END); +else if (lcAnchorString.equals(line_start)) +this.anchor = getByReflection(LINE_START); +else if (lcAnchorString.equals(line_end)) +this.anchor = getByReflection(LINE_END); +else if (lcAnchorString.equals(first_line_start)) +this.anchor = getByReflection(FIRST_LINE_START); +else if (lcAnchorString.equals(first_line_end)) +this.anchor = getByReflection(FIRST_LINE_END); +else if (lcAnchorString.equals(last_line_end)) +this.anchor = getByReflection(LAST_LINE_END); +else if (lcAnchorString.equals(last_line_start)) +this.anchor = getByReflection(LAST_LINE_START); else throw new IllegalArgumentException(Anchor
[jira] Closed: (JELLY-130) GBC relative constraints by reflection?
Message: The following issue has been closed. Resolver: dion gillard Date: Sun, 5 Sep 2004 7:53 PM Applied with minor changes - View the issue: http://issues.apache.org/jira/browse/JELLY-130 Here is an overview of the issue: - Key: JELLY-130 Summary: GBC relative constraints by reflection? Type: Improvement Status: Closed Priority: Minor Resolution: FIXED Project: jelly Components: taglib.swing Fix Fors: 1.0-beta-4 Assignee: Reporter: Hans Gilde Created: Sun, 5 Sep 2004 6:40 PM Updated: Sun, 5 Sep 2004 7:53 PM Description: Normally I wouldn't push something like this, but I have a few developers using the Swing tags and this is the most requested feature. Feel free to reject it, I just thought that if we want it so much, maybe others do too. This patch uses reflection to access the statics, so it'll work under 1.3. - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swing/xdocs changes.xml
dion2004/09/05 19:52:33 Modified:jelly/jelly-tags/swing/xdocs changes.xml Log: docs Revision ChangesPath 1.2 +2 -0 jakarta-commons/jelly/jelly-tags/swing/xdocs/changes.xml Index: changes.xml === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/xdocs/changes.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- changes.xml 2 Sep 2004 00:14:54 - 1.1 +++ changes.xml 6 Sep 2004 02:52:33 - 1.2 @@ -25,6 +25,8 @@ /properties body release version=1.0-SNAPSHOT date=in CVS + action dev=dion type=fixEnsure JDK 1.3 compatibility./action + action dev=dion type=fix issue=JELLY-130 due-to=Hans GildeHandle JDK 1.4 GridbagConstraints using reflection/action action dev=dion type=fix issue=JELLY-122 due-to=Hans GildeComponentTag should clear it's bean reference after doTag/action /release /body - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/impl GridBagConstraintBean.java
dion2004/09/05 19:55:04 Modified:jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/impl GridBagConstraintBean.java Log: Introduce constant for error message Revision ChangesPath 1.8 +8 -5 jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/impl/GridBagConstraintBean.java Index: GridBagConstraintBean.java === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/impl/GridBagConstraintBean.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- GridBagConstraintBean.java6 Sep 2004 02:51:06 - 1.7 +++ GridBagConstraintBean.java6 Sep 2004 02:55:04 - 1.8 @@ -45,6 +45,9 @@ /** Logging output */ private static final Log LOG = LogFactory.getLog(GridBagConstraintBean.class); + +/** error message */ +private static final String ILLEGAL_ANCHOR_MSG = Anchor must be one of the GridBagLayout constants for the current Java version.; public GridBagConstraintBean() { } @@ -165,7 +168,7 @@ else if (this.anchor == getByReflection(LAST_LINE_END)) return last_line_end; -throw new IllegalArgumentException(Anchor must be one of the GridBagLayout constants: CENTER, NORTH, NORTHEAST, EAST, SOUTHEAST, SOUTH, SOUTHWEST, WEST, or NORTHWEST.); +throw new IllegalArgumentException(ILLEGAL_ANCHOR_MSG); } /** Accepts one of the strings with the same name as the constants @@ -335,16 +338,16 @@ return rv.intValue(); } catch (SecurityException e) { LOG.debug(e); -throw new IllegalArgumentException(Anchor must be one of the GridBagLayout constants for the current Java version.); +throw new IllegalArgumentException(ILLEGAL_ANCHOR_MSG); } catch (NoSuchFieldException e) { LOG.debug(e); -throw new IllegalArgumentException(Anchor must be one of the GridBagLayout constants for the current Java version.); +throw new IllegalArgumentException(ILLEGAL_ANCHOR_MSG); } catch (IllegalArgumentException e) { LOG.debug(e); -throw new IllegalArgumentException(Anchor must be one of the GridBagLayout constants for the current Java version.); +throw new IllegalArgumentException(ILLEGAL_ANCHOR_MSG); } catch (IllegalAccessException e) { LOG.debug(e); -throw new IllegalArgumentException(Anchor must be one of the GridBagLayout constants for the current Java version.); +throw new IllegalArgumentException(ILLEGAL_ANCHOR_MSG); } } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Created: (JELLY-131) Swing tags unit test
Message: A new issue has been created in JIRA. - View the issue: http://issues.apache.org/jira/browse/JELLY-131 Here is an overview of the issue: - Key: JELLY-131 Summary: Swing tags unit test Type: Test Status: Unassigned Priority: Major Project: jelly Components: taglib.swing Assignee: Reporter: Hans Gilde Created: Sun, 5 Sep 2004 7:58 PM Updated: Sun, 5 Sep 2004 7:58 PM Description: We need a set of unit tests for Swing tags! - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing swingTags.jelly TestSwingTags.java
dion2004/09/05 20:14:14 Added: jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/core BaseJellyTest.java jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing swingTags.jelly TestSwingTags.java Log: Add tests Revision ChangesPath 1.1 jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/core/BaseJellyTest.java Index: BaseJellyTest.java === /* * Copyright 2002,2004 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the License); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an AS IS BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.apache.commons.jelly.core; import java.net.URL; import junit.framework.TestCase; import org.apache.commons.jelly.Jelly; import org.apache.commons.jelly.JellyContext; import org.apache.commons.jelly.XMLOutput; /** * @author Rodney Waldhoff * @version $Revision: 1.1 $ $Date: 2004/09/06 03:14:14 $ */ public abstract class BaseJellyTest extends TestCase { public BaseJellyTest(String name) { super(name); } public void setUp() throws Exception { super.setUp(); jelly = new Jelly(); context = new JellyContext(); xmlOutput = XMLOutput.createDummyXMLOutput(); } protected void setUpScript(String scriptname) throws Exception { URL url = this.getClass().getResource(scriptname); if(null == url) { throw new Exception( Could not find Jelly script: + scriptname + in package of class: + getClass().getName() ); } jelly.setUrl(url); String exturl = url.toExternalForm(); int lastSlash = exturl.lastIndexOf(/); String extBase = exturl.substring(0,lastSlash+1); URL baseurl = new URL(extBase); context.setCurrentURL(baseurl); } protected Jelly getJelly() { return jelly; } protected JellyContext getJellyContext() { return context; } protected XMLOutput getXMLOutput() { return xmlOutput; } private Jelly jelly = null; private JellyContext context = null; private XMLOutput xmlOutput = null; } 1.1 jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/swingTags.jelly Index: swingTags.jelly === ?xml version=1.0? j:jelly xmlns:j=jelly:core xmlns=jelly:swing !--for the basic component addembly-- j:if test=${test.simple} frame name=frame var=frame size=100,100 location=200,200 panel name=panel button name=button background=#112233 foreground=#445566/ /panel /frame /j:if !--for the GridBag test-- j:if test=${test.gbc} frame name=frame var=frame gridBagLayout gbc anchor=north fill=vertical gridheight=3 gridwidth=2 gridx=4 gridy=5 insets=1,2,3,4 ipadx=7 ipady=8 weightx=.3 weighty=.6 button name=button/ /gbc gbc gridx=1 gridy=2 insets=3,4,5,6 ipadx=8 ipady=9 gbc ipadx=2 button name=button2 / /gbc /gbc /gridBagLayout /frame /j:if !--for the GridBag 1.4 test-- j:if test=${test.gbc14} frame name=frame var=frame gridBagLayout gbc anchor=line_start button name=button/ /gbc /gridBagLayout
cvs commit: jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing TestSwingTags.java
dion2004/09/05 20:14:58 Modified:jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing TestSwingTags.java Log: Comment out failing tests Revision ChangesPath 1.2 +1 -1 jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/TestSwingTags.java Index: TestSwingTags.java === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/TestSwingTags.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestSwingTags.java6 Sep 2004 03:14:14 - 1.1 +++ TestSwingTags.java6 Sep 2004 03:14:58 - 1.2 @@ -84,7 +84,7 @@ // this is failing // assertEquals(GridBagConstraints.NORTH,constraints.anchor); -assertEquals(GridBagConstraints.VERTICAL, constraints.fill); +// assertEquals(GridBagConstraints.VERTICAL, constraints.fill); assertEquals(3, constraints.gridheight); assertEquals(2, constraints.gridwidth); assertEquals(4, constraints.gridx); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (JELLY-131) Swing tags unit test
The following comment has been added to this issue: Author: dion gillard Created: Sun, 5 Sep 2004 8:18 PM Body: And under 1.4 - View this comment: http://issues.apache.org/jira/browse/JELLY-131?page=comments#action_52858 - View the issue: http://issues.apache.org/jira/browse/JELLY-131 Here is an overview of the issue: - Key: JELLY-131 Summary: Swing tags unit test Type: Test Status: Unassigned Priority: Major Project: jelly Components: taglib.swing Assignee: Reporter: Hans Gilde Created: Sun, 5 Sep 2004 7:58 PM Updated: Sun, 5 Sep 2004 8:18 PM Description: We need a set of unit tests for Swing tags! - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing TestSwingTags.java
dion2004/09/05 20:17:48 Modified:jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing TestSwingTags.java Log: Comment out failing tests Revision ChangesPath 1.3 +14 -14 jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/TestSwingTags.java Index: TestSwingTags.java === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/TestSwingTags.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TestSwingTags.java6 Sep 2004 03:14:58 - 1.2 +++ TestSwingTags.java6 Sep 2004 03:17:48 - 1.3 @@ -85,22 +85,22 @@ // this is failing // assertEquals(GridBagConstraints.NORTH,constraints.anchor); // assertEquals(GridBagConstraints.VERTICAL, constraints.fill); -assertEquals(3, constraints.gridheight); -assertEquals(2, constraints.gridwidth); -assertEquals(4, constraints.gridx); -assertEquals(5, constraints.gridy); -assertEquals(7, constraints.ipadx); -assertEquals(8, constraints.ipady); -assertEquals(0.3, constraints.weightx, 0); -assertEquals(0.6, constraints.weighty, 0); -assertEquals(new Insets(1,2,3,4), constraints.insets); +// assertEquals(3, constraints.gridheight); +// assertEquals(2, constraints.gridwidth); +// assertEquals(4, constraints.gridx); +// assertEquals(5, constraints.gridy); +// assertEquals(7, constraints.ipadx); +// assertEquals(8, constraints.ipady); +// assertEquals(0.3, constraints.weightx, 0); +// assertEquals(new Insets(1,2,3,4), constraints.insets); +// assertEquals(0.6, constraints.weighty, 0); GridBagConstraints constraints2 = layout.getConstraints(button2); -assertEquals(1, constraints2.gridx); -assertEquals(2, constraints2.gridy); -assertEquals(2, constraints2.ipadx); -assertEquals(9, constraints2.ipady); -assertEquals(new Insets(3,4,5,6), constraints2.insets); +// assertEquals(1, constraints2.gridx); +// assertEquals(2, constraints2.gridy); +// assertEquals(2, constraints2.ipadx); +// assertEquals(9, constraints2.ipady); +// assertEquals(new Insets(3,4,5,6), constraints2.insets); } public void testGridBag14() throws Exception { - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Updated: (JELLY-131) Swing tags unit test
The following issue has been updated: Updater: Hans Gilde (mailto:[EMAIL PROTECTED]) Date: Sun, 5 Sep 2004 8:21 PM Comment: Here's a fix for one of the tests. Changes: Attachment changed to swing-tags-test2.txt - For a full history of the issue, see: http://issues.apache.org/jira/browse/JELLY-131?page=history - View the issue: http://issues.apache.org/jira/browse/JELLY-131 Here is an overview of the issue: - Key: JELLY-131 Summary: Swing tags unit test Type: Test Status: Unassigned Priority: Major Project: jelly Components: taglib.swing Assignee: Reporter: Hans Gilde Created: Sun, 5 Sep 2004 7:58 PM Updated: Sun, 5 Sep 2004 8:21 PM Description: We need a set of unit tests for Swing tags! - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (JELLY-131) Swing tags unit test
The following comment has been added to this issue: Author: dion gillard Created: Sun, 5 Sep 2004 8:24 PM Body: Which one? Could you diff it against the current cvs code? Thanks... - View this comment: http://issues.apache.org/jira/browse/JELLY-131?page=comments#action_52860 - View the issue: http://issues.apache.org/jira/browse/JELLY-131 Here is an overview of the issue: - Key: JELLY-131 Summary: Swing tags unit test Type: Test Status: Unassigned Priority: Major Project: jelly Components: taglib.swing Assignee: Reporter: Hans Gilde Created: Sun, 5 Sep 2004 7:58 PM Updated: Sun, 5 Sep 2004 8:24 PM Description: We need a set of unit tests for Swing tags! - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (JELLY-131) Swing tags unit test
The following comment has been added to this issue: Author: Hans Gilde Created: Sun, 5 Sep 2004 8:31 PM Body: Nope, sorry, these files aren't in cvs. I couldn't find an existing Swing unit test in cvs. - View this comment: http://issues.apache.org/jira/browse/JELLY-131?page=comments#action_52861 - View the issue: http://issues.apache.org/jira/browse/JELLY-131 Here is an overview of the issue: - Key: JELLY-131 Summary: Swing tags unit test Type: Test Status: Unassigned Priority: Major Project: jelly Components: taglib.swing Assignee: Reporter: Hans Gilde Created: Sun, 5 Sep 2004 7:58 PM Updated: Sun, 5 Sep 2004 8:31 PM Description: We need a set of unit tests for Swing tags! - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos homepageBuilder.jelly
dion2004/09/05 20:39:30 Modified:jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos homepageBuilder.jelly Log: Change comment Revision ChangesPath 1.3 +0 -3 jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos/homepageBuilder.jelly Index: homepageBuilder.jelly === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos/homepageBuilder.jelly,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- homepageBuilder.jelly 1 Mar 2004 12:35:19 - 1.2 +++ homepageBuilder.jelly 6 Sep 2004 03:39:30 - 1.3 @@ -14,9 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. -- -!-- - ! FIXME: Need to move this to the swing taglib --- j:jelly xmlns:j=jelly:core xmlns=jelly:swing - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos homepageBuilder.jelly
dion2004/09/05 20:39:40 Modified:jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos homepageBuilder.jelly Log: *** keyword substitution change *** Revision ChangesPath 1.4 +90 -90 jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos/homepageBuilder.jelly Index: homepageBuilder.jelly === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos/homepageBuilder.jelly,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- homepageBuilder.jelly 6 Sep 2004 03:39:30 - 1.3 +++ homepageBuilder.jelly 6 Sep 2004 03:39:40 - 1.4 @@ -1,4 +1,4 @@ -?xml version=1.0? +?xml version=1.0? !-- Copyright 2002-2004 The Apache Software Foundation @@ -14,92 +14,92 @@ See the License for the specific language governing permissions and limitations under the License. -- -j:jelly - xmlns:j=jelly:core - xmlns=jelly:swing - - !-- create the generate page action -- - - action var=createPageAction name=Build and preview your page! - j:set var=name value=${nameField.text}/ - j:set var=background value=${colorField.text}/ - j:set var=url value=${pictureField.text}/ - j:set var=hobbies value=${hobbyModel.toArray()}/ - j:set var=template value=${templateField.getSelectedItem().toString()}/ - - name = ${name} - background = ${background} - url = ${url} - hobbies = ${hobbies} - template = ${template} - - j:file name=demopage.html outputMode=html - j:include uri=${template}/ - /j:file - - frame var=showPageFrame size=500,600 location=200,200 title=Your Homepage - scrollPane - editorPane page=${context.getResource('/demopage.html').toString()} editable=false/ - /scrollPane - /frame - ${showPageFrame.show()} - /action - - - !-- create the Frame -- - - frame var=frame title=Homepage Builder location=100,100 size=800,400 - panel - -!-- uncomment this when we've implemented emptyBorder - - emptyBorder top=20 left=20 bottom=20 right=20 / --- - borderLayout - borderAlign align=west - vbox - label text=Name:/ - textField var=nameField text=James Bond/ - - label text=Favourite Color:/ - textField var=colorField text=#007007/ - - label text=Picture URL::/ - textField var=pictureField text=http://www.ianfleming.org/007news/images3/c2002_pierce1.jpg/ - - label text=Choose template::/ - comboBox var=templateField/ - ${templateField.addItem('template1.jelly')} - ${templateField.addItem('template2.jelly')} - - label text=Add a Hobby:/ - textField var=hobbyField/ - - button - action name=Add - ${hobbyModel.addElement(hobbyField.text)} - /action - /button - /vbox - /borderAlign - - borderAlign align=east - scrollPane - j:useBean class=javax.swing.DefaultListModel var=hobbyModel/ - list model=${hobbyModel}/ - ${hobbyModel.addElement('Killing bad guys')} - ${hobbyModel.addElement('Wrecking cars')} - ${hobbyModel.addElement('Eating jelly')} -
cvs commit: jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos template2.jelly template1.jelly
dion2004/09/05 20:40:00 Modified:jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos template2.jelly template1.jelly Log: *** keyword substitution change *** Revision ChangesPath 1.3 +40 -40 jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos/template2.jelly Index: template2.jelly === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos/template2.jelly,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- template2.jelly 1 Mar 2004 12:35:19 - 1.2 +++ template2.jelly 6 Sep 2004 03:40:00 - 1.3 @@ -1,4 +1,4 @@ -?xml version=1.0? +?xml version=1.0? !-- Copyright 2002-2004 The Apache Software Foundation @@ -14,42 +14,42 @@ See the License for the specific language governing permissions and limitations under the License. -- -j:jelly trim=false xmlns:j=jelly:core - - html - - head - title${name}'s Page/title - /head - - body bgcolor=${background} text=#00 - - table - tr - td - img src=${url}/ - /td - - td - h1Welcome to my Homepage!/h1 - - p - Hi, I'm ${name}. These are my hobbies: - /p - - ol - - j:forEach items=${hobbies} var=i - li${i}/li - /j:forEach - - /ol - /td - /tr - /table - - /body - - /html - -/j:jelly +j:jelly trim=false xmlns:j=jelly:core + + html + + head + title${name}'s Page/title + /head + + body bgcolor=${background} text=#00 + + table + tr + td + img src=${url}/ + /td + + td + h1Welcome to my Homepage!/h1 + + p + Hi, I'm ${name}. These are my hobbies: + /p + + ol + + j:forEach items=${hobbies} var=i + li${i}/li + /j:forEach + + /ol + /td + /tr + /table + + /body + + /html + +/j:jelly 1.3 +30 -30 jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos/template1.jelly Index: template1.jelly === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos/template1.jelly,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- template1.jelly 1 Mar 2004 12:35:19 - 1.2 +++ template1.jelly 6 Sep 2004 03:40:00 - 1.3 @@ -1,4 +1,4 @@ -?xml version=1.0? +?xml version=1.0? !-- Copyright 2002-2004 The Apache Software Foundation @@ -14,32 +14,32 @@ See the License for the specific language governing permissions and limitations under the License. -- -j:jelly trim=false xmlns:j=jelly:core - - html - - head - title${name}'s Page/title - /head - - body bgcolor=${background} text=#FF - - h1${name}'s Homepage/h1 - - img src=${url}/ - - h2My Hobbies/h2 - - ul - - j:forEach items=${hobbies} var=i - li${i}/li - /j:forEach - - /ul - - /body - - /html - -/j:jelly +j:jelly trim=false xmlns:j=jelly:core + + html + + head + title${name}'s Page/title + /head + + body bgcolor=${background} text=#FF + + h1${name}'s Homepage/h1 + + img src=${url}/ + + h2My Hobbies/h2 + + ul + + j:forEach items=${hobbies} var=i + li${i}/li + /j:forEach + + /ul + + /body + + /html + +/j:jelly - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 29767] - [API DOC] Authentication guide update: alternate authentication
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=29767. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=29767 [API DOC] Authentication guide update: alternate authentication --- Additional Comments From [EMAIL PROTECTED] 2004-09-05 20:22 --- Created an attachment (id=12651) Docs patch - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 29767] - [API DOC] Authentication guide update: alternate authentication
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=29767. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=29767 [API DOC] Authentication guide update: alternate authentication --- Additional Comments From [EMAIL PROTECTED] 2004-09-05 20:23 --- Created an attachment (id=12652) Custom auth example - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 29767] - [API DOC] Authentication guide update: alternate authentication
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=29767. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=29767 [API DOC] Authentication guide update: alternate authentication --- Additional Comments From [EMAIL PROTECTED] 2004-09-05 20:25 --- I've added a few quick docs regarding custom AuthSchemes and a custom AuthScheme example. Please have a look and let me know what you think. Mike - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]