svn commit: r928604 - /commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml

2010-03-28 Thread bayard
Author: bayard
Date: Mon Mar 29 06:16:17 2010
New Revision: 928604

URL: http://svn.apache.org/viewvc?rev=928604&view=rev
Log:
WebSite to Website

Modified:
commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml

Modified: commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml?rev=928604&r1=928603&r2=928604&view=diff
==
--- commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml 
(original)
+++ commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml Mon 
Mar 29 06:16:17 2010
@@ -210,7 +210,7 @@
 
   
 
-  
+  
 Publish Updated Website
 
 Update the website, per the instructions here. 




svn commit: r928603 - in /commons/proper/commons-site/trunk/src/site/xdoc/releases: index.xml publish-site.xml release.xml

2010-03-28 Thread bayard
Author: bayard
Date: Mon Mar 29 06:04:55 2010
New Revision: 928603

URL: http://svn.apache.org/viewvc?rev=928603&view=rev
Log:
Editing the publish release page down a bit, splitting the website publishing 
aspect to another page so people can find that before they have to do a release

Added:
commons/proper/commons-site/trunk/src/site/xdoc/releases/publish-site.xml   
(with props)
Modified:
commons/proper/commons-site/trunk/src/site/xdoc/releases/index.xml
commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml

Modified: commons/proper/commons-site/trunk/src/site/xdoc/releases/index.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/commons-site/trunk/src/site/xdoc/releases/index.xml?rev=928603&r1=928602&r2=928603&view=diff
==
--- commons/proper/commons-site/trunk/src/site/xdoc/releases/index.xml 
(original)
+++ commons/proper/commons-site/trunk/src/site/xdoc/releases/index.xml Mon Mar 
29 06:04:55 2010
@@ -43,6 +43,7 @@
 Preparations For A Release
 Cutting The Release - Step By 
Step
 Versioning Guidelines
+Publishing the Website
 
 
 

Added: commons/proper/commons-site/trunk/src/site/xdoc/releases/publish-site.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/commons-site/trunk/src/site/xdoc/releases/publish-site.xml?rev=928603&view=auto
==
--- commons/proper/commons-site/trunk/src/site/xdoc/releases/publish-site.xml 
(added)
+++ commons/proper/commons-site/trunk/src/site/xdoc/releases/publish-site.xml 
Mon Mar 29 06:04:55 2010
@@ -0,0 +1,74 @@
+
+
+
+
+ 
+  Publishing The Site
+  Commons Documentation Team
+ 
+
+ 
+
+
+
+  
+Publish Updated Website
+
+Run the following to deploy the new component website:
+
+  mvn site:deploy
+
+
+
+On people.apache.org, verify that the directory has been updated, and that 
the
+file and directory permissions are correct (readable by all, not writeable 
by
+world, but group writeable).
+
+
+Note that the files are transferred to the real web site only every
+few hours, so it may be a while before you see your changes appear. 
However if
+you set your webbrowser's HTTP proxy to 209.237.227.195 port 80 and access
+http://commons.apache.org/ you should be able to see the changes 
immediately.
+
+Perform Manual Fixups (if any)
+
+It is quite nice for a component website to provide not just the latest 
javadocs and
+release notes, but also links to this information for previous releases. 
However Maven
+doesn't provide any way to do this. The usual solution is therefore for 
the component
+to arrange for its generated website to have some navbar links that point 
to somewhere
+that doesn't exist (at least not created by Maven), then manually put the 
missing info
+at the needed location after "maven site:deploy" has been run. If the 
component you
+are deploying has done such tricks, then you need to do the manual fixups 
now.
+
+
+As an example, the foo component's website might have links for "1.1 
release notes"
+and "1.1 javadoc" that point to "release11/RELEASE-NOTES.txt" and 
"release11/api";
+in that case you'll need to create that release11 directory and install 
the old
+release notes and javadoc there. 
+
+
+Note that "maven site:deploy" will not delete any extra directories or 
files that were
+already there, so if there was a "release10" directory that is no longer 
referenced
+from the new website then you should delete that old directory.
+
+  
+
+
+
+
+

Propchange: 
commons/proper/commons-site/trunk/src/site/xdoc/releases/publish-site.xml
--
svn:eol-style = native

Modified: commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml?rev=928603&r1=928602&r2=928603&view=diff
==
--- commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml 
(original)
+++ commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml Mon 
Mar 29 06:04:55 2010
@@ -18,50 +18,41 @@
 
 
  
-  Cutting The Release
+  Publishing The Release
   Commons Documentation Team
  
 
  
 
-
-  
+
+  
 
-This document gives step-by-step instructions for cutting a release. These 
instructions
-assume that the component uses Maven to build the site, and 
either
-Maven or Ant to build the actual distributed files.
-
-
-This documentation is pretty *nix-centric. Hopefully, release managers 
using windoz will
-be able to work out what they need to do for their platform. Any pat

svn commit: r928582 - /commons/proper/commons-site/trunk/src/site/xdoc/releases/index.xml

2010-03-28 Thread bayard
Author: bayard
Date: Mon Mar 29 03:29:26 2010
New Revision: 928582

URL: http://svn.apache.org/viewvc?rev=928582&view=rev
Log:
Cutting some of the text. Feedback section unnecessary. Keeping the focus on 
the novice reader not legal bureaucracy (components who differ must document 
statement)

Modified:
commons/proper/commons-site/trunk/src/site/xdoc/releases/index.xml

Modified: commons/proper/commons-site/trunk/src/site/xdoc/releases/index.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/commons-site/trunk/src/site/xdoc/releases/index.xml?rev=928582&r1=928581&r2=928582&view=diff
==
--- commons/proper/commons-site/trunk/src/site/xdoc/releases/index.xml 
(original)
+++ commons/proper/commons-site/trunk/src/site/xdoc/releases/index.xml Mon Mar 
29 03:29:26 2010
@@ -28,15 +28,13 @@
 
 
 The Apache Commons project differs from many other Apache 
projects because 
-it is comprised of multiple, independently released components. 
Therefore, the release procedure
-for an individual component needs to be documented so that component 
authors follow consistent
-practices.
+it is comprised of multiple, independently released components. The 
common release procedure
+for an individual component is documented here so that contributors 
can easily move from 
+component to component. 
 
 
-Individual components (such as Collections) might vary from these 
practices 
-but these steps should prove sufficient for the majority
-of cases. Any components which deviate substantially from this 
procedure should document these 
-deviations.
+Individual components may vary from these practices, but these steps 
should prove sufficient for the majority
+of cases. 
 
 
 
@@ -50,14 +48,5 @@
 
 
   
-  
-
-Feedback - yes please! 
-
-
-Comments, critiques and error reports -
-post them any and all to the dev mailing list at commons.apache.org. 
Please prefix with [doc].
-
-  
  
 




svn commit: r928581 - in /commons/proper/commons-site/trunk/src/site/xdoc/releases: index.xml mirror.xml

2010-03-28 Thread bayard
Author: bayard
Date: Mon Mar 29 03:19:37 2010
New Revision: 928581

URL: http://svn.apache.org/viewvc?rev=928581&view=rev
Log:
Removing the mirroring page. 

Removed:
commons/proper/commons-site/trunk/src/site/xdoc/releases/mirror.xml
Modified:
commons/proper/commons-site/trunk/src/site/xdoc/releases/index.xml

Modified: commons/proper/commons-site/trunk/src/site/xdoc/releases/index.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/commons-site/trunk/src/site/xdoc/releases/index.xml?rev=928581&r1=928580&r2=928581&view=diff
==
--- commons/proper/commons-site/trunk/src/site/xdoc/releases/index.xml 
(original)
+++ commons/proper/commons-site/trunk/src/site/xdoc/releases/index.xml Mon Mar 
29 03:19:37 2010
@@ -45,7 +45,6 @@
 Preparations For A Release
 Cutting The Release - Step By 
Step
 Versioning Guidelines
-Mirroring For The First Time (may be 
obsolete)
 
 
 




svn commit: r928580 - /commons/proper/commons-site/trunk/src/site/xdoc/patches.xml

2010-03-28 Thread bayard
Author: bayard
Date: Mon Mar 29 03:17:14 2010
New Revision: 928580

URL: http://svn.apache.org/viewvc?rev=928580&view=rev
Log:
Removing the 'post patch to mail list' alternative. Keep it simple. 

Modified:
commons/proper/commons-site/trunk/src/site/xdoc/patches.xml

Modified: commons/proper/commons-site/trunk/src/site/xdoc/patches.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/commons-site/trunk/src/site/xdoc/patches.xml?rev=928580&r1=928579&r2=928580&view=diff
==
--- commons/proper/commons-site/trunk/src/site/xdoc/patches.xml (original)
+++ commons/proper/commons-site/trunk/src/site/xdoc/patches.xml Mon Mar 29 
03:17:14 2010
@@ -111,49 +111,29 @@
   
   
   
-  There are two ways to submit a patch:
-  
-
-By adding the patch as an attachment to a bug report. Apache Commons 
projects
-use the Apache JIRA Bug 
Tracker.
-
-
-By mailing the patch as an attachment to the 
-dev mailing list. 
-The email subject should describe what the patch does and should be 
prefixed 
-by [PATCH]. Make sure that it's clear which component the 
patch is for. 
-Ideally the component name should be the next word after 
[PATCH].
-
-  
-  
-  
-  But which way is better? Please use JIRA, patches sent to the 
mailing lists are
-  hard to track unless they are immediately acted upon! 
-  
-  If it's a big patch 
-  then adding it to a bug report will save bandwidth on the mailing list (but 
remember 
-  to include the url in any follow-up discussions). Using a bug report also 
allows you to 
-  be automatically posted with status updates. Note that new bug reports (and 
comments on
-  existing ones) automatically get mailed to the issues email list so there's 
no
-  need to post a separate email indicating that the patch has been created.
-  
-  
-  If the patch is a fix for a bug that's already been reported then it's best 
to add it as an
-  attachment to the bug report. This not only makes management easier but also 
it stops other
-  developers out there wasting their time by developing independent fixes!
+  Please use JIRA, patches sent to the mailing lists are harder to track and 
use up more bandwidth. 
   
   
-  If there has already been discussion of the issue on the dev mailing list 
(but no JIRA
-  entry has been created), then posting the patch direct to the mailing list 
can be simpler.
+Apache Commons projects use the main Apache JIRA Bug Tracker.
+Each released project has its own JIRA page, while those in the Sandbox 
share a single JIRA 
+https://issues.apache.org/jira/browse/SANDBOX";>SANDBOX page. 
To find a released project's
+JIRA page, go to its website and choose the Issue Tracking navigation 
link. 
   
   
-  In any case, please give a detailed description of what your patch does and 
some reasons 
+  Please give a detailed description of what your patch does and some reasons 
   why it should be committed (if it's not obvious). 
+  Add the patch as an attachment to a bug report, either a new one or if you 
find an existing report 
+  then attach it there. Both will result in an email being sent to the issues 
email list. 
+  
+  
+  If there has already been discussion of the issue on the dev mailing list 
(but no JIRA
+  entry has been created), you may wish to make a note on that discussion 
thread that you 
+  have created a new issue. 
   
   
   All the commons documentation is in the commons version control system - 
including this document.
   If you see anything that's wrong or you think that you can add something 
that's missing then 
-  please submit a patch! 
+  please submit a patch to https://issues.apache.org/jira/browse/COMMONSSITE";>JIRA! 
   
   
   TIA




svn commit: r928578 - /commons/proper/commons-site/trunk/src/site/xdoc/building.xml

2010-03-28 Thread bayard
Author: bayard
Date: Mon Mar 29 03:07:27 2010
New Revision: 928578

URL: http://svn.apache.org/viewvc?rev=928578&view=rev
Log:
Removing TODO section, I don't think its needed in this doc

Modified:
commons/proper/commons-site/trunk/src/site/xdoc/building.xml

Modified: commons/proper/commons-site/trunk/src/site/xdoc/building.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/commons-site/trunk/src/site/xdoc/building.xml?rev=928578&r1=928577&r2=928578&view=diff
==
--- commons/proper/commons-site/trunk/src/site/xdoc/building.xml (original)
+++ commons/proper/commons-site/trunk/src/site/xdoc/building.xml Mon Mar 29 
03:07:27 2010
@@ -122,15 +122,5 @@
 
   
 
-  
-
-  TODO
- 
-
-  The commons-parent page describes 
what
-  the parent pom does and some of the configuration required in a
-  component's pom.
- 
-  
  
 




svn commit: r928563 - /commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml

2010-03-28 Thread psteitz
Author: psteitz
Date: Mon Mar 29 01:43:15 2010
New Revision: 928563

URL: http://svn.apache.org/viewvc?rev=928563&view=rev
Log:
Fixed typos.

Modified:
commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml

Modified: commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml?rev=928563&r1=928562&r2=928563&view=diff
==
--- commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml 
(original)
+++ commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml Mon 
Mar 29 01:43:15 2010
@@ -48,7 +48,7 @@
 
 
 In particular, it is assumed:
-
+
 
   
 The signed release candidate source and binary distributions are 
available in ~/public_html/commons-foo-1.2-RCx
@@ -86,7 +86,7 @@
 All binary versions live in the binaries subdirectory.
 
 
-mv ~/~/public_html/foo-1.2-RCx/commons-foo-1.2* binaries
+  mv ~/public_html/foo-1.2-RCx/commons-foo-1.2* binaries
 
 
 Double check the permissions for binaries and source distributions.




svn commit: r928561 - /commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml

2010-03-28 Thread psteitz
Author: psteitz
Date: Mon Mar 29 01:31:14 2010
New Revision: 928561

URL: http://svn.apache.org/viewvc?rev=928561&view=rev
Log:
First pass at updating releasing docs to reflect current practice.

Modified:
commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml

Modified: commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml?rev=928561&r1=928560&r2=928561&view=diff
==
--- commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml 
(original)
+++ commons/proper/commons-site/trunk/src/site/xdoc/releases/release.xml Mon 
Mar 29 01:31:14 2010
@@ -48,214 +48,26 @@
 
 
 In particular, it is assumed:
+
 
   
-The build version for the component has been updated to the release 
number in pom.xml
+The signed release candidate source and binary distributions are 
available in ~/public_html/commons-foo-1.2-RCx
+where RCx is the release candidate that passed the release vote.
   
   
-The build version for the component has been updated to the release 
number in build.xml if
-   you have a hand-created Ant buildfile.
+At least one reviewer has verified the hashes and signatures 
associated with the release artifacts.
   
   
-The release directory tags/foo-1.2 has been created.
+The release candidate was built from the tag, tags/foo-1.2-RCx.
+  
+  
+The maven artifacts associated with the release are available in 
~/public_html/commons-foo-1.2-RCx/maven.
   
 
 
   
-  
-  
-
-  Ensure commons-build is available as a sibling directory to the one you
-  will be doing the build in. The most convenient way to do this is simply
-  to check out commons-build into its usual place, then create a symbolic
-  link to it:
-  
-   # we will be building in foo/tags/foo-1.2
-cd foo/tags
-   # create a link from ./commons-build to wherever the trunk of
-   # commons-build has been checked out
-   ln -s {commons-build}/trunk commons-build
-  
-
-
-  Now do a clean build of the binary distribution.
-
-For Maven builds, it is assumed that there is a "dist" goal which 
creates
-source and binary distributions in subdirectory target/distributions.
-
-  $ cd foo/tags/foo-1.2
-  $ maven clean
-  $ maven dist
-
-
-
-For Ant builds, it is assumed that there is a "dist" target which
-creates source and binary distribution (.tgz, .zip) bundles.
-
-  $ cd foo/tags/foo-1.2
-  $ ant clean
-  $ ant dist
-
-
-
- Review the generated documentation and in particular ensure that the 
version number
- is correct.
-
-
-
-
-
-MD5 is the standard hash algorithm used by Apache to allow users to verify 
the integrity of releases. 
-There are various applications which can be used to create md5 checksums. 
-
-
-For example md5sum (on Linux):
-
-$ md5sum -b commons-foo-1.2-src.tar.gz > commons-foo-1.2-src.tar.gz.md5
-
-
-
-If possible, the format of the output should conform to the ASF repository 
standard.
-Currently, this is sum filename. For example:
-
-
-d1dcb0fbee884bb855bb327b8190af36 *commons-foo-1.2.tar.gz
-
-
-Create md5 sums for the binary and source releases, both tarred and zipped 
versions. 
-These should be stored in files whose names are formed by appending 
.md5.
-to each filename.  So, you should end up with the following files:
-
-commons-foo-1.2-src.tar.gz.md5
-commons-foo-1.2-src.zip.md5
-commons-foo-1.2.tar.gz.md5
-commons-foo-1.2.zip.md5
-
-
-  
-
-  
-
-OpenPGP (RFC2440) compatible detached signatures needed to be created for 
all releases.
-Various applications can be used to create these signatures.  For example,
-Gnu Privacy Guard.
-
-
-See the http://www.apache.org/dev/release-signing.html#faq";>Apache Release 
Signing FAQ
-for more information on release signing.
-
-
-Example:
-
-$ gpg --armor --output commons-foo-1.2-src.tar.gz.asc --detach-sig 
commons-foo-1.2-src.tar.gz
-You need a passphrase to unlock the secret key for
-user: "Robert Burrell Donkin (CODE SIGNING KEY) "
-1024-bit DSA key, ID B1313DE2, created 2003-01-15
-
-
-
-Signatures for all varieties of release need to be create. The signature 
files should be 
-named after the original with .asc suffixed.
-
-$ gpg --armor --output commons-foo-1.2-src.tar.gz.asc --detach-sig 
commons-foo-1.2-src.tar.gz 
-$ gpg --armor --output commons-foo-1.2-src.zip.asc --detach-sig 
commons-foo-1.2-src.zip
-$ gpg --armor --output commons-foo-1.2.zip.asc --detach-sig commons-foo

svn commit: r928549 - /commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java

2010-03-28 Thread bayard
Author: bayard
Date: Mon Mar 29 00:35:29 2010
New Revision: 928549

URL: http://svn.apache.org/viewvc?rev=928549&view=rev
Log:
Removing extra 'containing' text

Modified:

commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java

Modified: 
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java
URL: 
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java?rev=928549&r1=928548&r2=928549&view=diff
==
--- 
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java 
(original)
+++ 
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java 
Mon Mar 29 00:35:29 2010
@@ -724,7 +724,7 @@ public class Base64 implements BinaryEnc
 }
 
 /**
- * Decodes a String containing containing characters in the Base64 
alphabet.
+ * Decodes a String containing characters in the Base64 alphabet.
  *
  * @param pArray
  *A String containing Base64 character data
@@ -736,7 +736,7 @@ public class Base64 implements BinaryEnc
 }
 
 /**
- * Decodes a byte[] containing containing characters in the Base64 
alphabet.
+ * Decodes a byte[] containing characters in the Base64 alphabet.
  * 
  * @param pArray
  *A byte array containing Base64 character data




svn commit: r928548 - /commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java

2010-03-28 Thread bayard
Author: bayard
Date: Mon Mar 29 00:31:28 2010
New Revision: 928548

URL: http://svn.apache.org/viewvc?rev=928548&view=rev
Log:
Increasing the test branch coverage slightly

Modified:

commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java

Modified: 
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java?rev=928548&r1=928547&r2=928548&view=diff
==
--- 
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
 (original)
+++ 
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
 Mon Mar 29 00:31:28 2010
@@ -1106,6 +1106,10 @@ public class DoubleMetaphoneTest extends
 assertDoubleMetaphoneAlt("MKLL", "McClelland");
 assertDoubleMetaphoneAlt("SNHS", "san jose");
 assertDoubleMetaphoneAlt("SNFP", "xenophobia");
+assertDoubleMetaphoneAlt("FKR", "Fokker");
+assertDoubleMetaphoneAlt("AK", "Joqqi");
+assertDoubleMetaphoneAlt("HF", "Hovvi");
+assertDoubleMetaphoneAlt("XRN", "Czerny");
 }
 
 public void testEmpty() {




svn commit: r928547 - in /commons/proper/vfs/branches/VFS-2.0/xdocs: cvs-usage.xml navigation.xml

2010-03-28 Thread niallp
Author: niallp
Date: Mon Mar 29 00:31:13 2010
New Revision: 928547

URL: http://svn.apache.org/viewvc?rev=928547&view=rev
Log:
Remove m1 cvs-usage.xml & navigation.xml files

Removed:
commons/proper/vfs/branches/VFS-2.0/xdocs/cvs-usage.xml
commons/proper/vfs/branches/VFS-2.0/xdocs/navigation.xml



svn commit: r928546 - in /commons/proper/scxml/branches/J6: maven.xml project.properties project.xml xdocs/cvs-usage.xml xdocs/navigation.xml

2010-03-28 Thread niallp
Author: niallp
Date: Mon Mar 29 00:29:00 2010
New Revision: 928546

URL: http://svn.apache.org/viewvc?rev=928546&view=rev
Log:
Remove m1 build

Removed:
commons/proper/scxml/branches/J6/maven.xml
commons/proper/scxml/branches/J6/project.properties
commons/proper/scxml/branches/J6/project.xml
commons/proper/scxml/branches/J6/xdocs/cvs-usage.xml
commons/proper/scxml/branches/J6/xdocs/navigation.xml



svn commit: r928544 - in /commons/proper/configuration/branches/configuration2_experimental/xdocs: cvs-usage.xml navigation.xml

2010-03-28 Thread niallp
Author: niallp
Date: Mon Mar 29 00:25:44 2010
New Revision: 928544

URL: http://svn.apache.org/viewvc?rev=928544&view=rev
Log:
Remove m1 cvs-usage.xml & navigation.xml files

Removed:

commons/proper/configuration/branches/configuration2_experimental/xdocs/cvs-usage.xml

commons/proper/configuration/branches/configuration2_experimental/xdocs/navigation.xml



svn commit: r928543 - in /commons/proper: codec/trunk/xdocs/ collections/trunk/xdocs/ configuration/trunk/xdocs/ dbutils/trunk/xdocs/ email/trunk/xdocs/ io/trunk/xdocs/ primitives/trunk/xdocs/ vfs/tru

2010-03-28 Thread niallp
Author: niallp
Date: Mon Mar 29 00:23:42 2010
New Revision: 928543

URL: http://svn.apache.org/viewvc?rev=928543&view=rev
Log:
Remove m1 cvs-usage.xml & navigation.xml files

Removed:
commons/proper/codec/trunk/xdocs/cvs-usage.xml
commons/proper/codec/trunk/xdocs/navigation.xml
commons/proper/collections/trunk/xdocs/cvs-usage.xml
commons/proper/collections/trunk/xdocs/navigation.xml
commons/proper/configuration/trunk/xdocs/cvs-usage.xml
commons/proper/configuration/trunk/xdocs/navigation.xml
commons/proper/dbutils/trunk/xdocs/cvs-usage.xml
commons/proper/dbutils/trunk/xdocs/navigation.xml
commons/proper/email/trunk/xdocs/cvs-usage.xml
commons/proper/email/trunk/xdocs/navigation.xml
commons/proper/io/trunk/xdocs/cvs-usage.xml
commons/proper/io/trunk/xdocs/navigation.xml
commons/proper/primitives/trunk/xdocs/cvs-usage.xml
commons/proper/primitives/trunk/xdocs/navigation.xml
commons/proper/vfs/trunk/xdocs/cvs-usage.xml
commons/proper/vfs/trunk/xdocs/navigation.xml



svn commit: r928539 - in /commons/proper/math/trunk: math-RC.sh math-pre-RC.sh siteMods/ siteMods/pom.xml siteMods/site.css siteMods/site.xml

2010-03-28 Thread psteitz
Author: psteitz
Date: Mon Mar 29 00:10:10 2010
New Revision: 928539

URL: http://svn.apache.org/viewvc?rev=928539&view=rev
Log:
Added files used in creating RCs.

Added:
commons/proper/math/trunk/math-RC.sh   (with props)
commons/proper/math/trunk/math-pre-RC.sh   (with props)
commons/proper/math/trunk/siteMods/
commons/proper/math/trunk/siteMods/pom.xml   (with props)
commons/proper/math/trunk/siteMods/site.css   (with props)
commons/proper/math/trunk/siteMods/site.xml   (with props)

Added: commons/proper/math/trunk/math-RC.sh
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/math-RC.sh?rev=928539&view=auto
==
--- commons/proper/math/trunk/math-RC.sh (added)
+++ commons/proper/math/trunk/math-RC.sh Mon Mar 29 00:10:10 2010
@@ -0,0 +1,77 @@
+#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+# -
+#
+# Shell script to create commons math RCs.
+# This script should be run from a fresh checkout of the RC tag.
+#
+# $Revision$ $Date$
+# -
+# Set script variables
+version=2.1
+repo_path=~/.m2/repository/org/apache/commons/commons-math/${version}
+site_mods_path=./siteMods
+release_path=~/math-release
+#
+# Delete any locally installed artifacts from previous runs
+rm -rf ${repo_path}
+echo "Cleaned maven repo."
+rm -rf ${release_path}
+echo "Cleaned local release directory"
+mvn clean
+#
+# Chicanery to get only the userguide in the site
+cp ${site_mods_path}/pom.xml .
+cp ${site_mods_path}/site.xml src/site/
+mvn site
+cp ${site_mods_path}/site.css target/site/css
+rm target/site/*
+rm -rf target/site/style
+cp -r target/apidocs target/site
+svn revert src/site/site.xml
+svn revert pom.xml
+#
+# Generate the release artifacts and install them locally
+mvn assembly:assembly
+mvn -Prc -DcreateChecksum=true install
+#
+# Copy the zips/tarballs and release notes to release directory
+mkdir ${release_path}
+cp ${repo_path}/*.zip ${release_path}
+cp ${repo_path}/*.zip.* ${release_path}
+cp ${repo_path}/*.gz ${release_path}
+cp ${repo_path}/*.gz.* ${release_path}
+cp RELEASE-NOTES.txt ${release_path}
+#
+# Copy site
+cp -R target/site ${release_path}
+#
+# Copy maven artifacts
+cp -R ${repo_path} ${release_path}
+#
+# Rename maven, site directories
+mv ${release_path}/${version} ${release_path}/maven
+mv ${release_path}/site ${release_path}/docs
+echo "Artifacts copied."
+#
+# Delete tars/zips from maven subdirectory
+rm ${release_path}/maven/*.zip
+rm ${release_path}/maven/*.zip*
+rm ${release_path}/maven/*.gz
+rm ${release_path}/maven/*.gz*
+echo "Release candidate complete"
+

Propchange: commons/proper/math/trunk/math-RC.sh
--
svn:eol-style = native

Propchange: commons/proper/math/trunk/math-RC.sh
--
svn:executable = *

Propchange: commons/proper/math/trunk/math-RC.sh
--
svn:keywords = Date Revision

Added: commons/proper/math/trunk/math-pre-RC.sh
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/math-pre-RC.sh?rev=928539&view=auto
==
--- commons/proper/math/trunk/math-pre-RC.sh (added)
+++ commons/proper/math/trunk/math-pre-RC.sh Mon Mar 29 00:10:10 2010
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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,
+

svn commit: r928537 - in /commons/proper: betwixt/trunk/xdocs/ chain/trunk/xdocs/ discovery/trunk/xdocs/ el/trunk/xdocs/ fileupload/trunk/xdocs/ jxpath/trunk/xdocs/ launcher/trunk/xdocs/ logging/trunk

2010-03-28 Thread niallp
Author: niallp
Date: Sun Mar 28 23:58:39 2010
New Revision: 928537

URL: http://svn.apache.org/viewvc?rev=928537&view=rev
Log:
Remove m1 cvs-usage.xml & navigation.xml files

Removed:
commons/proper/betwixt/trunk/xdocs/cvs-usage.xml
commons/proper/betwixt/trunk/xdocs/navigation.xml
commons/proper/chain/trunk/xdocs/cvs-usage.xml
commons/proper/chain/trunk/xdocs/navigation.xml
commons/proper/discovery/trunk/xdocs/cvs-usage.xml
commons/proper/discovery/trunk/xdocs/navigation.xml
commons/proper/el/trunk/xdocs/cvs-usage.xml
commons/proper/el/trunk/xdocs/navigation.xml
commons/proper/fileupload/trunk/xdocs/cvs-usage.xml
commons/proper/fileupload/trunk/xdocs/navigation.xml
commons/proper/jxpath/trunk/xdocs/cvs-usage.xml
commons/proper/jxpath/trunk/xdocs/navigation.xml
commons/proper/launcher/trunk/xdocs/cvs-usage.xml
commons/proper/launcher/trunk/xdocs/navigation.xml
commons/proper/logging/trunk/xdocs/cvs-usage.xml
commons/proper/logging/trunk/xdocs/navigation.xml
commons/proper/modeler/trunk/xdocs/cvs-usage.xml
commons/proper/modeler/trunk/xdocs/navigation.xml
commons/proper/net/trunk/xdocs/cvs-usage.xml
commons/proper/net/trunk/xdocs/navigation.xml
commons/proper/scxml/trunk/xdocs/cvs-usage.xml
commons/proper/scxml/trunk/xdocs/navigation.xml
commons/proper/validator/trunk/xdocs/cvs-usage.xml
commons/proper/validator/trunk/xdocs/navigation.xml



svn commit: r928536 - in /commons/proper/configuration/trunk: maven.xml project.properties project.xml

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 23:57:24 2010
New Revision: 928536

URL: http://svn.apache.org/viewvc?rev=928536&view=rev
Log:
Removing M1 build, M2 build seems fine

Removed:
commons/proper/configuration/trunk/maven.xml
commons/proper/configuration/trunk/project.properties
commons/proper/configuration/trunk/project.xml



svn commit: r928535 - in /commons/proper/net/trunk: maven.xml project.properties project.xml

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 23:53:30 2010
New Revision: 928535

URL: http://svn.apache.org/viewvc?rev=928535&view=rev
Log:
Removing M1 build, M2 build seems fine

Removed:
commons/proper/net/trunk/maven.xml
commons/proper/net/trunk/project.properties
commons/proper/net/trunk/project.xml



svn commit: r928534 - /commons/proper/net/trunk/pom.xml

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 23:53:10 2010
New Revision: 928534

URL: http://svn.apache.org/viewvc?rev=928534&view=rev
Log:
Commenting out the JIRA report as it errors

Modified:
commons/proper/net/trunk/pom.xml

Modified: commons/proper/net/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/net/trunk/pom.xml?rev=928534&r1=928533&r2=928534&view=diff
==
--- commons/proper/net/trunk/pom.xml (original)
+++ commons/proper/net/trunk/pom.xml Sun Mar 28 23:53:10 2010
@@ -186,7 +186,7 @@ limitations under the License.



changes-report
-   
jira-report
+   







svn commit: r928533 - in /commons/proper/betwixt/trunk: maven.xml project.properties project.xml

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 23:50:32 2010
New Revision: 928533

URL: http://svn.apache.org/viewvc?rev=928533&view=rev
Log:
Removing M1 build, M2 build seems fine

Removed:
commons/proper/betwixt/trunk/maven.xml
commons/proper/betwixt/trunk/project.properties
commons/proper/betwixt/trunk/project.xml



svn commit: r928532 - in /commons/proper/validator/trunk: maven.xml project.properties project.xml

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 23:50:19 2010
New Revision: 928532

URL: http://svn.apache.org/viewvc?rev=928532&view=rev
Log:
Removing M1 build, M2 build seems fine

Removed:
commons/proper/validator/trunk/maven.xml
commons/proper/validator/trunk/project.properties
commons/proper/validator/trunk/project.xml



svn commit: r928531 - in /commons/proper/launcher/trunk: maven.xml project.properties project.xml

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 23:48:16 2010
New Revision: 928531

URL: http://svn.apache.org/viewvc?rev=928531&view=rev
Log:
Removing M1 build, M2 build seems fine

Removed:
commons/proper/launcher/trunk/maven.xml
commons/proper/launcher/trunk/project.properties
commons/proper/launcher/trunk/project.xml



svn commit: r928530 - in /commons/proper/jxpath/trunk: maven.xml project.properties project.xml

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 23:47:47 2010
New Revision: 928530

URL: http://svn.apache.org/viewvc?rev=928530&view=rev
Log:
Removing M1 build, M2 build seems fine

Removed:
commons/proper/jxpath/trunk/maven.xml
commons/proper/jxpath/trunk/project.properties
commons/proper/jxpath/trunk/project.xml



svn commit: r928528 - in /commons/proper/modeler/trunk: maven.xml project.properties project.xml

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 23:46:46 2010
New Revision: 928528

URL: http://svn.apache.org/viewvc?rev=928528&view=rev
Log:
Removing M1 build, M2 build seems fine

Removed:
commons/proper/modeler/trunk/maven.xml
commons/proper/modeler/trunk/project.properties
commons/proper/modeler/trunk/project.xml



svn commit: r928527 - in /commons/proper/discovery/trunk: maven.xml project.properties project.xml

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 23:44:06 2010
New Revision: 928527

URL: http://svn.apache.org/viewvc?rev=928527&view=rev
Log:
Removing M1 build, M2 build seems fine

Removed:
commons/proper/discovery/trunk/maven.xml
commons/proper/discovery/trunk/project.properties
commons/proper/discovery/trunk/project.xml



svn commit: r928526 - in /commons/proper: codec/trunk/xdocs/ collections/trunk/xdocs/ email/trunk/xdocs/ fileupload/trunk/xdocs/ modeler/trunk/xdocs/ pool/trunk/xdocs/ primitives/trunk/xdocs/ transact

2010-03-28 Thread niallp
Author: niallp
Date: Sun Mar 28 23:43:37 2010
New Revision: 928526

URL: http://svn.apache.org/viewvc?rev=928526&view=rev
Log:
Switch to m2 source-repository page

Modified:
commons/proper/codec/trunk/xdocs/index.xml
commons/proper/collections/trunk/xdocs/index.xml
commons/proper/email/trunk/xdocs/index.xml
commons/proper/fileupload/trunk/xdocs/index.xml
commons/proper/modeler/trunk/xdocs/downloads.xml
commons/proper/pool/trunk/xdocs/downloads.xml
commons/proper/primitives/trunk/xdocs/index.xml
commons/proper/transaction/trunk/xdocs/releases.xml
commons/proper/validator/trunk/xdocs/index.xml

Modified: commons/proper/codec/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/codec/trunk/xdocs/index.xml?rev=928526&r1=928525&r2=928526&view=diff
==
--- commons/proper/codec/trunk/xdocs/index.xml (original)
+++ commons/proper/codec/trunk/xdocs/index.xml Sun Mar 28 23:43:37 2010
@@ -76,7 +76,7 @@ The JavaDoc API documents are available 
 The latest SVN
 
 
-The subversion repository can be
+The subversion repository can be
 http://svn.apache.org/viewvc/commons/proper/codec/trunk/";>browsed.
 
 

Modified: commons/proper/collections/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/collections/trunk/xdocs/index.xml?rev=928526&r1=928525&r2=928526&view=diff
==
--- commons/proper/collections/trunk/xdocs/index.xml (original)
+++ commons/proper/collections/trunk/xdocs/index.xml Sun Mar 28 23:43:37 2010
@@ -65,7 +65,7 @@ The JavaDoc API documents are available 
 The latest SVN
 
 
-The subversion repository can be
+The subversion repository can be
 http://svn.apache.org/viewvc/commons/proper/collections/trunk/";>browsed.
 
 

Modified: commons/proper/email/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/email/trunk/xdocs/index.xml?rev=928526&r1=928525&r2=928526&view=diff
==
--- commons/proper/email/trunk/xdocs/index.xml (original)
+++ commons/proper/email/trunk/xdocs/index.xml Sun Mar 28 23:43:37 2010
@@ -69,7 +69,7 @@ The JavaDoc API documents are available 
 The latest SVN
 
 
-The subversion repository can be
+The subversion repository can be
 http://svn.apache.org/viewvc/commons/proper/email/trunk/";>browsed.
 
 

Modified: commons/proper/fileupload/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/xdocs/index.xml?rev=928526&r1=928525&r2=928526&view=diff
==
--- commons/proper/fileupload/trunk/xdocs/index.xml (original)
+++ commons/proper/fileupload/trunk/xdocs/index.xml Sun Mar 28 23:43:37 2010
@@ -51,7 +51,7 @@
   JavaDoc API
   Project Reports
 
-You can also browse the Subversion 
repository.
+You can also browse the 
Subversion repository.
   
 
 

Modified: commons/proper/modeler/trunk/xdocs/downloads.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/modeler/trunk/xdocs/downloads.xml?rev=928526&r1=928525&r2=928526&view=diff
==
--- commons/proper/modeler/trunk/xdocs/downloads.xml (original)
+++ commons/proper/modeler/trunk/xdocs/downloads.xml Sun Mar 28 23:43:37 2010
@@ -46,7 +46,7 @@
  
  
 Access to the source tree to see the latest and greatest code is 
possible
-through anonymous SVN access.
+through anonymous SVN access.
  
   
 

svn commit: r928525 - in /commons/proper/chain/trunk: maven.xml project.properties project.xml

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 23:40:21 2010
New Revision: 928525

URL: http://svn.apache.org/viewvc?rev=928525&view=rev
Log:
Removing M1 build, M2 build seems fine

Removed:
commons/proper/chain/trunk/maven.xml
commons/proper/chain/trunk/project.properties
commons/proper/chain/trunk/project.xml



svn commit: r928524 - in /commons/proper/fileupload/trunk: maven.xml project.properties project.xml

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 23:39:44 2010
New Revision: 928524

URL: http://svn.apache.org/viewvc?rev=928524&view=rev
Log:
Removing M1 build, M2 build seems fine

Removed:
commons/proper/fileupload/trunk/maven.xml
commons/proper/fileupload/trunk/project.properties
commons/proper/fileupload/trunk/project.xml



svn commit: r928523 - /commons/proper/fileupload/trunk/pom.xml

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 23:39:35 2010
New Revision: 928523

URL: http://svn.apache.org/viewvc?rev=928523&view=rev
Log:
Commenting out the JIRA report as it errors

Modified:
commons/proper/fileupload/trunk/pom.xml

Modified: commons/proper/fileupload/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/pom.xml?rev=928523&r1=928522&r2=928523&view=diff
==
--- commons/proper/fileupload/trunk/pom.xml (original)
+++ commons/proper/fileupload/trunk/pom.xml Sun Mar 28 23:39:35 2010
@@ -217,7 +217,7 @@
   
 
   changes-report
-  jira-report
+  
 
   
 
@@ -276,4 +276,4 @@
   
 
   
-
\ No newline at end of file
+




svn commit: r928520 - in /commons/proper/scxml/trunk: maven.xml project.properties project.xml

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 23:21:22 2010
New Revision: 928520

URL: http://svn.apache.org/viewvc?rev=928520&view=rev
Log:
Removing M1 build, M2 build seems fine

Removed:
commons/proper/scxml/trunk/maven.xml
commons/proper/scxml/trunk/project.properties
commons/proper/scxml/trunk/project.xml



svn commit: r928517 - in /commons/proper/el/trunk: pom.xml src/java/org/apache/commons/el/AndOperator.java src/java/org/apache/commons/el/ArithmeticOperator.java

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 23:10:29 2010
New Revision: 928517

URL: http://svn.apache.org/viewvc?rev=928517&view=rev
Log:
Rolling back pom.xml and 2 java source files accidentally changed in r928515

Modified:
commons/proper/el/trunk/pom.xml
commons/proper/el/trunk/src/java/org/apache/commons/el/AndOperator.java

commons/proper/el/trunk/src/java/org/apache/commons/el/ArithmeticOperator.java

Modified: commons/proper/el/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/el/trunk/pom.xml?rev=928517&r1=928516&r2=928517&view=diff
==
--- commons/proper/el/trunk/pom.xml (original)
+++ commons/proper/el/trunk/pom.xml Sun Mar 28 23:10:29 2010
@@ -129,63 +129,4 @@
   
 
   
-
-  
-
-  
-maven-checkstyle-plugin
-2.1
-
-  ${basedir}/checkstyle.xml
-  false
-
-  
-  
-  
-org.codehaus.mojo
-findbugs-maven-plugin
-1.2
-
-  Normal
-  Default
-  findbugs-exclude-filter.xml
-   
-  
-  
-org.codehaus.mojo
-cobertura-maven-plugin
-2.2
-  
-  
-org.codehaus.mojo
-clirr-maven-plugin
-2.2.2
-
-  1.0
-  info
-
-  
-  
-maven-pmd-plugin
-2.3
-
-  ${maven.compile.target}  
-
-
-  
-
-  pmd
-  cpd
-
-  
-
-  
-  
-org.codehaus.mojo
-javancss-maven-plugin
-2.0-beta-2
-  
-
-  
-
 

Modified: 
commons/proper/el/trunk/src/java/org/apache/commons/el/AndOperator.java
URL: 
http://svn.apache.org/viewvc/commons/proper/el/trunk/src/java/org/apache/commons/el/AndOperator.java?rev=928517&r1=928516&r2=928517&view=diff
==
--- commons/proper/el/trunk/src/java/org/apache/commons/el/AndOperator.java 
(original)
+++ commons/proper/el/trunk/src/java/org/apache/commons/el/AndOperator.java Sun 
Mar 28 23:10:29 2010
@@ -62,7 +62,8 @@ public class AndOperator
*
* Applies the operator to the given value
**/
-  public Object apply (Object pLeft, Object pRight)
+  public Object apply (Object pLeft,
+  Object pRight)
 throws ELException
   {
 // Coerce the values to booleans

Modified: 
commons/proper/el/trunk/src/java/org/apache/commons/el/ArithmeticOperator.java
URL: 
http://svn.apache.org/viewvc/commons/proper/el/trunk/src/java/org/apache/commons/el/ArithmeticOperator.java?rev=928517&r1=928516&r2=928517&view=diff
==
--- 
commons/proper/el/trunk/src/java/org/apache/commons/el/ArithmeticOperator.java 
(original)
+++ 
commons/proper/el/trunk/src/java/org/apache/commons/el/ArithmeticOperator.java 
Sun Mar 28 23:10:29 2010
@@ -37,7 +37,8 @@ public abstract class ArithmeticOperator
*
* Applies the operator to the given value
**/
-  public Object apply (Object pLeft, Object pRight)
+  public Object apply (Object pLeft,
+  Object pRight)
 throws ELException
   {
 return Coercions.applyArithmeticOperator (pLeft, pRight, this);




svn commit: r928516 - /commons/proper/logging/trunk/project.properties

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 23:08:05 2010
New Revision: 928516

URL: http://svn.apache.org/viewvc?rev=928516&view=rev
Log:
Removing M1 build, M2 build seems fine - missed the project.properties

Removed:
commons/proper/logging/trunk/project.properties



svn commit: r928515 - in /commons/proper/el/trunk: maven.xml pom.xml project.properties project.xml src/java/org/apache/commons/el/AndOperator.java src/java/org/apache/commons/el/ArithmeticOperator.ja

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 23:07:55 2010
New Revision: 928515

URL: http://svn.apache.org/viewvc?rev=928515&view=rev
Log:
Removing M1 build, M2 build seems fine

Removed:
commons/proper/el/trunk/maven.xml
commons/proper/el/trunk/project.properties
commons/proper/el/trunk/project.xml
Modified:
commons/proper/el/trunk/pom.xml
commons/proper/el/trunk/src/java/org/apache/commons/el/AndOperator.java

commons/proper/el/trunk/src/java/org/apache/commons/el/ArithmeticOperator.java

Modified: commons/proper/el/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/el/trunk/pom.xml?rev=928515&r1=928514&r2=928515&view=diff
==
--- commons/proper/el/trunk/pom.xml (original)
+++ commons/proper/el/trunk/pom.xml Sun Mar 28 23:07:55 2010
@@ -129,4 +129,63 @@
   
 
   
+
+  
+
+  
+maven-checkstyle-plugin
+2.1
+
+  ${basedir}/checkstyle.xml
+  false
+
+  
+  
+  
+org.codehaus.mojo
+findbugs-maven-plugin
+1.2
+
+  Normal
+  Default
+  findbugs-exclude-filter.xml
+   
+  
+  
+org.codehaus.mojo
+cobertura-maven-plugin
+2.2
+  
+  
+org.codehaus.mojo
+clirr-maven-plugin
+2.2.2
+
+  1.0
+  info
+
+  
+  
+maven-pmd-plugin
+2.3
+
+  ${maven.compile.target}  
+
+
+  
+
+  pmd
+  cpd
+
+  
+
+  
+  
+org.codehaus.mojo
+javancss-maven-plugin
+2.0-beta-2
+  
+
+  
+
 

Modified: 
commons/proper/el/trunk/src/java/org/apache/commons/el/AndOperator.java
URL: 
http://svn.apache.org/viewvc/commons/proper/el/trunk/src/java/org/apache/commons/el/AndOperator.java?rev=928515&r1=928514&r2=928515&view=diff
==
--- commons/proper/el/trunk/src/java/org/apache/commons/el/AndOperator.java 
(original)
+++ commons/proper/el/trunk/src/java/org/apache/commons/el/AndOperator.java Sun 
Mar 28 23:07:55 2010
@@ -62,8 +62,7 @@ public class AndOperator
*
* Applies the operator to the given value
**/
-  public Object apply (Object pLeft,
-  Object pRight)
+  public Object apply (Object pLeft, Object pRight)
 throws ELException
   {
 // Coerce the values to booleans

Modified: 
commons/proper/el/trunk/src/java/org/apache/commons/el/ArithmeticOperator.java
URL: 
http://svn.apache.org/viewvc/commons/proper/el/trunk/src/java/org/apache/commons/el/ArithmeticOperator.java?rev=928515&r1=928514&r2=928515&view=diff
==
--- 
commons/proper/el/trunk/src/java/org/apache/commons/el/ArithmeticOperator.java 
(original)
+++ 
commons/proper/el/trunk/src/java/org/apache/commons/el/ArithmeticOperator.java 
Sun Mar 28 23:07:55 2010
@@ -37,8 +37,7 @@ public abstract class ArithmeticOperator
*
* Applies the operator to the given value
**/
-  public Object apply (Object pLeft,
-  Object pRight)
+  public Object apply (Object pLeft, Object pRight)
 throws ELException
   {
 return Coercions.applyArithmeticOperator (pLeft, pRight, this);




svn commit: r928514 - in /commons/proper/logging/trunk: maven.xml project.xml

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 23:07:18 2010
New Revision: 928514

URL: http://svn.apache.org/viewvc?rev=928514&view=rev
Log:
Removing M1 build, M2 build seems fine

Removed:
commons/proper/logging/trunk/maven.xml
commons/proper/logging/trunk/project.xml



svn commit: r928503 - /commons/proper/commons-site/trunk/src/site/xdoc/releases/prepare.xml

2010-03-28 Thread psteitz
Author: psteitz
Date: Sun Mar 28 22:17:30 2010
New Revision: 928503

URL: http://svn.apache.org/viewvc?rev=928503&view=rev
Log:
First pass edits to eliminate obsolete m1 references and start to improve m2 
docs.

Modified:
commons/proper/commons-site/trunk/src/site/xdoc/releases/prepare.xml

Modified: commons/proper/commons-site/trunk/src/site/xdoc/releases/prepare.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/commons-site/trunk/src/site/xdoc/releases/prepare.xml?rev=928503&r1=928502&r2=928503&view=diff
==
--- commons/proper/commons-site/trunk/src/site/xdoc/releases/prepare.xml 
(original)
+++ commons/proper/commons-site/trunk/src/site/xdoc/releases/prepare.xml Sun 
Mar 28 22:17:30 2010
@@ -40,7 +40,7 @@
 Commons components are expected to use Maven to build the project website. 
Components
 may choose to use either Maven or Ant to build the actual jar files to be 
distributed,
 although it is recommended that Maven be used for this. Both approaches 
are covered
-below.
+below.  The version of maven used is assumed to be Maven 2 throughout.
 
 
 This document assumes that the release is being prepared on a linux/unix 
system, and
@@ -66,7 +66,7 @@
   stage.
   
   
-  Many release managers favour development of the plan on the 
+  Many release managers favor development of the plan on the 
   wiki.
   This format encourages collaboration between developers and reduces the 
overhead
   of maintaining the plan.
@@ -105,7 +105,7 @@
 cd to the project's base directory in your subversion working copy.
 svn update trunk
 svn cp trunk branches/foo-1.2-work
-svn commit branches/foo-1.2-work
+svn commit -m "Creating foo-1.2-work branch" branches/foo-1.2-work
   
   Note that the "svn update" step is necessary in order to ensure that the 
directory being
   copied does not have a mix of files at various revisions; even if the 
files haven't changed
@@ -129,7 +129,7 @@
 that the current level of compatibility is suitable for the proposed 
version number.
 Check the current level of compatibility in the code. Tools like 
 Clirr and 
-JDiff are very useful. Both support Ant 
and Maven.
+JDiff are very useful. Both support ant 
and maven.

 
 
@@ -154,60 +154,30 @@
 on that JVM. 
 
  
-If using Maven 1, the maven.compile.target property in the 
-project.properties file should be set correctly.
-If using Ant, the javac task should have the 
target
+If using maven, the maven.compile.target property in the 
+pom.xml file should be set correctly.
+If using ant, the javac task should have the 
target
 attribute set correctly.
 
 
-The Maven 1 build now adds entries to the jar's manifest to show the values
+The maven build now adds entries to the jar's manifest to show the values
 of the maven.compile.source and 
maven.compile.target
 properties used to generate the jar. For more details on this see sections
 Check The Jar Manifest and 
 Class File Format for more details.
 
 
-For Maven 2 builds, the Commons parent POM specifies default values for 
+For Maven builds, the Commons parent POM specifies default values for 
 maven.compile.source and maven.compile.target. 
These
-values should be overridden in the project's POM if they're not 
appropriate for it.
+values must be overridden in the project's POM if they're not appropriate 
for it.
 
 
 
 
 Check that the documentation has been generated correctly. Check that all 
links are working.
-Those using Maven can use the 
-LinkCheck 
plugin report
-to automate this check.
-
-
-
-
-By default, Maven uses the same directory name for both binary and source 
distributions
-(commons-foo-1.2). Some find it more convenient to have the source 
distribution unpack
-to commons-foo-1.2-src. This can be done easily by adding the following 
line to the
-component's project.properties file:
-
- 
-
-
maven.dist.src.assembly.dir=${maven.dist.assembly.dir}/src/${maven.final.name}-src
  
-
-
-
-Maven 2 builds use assembly descriptors, which by default live in 
src/assembly.
-By convention, src.xml is for source distributions and 
bin.xml
-is for binary distributions. You can specify the 
baseDirectory property
-in src.xml to include -src:
-
-
-
 
 
+
   
 
   
@@ -219,7 +189,7 @@
 configured, any MANIFEST.MF file present within the project will 
simply be ignored.
 
 
-The Maven build has been modified to include two non 
standard attributes
+The maven build has been modified to include two non 
standard attributes
 in the jar'

svn commit: r928491 - in /commons/proper/beanutils/trunk: build.xml pom.xml

2010-03-28 Thread niallp
Author: niallp
Date: Sun Mar 28 20:24:43 2010
New Revision: 928491

URL: http://svn.apache.org/viewvc?rev=928491&view=rev
Log:
Update version number to 1.8.4-SNAPSHOT following the 1.8.3 release

Modified:
commons/proper/beanutils/trunk/build.xml
commons/proper/beanutils/trunk/pom.xml

Modified: commons/proper/beanutils/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/build.xml?rev=928491&r1=928490&r2=928491&view=diff
==
--- commons/proper/beanutils/trunk/build.xml (original)
+++ commons/proper/beanutils/trunk/build.xml Sun Mar 28 20:24:43 2010
@@ -43,7 +43,7 @@
   
 
   
-  
+  
 
   
   

Modified: commons/proper/beanutils/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/pom.xml?rev=928491&r1=928490&r2=928491&view=diff
==
--- commons/proper/beanutils/trunk/pom.xml (original)
+++ commons/proper/beanutils/trunk/pom.xml Sun Mar 28 20:24:43 2010
@@ -27,7 +27,7 @@
   4.0.0
   commons-beanutils
   commons-beanutils
-  1.8.3
+  1.8.4-SNAPSHOT
   Commons BeanUtils
 
   2000




svn commit: r928490 - in /commons/proper/beanutils/tags: BEANUTILS_1_8_3/ BEANUTILS_1_8_3_RC1/

2010-03-28 Thread niallp
Author: niallp
Date: Sun Mar 28 20:21:54 2010
New Revision: 928490

URL: http://svn.apache.org/viewvc?rev=928490&view=rev
Log:
Rename RC1 tag following release

Added:
commons/proper/beanutils/tags/BEANUTILS_1_8_3/
  - copied from r928489, commons/proper/beanutils/tags/BEANUTILS_1_8_3_RC1/
Removed:
commons/proper/beanutils/tags/BEANUTILS_1_8_3_RC1/



svn commit: r928465 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 18:17:48 2010
New Revision: 928465

URL: http://svn.apache.org/viewvc?rev=928465&view=rev
Log:
Minor language tweaks (LANG-576)

Modified:

commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java

Modified: 
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java
URL: 
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java?rev=928465&r1=928464&r2=928465&view=diff
==
--- 
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java
 (original)
+++ 
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java
 Sun Mar 28 18:17:48 2010
@@ -345,12 +345,11 @@ public class ObjectUtils {
 
 /**
  * Clone an object if possible. This method is similar to {...@link 
#clone(Object)}, but will
- * return the provided instance as return value instead of 
null if the instance
- * is not cloneable. This is convenient in case the caller will use 
different
- * implementations (e.g. of a service) and some of the instances do not 
allow concurrent
- * processing or have state. In such a case the implementation can simply 
provide a proper
- * clone implementation and the caller has not to take care, it will 
simply call this method
- * here.
+ * return the provided instance as the return value instead of 
null if the instance
+ * is not cloneable. This is more convenient if the caller uses different
+ * implementations (e.g. of a service) and some of the implementations do 
not allow concurrent
+ * processing or have state. In such cases the implementation can simply 
provide a proper
+ * clone implementation and the caller's code does not have to change.
  * 
  * @param  the type of the object
  * @param o the object to clone




svn commit: r928459 - in /commons/proper/primitives/trunk: build.properties.sample build.xml maven.xml project.properties project.xml

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 17:45:19 2010
New Revision: 928459

URL: http://svn.apache.org/viewvc?rev=928459&view=rev
Log:
Removing Ant/Maven1 builds

Removed:
commons/proper/primitives/trunk/build.properties.sample
commons/proper/primitives/trunk/build.xml
commons/proper/primitives/trunk/maven.xml
commons/proper/primitives/trunk/project.properties
commons/proper/primitives/trunk/project.xml



svn commit: r928454 - /commons/proper/commons-build/trunk/xdocs/releases/prepare.xml

2010-03-28 Thread bayard
Author: bayard
Date: Sun Mar 28 17:28:02 2010
New Revision: 928454

URL: http://svn.apache.org/viewvc?rev=928454&view=rev
Log:
Updating note on what should be in the notice

Modified:
commons/proper/commons-build/trunk/xdocs/releases/prepare.xml

Modified: commons/proper/commons-build/trunk/xdocs/releases/prepare.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/commons-build/trunk/xdocs/releases/prepare.xml?rev=928454&r1=928453&r2=928454&view=diff
==
--- commons/proper/commons-build/trunk/xdocs/releases/prepare.xml (original)
+++ commons/proper/commons-build/trunk/xdocs/releases/prepare.xml Sun Mar 28 
17:28:02 2010
@@ -466,6 +466,9 @@ The release notes should contain the min
The basic content (excepting external attributes notes) should be:
 
 
+Apache Commons {Foo}
+Copyright {earliest}-{latest} The Apache Software Foundation
+
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
 




svn commit: r928453 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java

2010-03-28 Thread joehni
Author: joehni
Date: Sun Mar 28 17:04:59 2010
New Revision: 928453

URL: http://svn.apache.org/viewvc?rev=928453&view=rev
Log:
Improve javadoc

Modified:

commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java

Modified: 
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java
URL: 
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java?rev=928453&r1=928452&r2=928453&view=diff
==
--- 
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java
 (original)
+++ 
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java
 Sun Mar 28 17:04:59 2010
@@ -344,7 +344,13 @@ public class ObjectUtils {
 }
 
 /**
- * Clone an object if possible.
+ * Clone an object if possible. This method is similar to {...@link 
#clone(Object)}, but will
+ * return the provided instance as return value instead of 
null if the instance
+ * is not cloneable. This is convenient in case the caller will use 
different
+ * implementations (e.g. of a service) and some of the instances do not 
allow concurrent
+ * processing or have state. In such a case the implementation can simply 
provide a proper
+ * clone implementation and the caller has not to take care, it will 
simply call this method
+ * here.
  * 
  * @param  the type of the object
  * @param o the object to clone




svn commit: r928452 - in /commons/proper/jexl/trunk: RELEASE-NOTES.txt xdocs/changes.xml

2010-03-28 Thread henrib
Author: henrib
Date: Sun Mar 28 16:51:48 2010
New Revision: 928452

URL: http://svn.apache.org/viewvc?rev=928452&view=rev
Log:
Prepare for 2.0.1

Modified:
commons/proper/jexl/trunk/RELEASE-NOTES.txt
commons/proper/jexl/trunk/xdocs/changes.xml

Modified: commons/proper/jexl/trunk/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/RELEASE-NOTES.txt?rev=928452&r1=928451&r2=928452&view=diff
==
--- commons/proper/jexl/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/jexl/trunk/RELEASE-NOTES.txt Sun Mar 28 16:51:48 2010
@@ -104,8 +104,15 @@ Error and exception handling
* Configuring the leniency and verbosity of the Jexl engine allows user 
control over the
  error handling policy
 
-Bugs fixed:
-===
+Bugs fixed in 2.0.1:
+
+
+* JEXL-100: Array access expressions fail when evaluated twice and cache 
is enabled
+* JEXL-99:  Documentation of Thread Safety / Invalid code examples on 
homepage
+* JEXL-98:  Quote escaping cannot be escaped
+
+Bugs fixed in 2.0:
+==
 
 * JEXL-90: Jexl parser allows invalid expressions, e.g. "a=1 b=2 3"
 * JEXL-88: MethodKey.java - name clash getMostSpecific() with Java 1.5.0

Modified: commons/proper/jexl/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/xdocs/changes.xml?rev=928452&r1=928451&r2=928452&view=diff
==
--- commons/proper/jexl/trunk/xdocs/changes.xml (original)
+++ commons/proper/jexl/trunk/xdocs/changes.xml Sun Mar 28 16:51:48 2010
@@ -25,6 +25,11 @@
 Commons Developers
   
   
+
+Array access 
expressions fail when evaluated twice and cache is enabled
+Documentation of Thread Safety / Invalid code examples on 
homepage
+Quote escaping cannot be escaped
+
 
 Bean-ish & ant-ish like assignment
 Ternary operator support




svn commit: r928448 - /commons/proper/jexl/trunk/pom.xml

2010-03-28 Thread henrib
Author: henrib
Date: Sun Mar 28 16:39:26 2010
New Revision: 928448

URL: http://svn.apache.org/viewvc?rev=928448&view=rev
Log:
Prepare for 2.0.1

Modified:
commons/proper/jexl/trunk/pom.xml

Modified: commons/proper/jexl/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/pom.xml?rev=928448&r1=928447&r2=928448&view=diff
==
--- commons/proper/jexl/trunk/pom.xml (original)
+++ commons/proper/jexl/trunk/pom.xml Sun Mar 28 16:39:26 2010
@@ -106,7 +106,7 @@
 
 org.apache.bsf
 bsf-api
-[3.0-beta3,)
+3.0-beta3
 provided
 
 




svn commit: r928447 - /commons/proper/jexl/trunk/pom.xml

2010-03-28 Thread henrib
Author: henrib
Date: Sun Mar 28 16:37:30 2010
New Revision: 928447

URL: http://svn.apache.org/viewvc?rev=928447&view=rev
Log:
Prepare for 2.0.1

Modified:
commons/proper/jexl/trunk/pom.xml

Modified: commons/proper/jexl/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/pom.xml?rev=928447&r1=928446&r2=928447&view=diff
==
--- commons/proper/jexl/trunk/pom.xml (original)
+++ commons/proper/jexl/trunk/pom.xml Sun Mar 28 16:37:30 2010
@@ -24,7 +24,7 @@
 4.0.0
 org.apache.commons
 commons-jexl
-2.0.1
+2.0.1-SNAPSHOT
 Commons JEXL
 2001
 Jexl is an implementation of the JSTL Expression Language 
with extensions.




svn commit: r928443 - /commons/proper/jexl/trunk/pom.xml

2010-03-28 Thread henrib
Author: henrib
Date: Sun Mar 28 16:27:05 2010
New Revision: 928443

URL: http://svn.apache.org/viewvc?rev=928443&view=rev
Log:
Prepare for 2.0.1

Modified:
commons/proper/jexl/trunk/pom.xml

Modified: commons/proper/jexl/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/pom.xml?rev=928443&r1=928442&r2=928443&view=diff
==
--- commons/proper/jexl/trunk/pom.xml (original)
+++ commons/proper/jexl/trunk/pom.xml Sun Mar 28 16:27:05 2010
@@ -106,7 +106,7 @@
 
 org.apache.bsf
 bsf-api
-3.0-beta3
+[3.0-beta3,)
 provided
 
 




svn commit: r928425 - /commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java

2010-03-28 Thread sebb
Author: sebb
Date: Sun Mar 28 15:05:11 2010
New Revision: 928425

URL: http://svn.apache.org/viewvc?rev=928425&view=rev
Log:
Unused variable

Modified:

commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java

Modified: 
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java?rev=928425&r1=928424&r2=928425&view=diff
==
--- 
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java
 (original)
+++ 
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java
 Sun Mar 28 15:05:11 2010
@@ -101,7 +101,7 @@ public class Asserter extends Assert {
 engine.setLenient(false);
 engine.setSilent(false);
 Expression exp = engine.createExpression(expression);
-Object value = exp.evaluate(context);
+exp.evaluate(context);
 fail("expression: " + expression);
 } catch(JexlException xjexl) {
 if (matchException != null && 
!xjexl.getMessage().matches(matchException)) {




svn commit: r928419 - /commons/proper/daemon/trunk/src/samples/README.txt

2010-03-28 Thread sebb
Author: sebb
Date: Sun Mar 28 14:47:01 2010
New Revision: 928419

URL: http://svn.apache.org/viewvc?rev=928419&view=rev
Log:
ProcrunService now has additional options

Modified:
commons/proper/daemon/trunk/src/samples/README.txt

Modified: commons/proper/daemon/trunk/src/samples/README.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/samples/README.txt?rev=928419&r1=928418&r2=928419&view=diff
==
--- commons/proper/daemon/trunk/src/samples/README.txt (original)
+++ commons/proper/daemon/trunk/src/samples/README.txt Sun Mar 28 14:47:01 2010
@@ -45,4 +45,5 @@ AloneService is like ServiceDaemon excep
 ProcrunService
 --
 This is a simple Windows Service application.
-See ProcrunService.cmd for a sample installation script.
\ No newline at end of file
+It can be run either in Jvm or Java modes.
+See ProcrunServiceInstall.cmd for a sample installation script.
\ No newline at end of file




svn commit: r928417 - /commons/proper/daemon/trunk/src/samples/build.xml

2010-03-28 Thread sebb
Author: sebb
Date: Sun Mar 28 14:45:41 2010
New Revision: 928417

URL: http://svn.apache.org/viewvc?rev=928417&view=rev
Log:
ProcrunService:
- ensure jar is cleaned
- add Main-Class to jar

Modified:
commons/proper/daemon/trunk/src/samples/build.xml

Modified: commons/proper/daemon/trunk/src/samples/build.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/samples/build.xml?rev=928417&r1=928416&r2=928417&view=diff
==
--- commons/proper/daemon/trunk/src/samples/build.xml (original)
+++ commons/proper/daemon/trunk/src/samples/build.xml Sun Mar 28 14:45:41 2010
@@ -31,7 +31,7 @@
   
 
   
-  
+  
 
   
   
@@ -85,6 +85,9 @@
   
 
 
+
+   
+
   
   
 




svn commit: r928411 - /commons/proper/jexl/trunk/pom.xml

2010-03-28 Thread henrib
Author: henrib
Date: Sun Mar 28 14:34:54 2010
New Revision: 928411

URL: http://svn.apache.org/viewvc?rev=928411&view=rev
Log:
[maven-release-plugin] prepare release COMMONS_JEXL_2_0_1

Modified:
commons/proper/jexl/trunk/pom.xml

Modified: commons/proper/jexl/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/pom.xml?rev=928411&r1=928410&r2=928411&view=diff
==
--- commons/proper/jexl/trunk/pom.xml (original)
+++ commons/proper/jexl/trunk/pom.xml Sun Mar 28 14:34:54 2010
@@ -24,7 +24,7 @@
 4.0.0
 org.apache.commons
 commons-jexl
-2.0.1-SNAPSHOT
+2.0.1
 Commons JEXL
 2001
 Jexl is an implementation of the JSTL Expression Language 
with extensions.
@@ -36,9 +36,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/commons/proper/jexl/trunk
-
scm:svn:https://svn.apache.org/repos/asf/commons/proper/jexl/trunk
-http://svn.apache.org/viewvc/commons/proper/jexl/trunk
+
scm:svn:http://svn.apache.org/repos/asf/commons/proper/jexl/tags/COMMONS_JEXL_2_0_1
+
scm:svn:https://svn.apache.org/repos/asf/commons/proper/jexl/tags/COMMONS_JEXL_2_0_1
+
http://svn.apache.org/viewvc/commons/proper/jexl/tags/COMMONS_JEXL_2_0_1
 
 
 




svn commit: r928405 - in /commons/proper/jexl/trunk/src: main/java/org/apache/commons/jexl2/ main/java/org/apache/commons/jexl2/parser/ test/java/org/apache/commons/jexl2/

2010-03-28 Thread henrib
Author: henrib
Date: Sun Mar 28 14:22:06 2010
New Revision: 928405

URL: http://svn.apache.org/viewvc?rev=928405&view=rev
Log:
Updated Parser.jjt to define all acceptable tokens resulting in cleaner lexer.
Added 'register' syntax (#0-9) used by JexlEngine.{s,g}etProperty: syntax only 
valid through ALLOW_REGISTER flag and REGISTERS lexical state.
Completed literal handling (array, integer, string, float).

Added:

commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTArrayLiteral.java
   (with props)

commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTFloatLiteral.java
   (with props)
Modified:

commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java

commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlArithmetic.java

commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java

commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTIntegerLiteral.java

commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/ASTStringLiteral.java

commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/Parser.jjt

commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/JexlTestCase.java

Modified: 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java?rev=928405&r1=928404&r2=928405&view=diff
==
--- 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java
 (original)
+++ 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java
 Sun Mar 28 14:22:06 2010
@@ -181,7 +181,7 @@ public class Interpreter implements Pars
  * Sets this interpreter registers for bean access/assign expressions.
  * @param theRegisters the array of registers
  */
-protected void setRegisters(Object[] theRegisters) {
+protected void setRegisters(Object... theRegisters) {
 this.registers = theRegisters;
 }
 
@@ -361,13 +361,18 @@ public class Interpreter implements Pars
 
 /** {...@inheritdoc} */
 public Object visit(ASTArrayLiteral node, Object data) {
-int childCount = node.jjtGetNumChildren();
-Object[] array = new Object[childCount];
-for (int i = 0; i < childCount; i++) {
-Object entry = node.jjtGetChild(i).jjtAccept(this, data);
-array[i] = entry;
+Object literal = node.getLiteral();
+if (literal == null) {
+int childCount = node.jjtGetNumChildren();
+Object[] array = new Object[childCount];
+for (int i = 0; i < childCount; i++) {
+Object entry = node.jjtGetChild(i).jjtAccept(this, data);
+array[i] = entry;
+}
+literal = arithmetic.narrowArrayType(array);
+node.setLiteral(literal);
 }
-return arithmetic.narrowArrayType(array);
+return literal;
 }
 
 /** {...@inheritdoc} */
@@ -603,12 +608,10 @@ public class Interpreter implements Pars
 
 /** {...@inheritdoc} */
 public Object visit(ASTFloatLiteral node, Object data) {
-Object value = node.jjtGetValue();
-if (!(value instanceof Float)) {
-value = Float.valueOf(node.image);
-node.jjtSetValue(value);
+if (data != null) {
+return getAttribute(data, node.getLiteral(), node);
 }
-return value;
+return node.getLiteral();
 }
 
 /** {...@inheritdoc} */
@@ -677,12 +680,7 @@ public class Interpreter implements Pars
 String name = node.image;
 if (data == null) {
 if (registers != null) {
-if (registers[0].equals(name)) {
-return registers[1];
-}
-if (registers[2].equals(name)) {
-return registers[3];
-}
+return registers[name.charAt(1) - '0'];
 }
 Object value = context.get(name);
 if (value == null

Modified: 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlArithmetic.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlArithmetic.java?rev=928405&r1=928404&r2=928405&view=diff
==
--- 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlArithmetic.java
 (original)
+++ 
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlArithmetic.java
 Sun Mar 28 14:22:06 2010
@@ -85,7 +85,8 @@ public class JexlArithmetic {
 
 /**
  * The result of +,/,-,*,% when both operands are null.
- * @return null if strict, else Long(0)
+ * @return I

svn commit: r928383 - /commons/proper/math/trunk/src/site/xdoc/userguide/ode.xml

2010-03-28 Thread luc
Author: luc
Date: Sun Mar 28 12:12:43 2010
New Revision: 928383

URL: http://svn.apache.org/viewvc?rev=928383&view=rev
Log:
removed wrong subscript

Modified:
commons/proper/math/trunk/src/site/xdoc/userguide/ode.xml

Modified: commons/proper/math/trunk/src/site/xdoc/userguide/ode.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/site/xdoc/userguide/ode.xml?rev=928383&r1=928382&r2=928383&view=diff
==
--- commons/proper/math/trunk/src/site/xdoc/userguide/ode.xml (original)
+++ commons/proper/math/trunk/src/site/xdoc/userguide/ode.xml Sun Mar 28 
12:12:43 2010
@@ -295,7 +295,7 @@ public int eventOccurred(double t, doubl
   The classes and interfaces in this package mimic the behavior of the 
classes and
   interfaces of the top level ode package, only adding parameters 
arrays for the jacobians.
   The behavior of these classes is to create a compound state vector z 
containing both
-  the state y(t) and its derivatives dy(t)/dy0 and 
dy(t0)/dp and
+  the state y(t) and its derivatives dy(t)/dy0 and dy(t)/dp 
and
   to set up an extended problem by adding the equations for the 
jacobians automatically.
   These extended state and problems are then provided to a classical 
underlying integrator
   chosen by user.
@@ -317,7 +317,7 @@ public int eventOccurred(double t, doubl
   jacobians on one side and compound state on the other side.
 
 
-  In order to compute dy(t)/dy0 and dy(t0)/dp 
for any t, the algorithm
+  In order to compute dy(t)/dy0 and dy(t/dp for any t, the 
algorithm
   needs not only the ODE function f such that y'=f(t,y) but also its 
local jacobians
   df(t, y, p)/dy and df(t, y, p)/dp.
 




svn commit: r928382 - /commons/proper/math/trunk/src/site/xdoc/userguide/ode.xml

2010-03-28 Thread luc
Author: luc
Date: Sun Mar 28 12:10:15 2010
New Revision: 928382

URL: http://svn.apache.org/viewvc?rev=928382&view=rev
Log:
removed wrong subscript

Modified:
commons/proper/math/trunk/src/site/xdoc/userguide/ode.xml

Modified: commons/proper/math/trunk/src/site/xdoc/userguide/ode.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/site/xdoc/userguide/ode.xml?rev=928382&r1=928381&r2=928382&view=diff
==
--- commons/proper/math/trunk/src/site/xdoc/userguide/ode.xml (original)
+++ commons/proper/math/trunk/src/site/xdoc/userguide/ode.xml Sun Mar 28 
12:10:15 2010
@@ -288,7 +288,7 @@ public int eventOccurred(double t, doubl
   from the org.apache.commons.ode.jacobians
   package instead of the top level ode package. These classes compute 
the jacobians
-  dy(t)/dy0 and dy(t0)/dp where y0 is 
the initial state
+  dy(t)/dy0 and dy(t)/dp where y0 is the initial 
state
   and p is some ODE parameter.