svn commit: r1532652 - /commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/servlet/MonitoringFilter.java
Author: rmannibucau
Date: Wed Oct 16 06:42:26 2013
New Revision: 1532652
URL: http://svn.apache.org/r1532652
Log:
keeping webapp context in web monitoring, looks nice to remove it but when you
have multiple apps it is quickly the mess
Modified:
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/servlet/MonitoringFilter.java
Modified:
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/servlet/MonitoringFilter.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/servlet/MonitoringFilter.java?rev=1532652&r1=1532651&r2=1532652&view=diff
==
---
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/servlet/MonitoringFilter.java
(original)
+++
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/servlet/MonitoringFilter.java
Wed Oct 16 06:42:26 2013
@@ -65,8 +65,11 @@ public class MonitoringFilter implements
}
protected String getRequestedUri(final HttpServletRequest request) {
+return request.getRequestURI();
+/* if we want to remove webapp context we could do (but a bad idea in
an app server since you can get multiple contexts):
final String uri = request.getRequestURI();
final String context = request.getContextPath();
return uri.substring(context.length());
+*/
}
}
\ No newline at end of file
svn commit: r1532648 - in /commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format: CSVFormat.java HTMLFormat.java MapFormat.java
Author: rmannibucau
Date: Wed Oct 16 06:34:36 2013
New Revision: 1532648
URL: http://svn.apache.org/r1532648
Log:
fixing number formatting, we don't want to format in csv but only in rendered
html + allowing to configure it
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/CSVFormat.java
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/HTMLFormat.java
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/MapFormat.java
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/CSVFormat.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/CSVFormat.java?rev=1532648&r1=1532647&r2=1532648&view=diff
==
---
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/CSVFormat.java
(original)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/CSVFormat.java
Wed Oct 16 06:34:36 2013
@@ -35,7 +35,7 @@ public class CSVFormat extends MapFormat
new MapBuilder()
.set("headers", HEADER)
.set("separator", SEPARATOR)
-.set("lines", snapshot(timeUnit))
+.set("lines", snapshot(timeUnit, format(params, null)))
.build(), false);
}
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/HTMLFormat.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/HTMLFormat.java?rev=1532648&r1=1532647&r2=1532648&view=diff
==
---
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/HTMLFormat.java
(original)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/HTMLFormat.java
Wed Oct 16 06:34:36 2013
@@ -23,6 +23,8 @@ import org.apache.commons.monitoring.rep
import java.util.Map;
public class HTMLFormat extends MapFormat implements Format {
+private static final String NUMBER_FORMAT = "###,###,###,##0.00"; //
DecimalFormat is not thread safe so don't init it statically
+
@Override
public Template render(final Map params) {
final Unit timeUnit = timeUnit(params);
@@ -30,7 +32,7 @@ public class HTMLFormat extends MapForma
new MapBuilder()
.set(Map.class.cast(params))
.set("headers", ATTRIBUTES_ORDERED_LIST)
-.set("data", snapshot(timeUnit))
+.set("data", snapshot(timeUnit, format(params, NUMBER_FORMAT)))
.build());
}
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/MapFormat.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/MapFormat.java?rev=1532648&r1=1532647&r2=1532648&view=diff
==
---
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/MapFormat.java
(original)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/MapFormat.java
Wed Oct 16 06:34:36 2013
@@ -21,6 +21,8 @@ import org.apache.commons.monitoring.cou
import org.apache.commons.monitoring.counters.Unit;
import org.apache.commons.monitoring.repositories.Repository;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Collection;
@@ -29,7 +31,6 @@ import java.util.concurrent.CopyOnWriteA
public abstract class MapFormat {
protected static final Collection ATTRIBUTES_ORDERED_LIST =
buildMetricDataHeader();
-private static final DecimalFormat NUMBER_FORMATTER = new
DecimalFormat("###,###,###,##0.00");
protected static Collection buildMetricDataHeader() {
final Collection list = new CopyOnWriteArrayList();
@@ -41,6 +42,29 @@ public abstract class MapFormat {
return list;
}
+protected static String format(final
svn commit: r1532638 - in /commons/proper/math/trunk/src: main/java/org/apache/commons/math3/stat/inference/BinomialTest.java test/java/org/apache/commons/math3/stat/inference/BinomialTestTest.java
Author: psteitz
Date: Wed Oct 16 04:29:31 2013
New Revision: 1532638
URL: http://svn.apache.org/r1532638
Log:
Improved javadoc; changed confidence level to significance level. JIRA:
MATH-1034.
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/stat/inference/BinomialTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/stat/inference/BinomialTestTest.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/stat/inference/BinomialTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/stat/inference/BinomialTest.java?rev=1532638&r1=1532637&r2=1532638&view=diff
==
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/stat/inference/BinomialTest.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/stat/inference/BinomialTest.java
Wed Oct 16 04:29:31 2013
@@ -51,8 +51,8 @@ public class BinomialTest {
* @param numberOfSuccesses number of successes observed
* @param probability assumed probability of a single trial under the null
hypothesis
* @param alternativeHypothesis type of hypothesis being evaluated (one-
or two-sided)
- * @param confidenceLevel confidence level of the test
- * @return true if the null hypothesis can be rejected with confidence
{@code confidenceLevel}
+ * @param alpha significance level of the test
+ * @return true if the null hypothesis can be rejected with confidence
{@code 1 - alpha}
* @throws NotPositiveException if {@code numberOfTrials} or {@code
numberOfSuccesses} is negative
* @throws OutOfRangeException if {@code probability} is not between 0 and
1
* @throws MathIllegalArgumentException if {@code numberOfTrials} <
{@code numberOfSuccesses} or
@@ -60,9 +60,9 @@ public class BinomialTest {
* @see AlternativeHypothesis
*/
public boolean binomialTest(int numberOfTrials, int numberOfSuccesses,
double probability,
-AlternativeHypothesis alternativeHypothesis,
double confidenceLevel) {
+AlternativeHypothesis alternativeHypothesis,
double alpha) {
double pValue = binomialTest(numberOfTrials, numberOfSuccesses,
probability, alternativeHypothesis);
-return pValue < 1 - confidenceLevel;
+return pValue < alpha;
}
/**
@@ -71,7 +71,15 @@ public class BinomialTest {
* associated with a http://en.wikipedia.org/wiki/Binomial_test";>
Binomial test.
*
* The number returned is the smallest significance level at which one can
reject the null hypothesis.
- * The form of the hypothesis depends on {@code alternativeHypothesis}.
+ * The form of the hypothesis depends on {@code alternativeHypothesis}.
+ *
+ * The p-Value represents the likelihood of getting a result at least as
extreme as the sample,
+ * given the provided {@code probability} of success on a single trial.
For single-sided tests,
+ * this value can be directly derived from the Binomial distribution. For
the two-sided test,
+ * the implementation works as follows: we start by looking at the most
extreme cases
+ * (0 success and n success where n is the number of trials from the
sample) and determine their likelihood.
+ * The lower value is added to the p-Value (if both values are equal, both
are added). Then we continue with
+ * the next extreme value, until we added the value for the actual
observed sample.
*
* Preconditions:
*
@@ -79,7 +87,7 @@ public class BinomialTest {
* Number of successes must be ≥ 0.
* Number of successes must be ≤ number of trials.
* Probability must be ≥ 0 and ≤ 1.
- *
+ *
*
* @param numberOfTrials number of trials performed
* @param numberOfSuccesses number of successes observed
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/stat/inference/BinomialTestTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/stat/inference/BinomialTestTest.java?rev=1532638&r1=1532637&r2=1532638&view=diff
==
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/stat/inference/BinomialTestTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/stat/inference/BinomialTestTest.java
Wed Oct 16 04:29:31 2013
@@ -67,15 +67,15 @@ public class BinomialTestTest {
@Test
public void testBinomialTestAcceptReject() {
-double confidenceLevel95 = 0.95;
-double confidenceLevel99 = 0.99;
+double alpha05 = 0.05;
+double alpha01 = 0.01;
-Assert.assertTrue(testStatistic.binomialTest(trials, successes,
probability, Altern
svn commit: r1532637 [4/4] - in /commons/proper/scxml/trunk: ./ src/test/java/org/apache/commons/scxml2/ src/test/java/org/apache/commons/scxml2/env/ src/test/java/org/apache/commons/scxml2/env/faces/
Modified:
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java?rev=1532637&r1=1532636&r2=1532637&view=diff
==
---
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java
(original)
+++
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java
Wed Oct 16 03:46:58 2013
@@ -21,7 +21,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import junit.framework.TestCase;
import org.apache.commons.scxml2.SCXMLExecutor;
import org.apache.commons.scxml2.SCXMLTestHelper;
import org.apache.commons.scxml2.TriggerEvent;
@@ -29,17 +28,14 @@ import org.apache.commons.scxml2.env.jex
import org.apache.commons.scxml2.env.jexl.JexlEvaluator;
import org.apache.commons.scxml2.env.jsp.ELContext;
import org.apache.commons.scxml2.env.jsp.ELEvaluator;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
/**
* Unit tests {@link org.apache.commons.scxml2.SCXMLExecutor}.
*/
-public class DatamodelTest extends TestCase {
-/**
- * Construct a new instance of SCXMLExecutorTest with
- * the specified name
- */
-public DatamodelTest(String name) {
-super(name);
-}
+public class DatamodelTest {
// Test data
private URL datamodel01jexl, datamodel02jexl, datamodel04jexl,
datamodel05jexl, datamodel01jsp, datamodel02jsp;
@@ -48,7 +44,7 @@ public class DatamodelTest extends TestC
/**
* Set up instance variables required by this test case.
*/
-@Override
+@Before
public void setUp() {
datamodel01jexl = this.getClass().getClassLoader().
getResource("org/apache/commons/scxml2/env/jexl/datamodel-01.xml");
@@ -67,71 +63,76 @@ public class DatamodelTest extends TestC
/**
* Tear down instance variables required by this test case.
*/
-@Override
+@After
public void tearDown() {
datamodel01jexl = datamodel02jexl = datamodel04jexl = datamodel05jexl
= datamodel01jsp = datamodel02jsp = null;
}
/**
* Test the stateless model, simultaneous executions
- */
+ */
+@Test
public void testDatamodelSimultaneousJexl() throws Exception {
exec01 = SCXMLTestHelper.getExecutor(datamodel01jexl,
new JexlContext(), new JexlEvaluator());
-assertNotNull(exec01);
+Assert.assertNotNull(exec01);
exec02 = SCXMLTestHelper.getExecutor(datamodel01jexl,
new JexlContext(), new JexlEvaluator());
-assertNotNull(exec02);
-assertFalse(exec01 == exec02);
+Assert.assertNotNull(exec02);
+Assert.assertFalse(exec01 == exec02);
runtest();
}
-
+
+@Test
public void testDatamodelSimultaneousJsp() throws Exception {
exec01 = SCXMLTestHelper.getExecutor(datamodel01jsp,
new ELContext(), new ELEvaluator());
-assertNotNull(exec01);
+Assert.assertNotNull(exec01);
exec02 = SCXMLTestHelper.getExecutor(datamodel01jsp,
new ELContext(), new ELEvaluator());
-assertNotNull(exec02);
-assertFalse(exec01 == exec02);
+Assert.assertNotNull(exec02);
+Assert.assertFalse(exec01 == exec02);
runtest();
}
-
+
+@Test
public void testDatamodelNamespacePrefixedXPaths() throws Exception {
exec01 = SCXMLTestHelper.getExecutor(datamodel02jexl,
new JexlContext(), new JexlEvaluator());
-assertNotNull(exec01);
+Assert.assertNotNull(exec01);
exec02 = SCXMLTestHelper.getExecutor(datamodel02jsp,
new ELContext(), new ELEvaluator());
-assertNotNull(exec02);
-assertFalse(exec01 == exec02);
+Assert.assertNotNull(exec02);
+Assert.assertFalse(exec01 == exec02);
runtest();
}
-
+
+@Test
public void testDatamodel04Jexl() throws Exception {
exec01 = SCXMLTestHelper.getExecutor(datamodel04jexl,
new JexlContext(), new JexlEvaluator());
-assertNotNull(exec01);
+Assert.assertNotNull(exec01);
Set currentStates =
exec01.getCurrentStatus().getStates();
-assertEquals(1, currentStates.size());
-assertEquals("ten", currentStates.iterator().next().getId());
+Assert.assertEquals(1, currentStates.size());
+Assert.assertEquals("ten", currentStates.iterator().next().getId());
Map payload = new HashMap();
payload.put("one", "1");
payload.put("two", "2");
TriggerEvent te = new TriggerEvent("ten.done",
TriggerEvent.SIGNAL_EVENT, payload);
SCXMLTestHelper.fireEvent(exec01, te);
currentStates = exec01.getCurrentSt
svn commit: r1532631 - /commons/proper/jelly/trunk/pom.xml
Author: dbrosius Date: Wed Oct 16 02:25:48 2013 New Revision: 1532631 URL: http://svn.apache.org/r1532631 Log: update relocated jar references Modified: commons/proper/jelly/trunk/pom.xml Modified: commons/proper/jelly/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/pom.xml?rev=1532631&r1=1532630&r2=1532631&view=diff == --- commons/proper/jelly/trunk/pom.xml (original) +++ commons/proper/jelly/trunk/pom.xml Wed Oct 16 02:25:48 2013 @@ -369,8 +369,8 @@ - servletapi - servletapi + javax.servlet + servlet-api 2.3 @@ -394,7 +394,7 @@ 1.0-beta-5 - jstl + javax.servlet jstl 1.0.6 @@ -430,7 +430,7 @@ xerces - xerces + xercesImpl 2.2.1
svn commit: r1532630 - /commons/proper/jelly/trunk/pom.xml
Author: dbrosius Date: Wed Oct 16 02:22:06 2013 New Revision: 1532630 URL: http://svn.apache.org/r1532630 Log: an initial attempt at having a maven2 pom Added: commons/proper/jelly/trunk/pom.xml Added: commons/proper/jelly/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/pom.xml?rev=1532630&view=auto == --- commons/proper/jelly/trunk/pom.xml (added) +++ commons/proper/jelly/trunk/pom.xml Wed Oct 16 02:22:06 2013 @@ -0,0 +1,487 @@ + +http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + +org.apache.commons +commons-parent +28 + + 4.0.0 + commons-jelly + commons-jelly + 1.1-SNAPSHOT + commons-jelly + Jelly is a Java and XML based scripting engine. Jelly combines the best ideas from JSTL, Velocity, DVSL, Ant and Cocoon all together in a simple yet powerful scripting engine. + http://commons.apache.org/jelly/ + 2002 + +The Apache Software Foundation +http://commons.apache.org/ + + + + Commons Dev List + dev-subscr...@commons.apache.org + dev-unsubscr...@commons.apache.org + http://mail-archives.apache.org/mod_mbox/commons-dev/ + + + Commons User List + user-subscr...@commons.apache.org + user-unsubscr...@commons.apache.org + http://mail-archives.apache.org/mod_mbox/commons-user/ + + + + + jstrachan + James Strachan + jstrac...@apache.org + SpiritSoft, Inc. + + + geirm + Geir Magnusson Jr. + ge...@adeptra.com + Adeptra, Inc. + + + werken + Bob McWhirter + b...@eng.werken.com + The Werken Company + + + dion + dIon Gillard + d...@multitask.com.au + Multitask Consulting + +Interested party + + + + morgand + Morgan Delagrange + morg...@apache.org + + + rwaldhoff + Rodney Waldhoff + rwaldh...@apache.org + + + proyal + Peter Royal + pro...@apache.org + + + mvdb + Martin van den Bemt + mar...@mvdb.net + + + polx + Paul Libbrecht + p...@activemath.org + + + rdonkin + Robert Burrell Donkin + rdon...@apache.org + + + dfs + Daniel F. Savarese + dfs -> apache.org + + + brett + Brett Porter + br...@apache.org + + + hgilde + Hans Gilde + hgi...@apache.org + + + + + Erik Fransen + erik...@xs4all.nl + +Logo designer + + + + Calvin Yu + + + Stephen Haberman + steph...@chase3000.com + + + Vinay Chandran + sahilvi...@yahoo.com + +Developer + + + + Theo Niemeijer + + + Joe Walnes + j...@thoughtworks.com + ThoughtWorks, Inc. + +Inventor of Mock Tags + + + + Otto von Wachter + von...@yahoo.com + + +Author of the tutorials +Developer + + + + Robert Leftwich + rob...@leftwich.info + +Developer + + + + Jim Birchfield + jim.birchfi...@genscape.com + Genscape, Inc. + +Developer + + + + Jason Horman + jhor...@musicmatch.com + +Developer + + + + Tim Anderson + t...@intalio.com + Intalio, Inc. + +Developer + + + + Theo Niemeijer + theo.niemei...@getthere.nl + + +Developer + + + + J. Matthew Pryor + matthew_pr...@versata.com + + +Developer + + + + Knut Wannheden + + + +Developer + + + + Kelvin Tan + + + +Developer + + + + Todd Jonker + + + +Developer + + + + Christiaan ten Klooster + + + +Developer + + + + Pete Kazmier + k...@apache.org + + +Developer + + + + John Spackman + john.spack...@zenesis.com + Zenesis Limited + +Developer + + + + John Spackman + john.spack...@zenesis.com + Zenesis Limited + +Developer + + + + John Spackman + john.spack...@zenesis.com + Zenesis Limited + +Developer + + + + +http://issues.apache.org/jira/browse/JELLY + + + scm:svn:http://svn.apache.org/repos/asf/commons/proper/jelly/trunk/ + scm:svn:https://svn.apache.org/repos/asf/commons/proper/jelly/trunk/ +http://svn.apache.org/viewvc/commons/proper/jelly/trunk/ +
svn commit: r1532626 - /commons/trunks-proper/CHALLENGE.txt
Author: psteitz Date: Wed Oct 16 02:09:12 2013 New Revision: 1532626 URL: http://svn.apache.org/r1532626 Log: Removed * from pbenedict. Modified: commons/trunks-proper/CHALLENGE.txt Modified: commons/trunks-proper/CHALLENGE.txt URL: http://svn.apache.org/viewvc/commons/trunks-proper/CHALLENGE.txt?rev=1532626&r1=1532625&r2=1532626&view=diff == --- commons/trunks-proper/CHALLENGE.txt (original) +++ commons/trunks-proper/CHALLENGE.txt Wed Oct 16 02:09:12 2013 @@ -33,7 +33,7 @@ jcs= jelly=polx,kinow jexl=sebb jxpath=mbenson -lang=bayard,joehni,mbenson,britter,sebb,pbenedict*,ggregory +lang=bayard,joehni,mbenson,britter,sebb,pbenedict,ggregory launcher= logging=rwhitcomb*,tn math=psteitz,erans,luc,[sebb],tn
svn commit: r1532558 - /commons/trunks-proper/CHALLENGE.txt
Author: tn Date: Tue Oct 15 22:08:52 2013 New Revision: 1532558 URL: http://svn.apache.org/r1532558 Log: Main components I plan to work on. Modified: commons/trunks-proper/CHALLENGE.txt Modified: commons/trunks-proper/CHALLENGE.txt URL: http://svn.apache.org/viewvc/commons/trunks-proper/CHALLENGE.txt?rev=1532558&r1=1532557&r2=1532558&view=diff == --- commons/trunks-proper/CHALLENGE.txt (original) +++ commons/trunks-proper/CHALLENGE.txt Tue Oct 15 22:08:52 2013 @@ -11,8 +11,8 @@ betwixt= bsf= chain=britter cli= -codec=sebb,ggregory -collections=mbenson,britter +codec=sebb,ggregory,tn +collections=mbenson,britter,tn compress=bodewig,sebb configuration= csv=adrianc*,britter,sebb,rwhitcomb*,ggregory @@ -22,7 +22,7 @@ dbutils= digester= discovery= el= -email= +email=tn exec= fileupload= functor=kinow,mbenson @@ -35,8 +35,8 @@ jexl=sebb jxpath=mbenson lang=bayard,joehni,mbenson,britter,sebb,pbenedict*,ggregory launcher= -logging=rwhitcomb* -math=psteitz,erans,luc,[sebb] +logging=rwhitcomb*,tn +math=psteitz,erans,luc,[sebb],tn modeler= net=sebb ognl=
svn commit: r3275 - in /dev/commons/email: ./ binaries/ source/
Author: tn Date: Tue Oct 15 21:59:33 2013 New Revision: 3275 Log: Create distribution files for commons-email 1.3.2 RC1. Added: dev/commons/email/ dev/commons/email/RELEASE-NOTES.txt (with props) dev/commons/email/binaries/ dev/commons/email/binaries/commons-email-1.3.2-bin.tar.gz (with props) dev/commons/email/binaries/commons-email-1.3.2-bin.tar.gz.asc dev/commons/email/binaries/commons-email-1.3.2-bin.tar.gz.md5 dev/commons/email/binaries/commons-email-1.3.2-bin.tar.gz.sha1 dev/commons/email/binaries/commons-email-1.3.2-bin.zip (with props) dev/commons/email/binaries/commons-email-1.3.2-bin.zip.asc dev/commons/email/binaries/commons-email-1.3.2-bin.zip.md5 dev/commons/email/binaries/commons-email-1.3.2-bin.zip.sha1 dev/commons/email/source/ dev/commons/email/source/commons-email-1.3.2-src.tar.gz (with props) dev/commons/email/source/commons-email-1.3.2-src.tar.gz.asc dev/commons/email/source/commons-email-1.3.2-src.tar.gz.md5 dev/commons/email/source/commons-email-1.3.2-src.tar.gz.sha1 dev/commons/email/source/commons-email-1.3.2-src.zip (with props) dev/commons/email/source/commons-email-1.3.2-src.zip.asc dev/commons/email/source/commons-email-1.3.2-src.zip.md5 dev/commons/email/source/commons-email-1.3.2-src.zip.sha1 Added: dev/commons/email/RELEASE-NOTES.txt == --- dev/commons/email/RELEASE-NOTES.txt (added) +++ dev/commons/email/RELEASE-NOTES.txt Tue Oct 15 21:59:33 2013 @@ -0,0 +1,260 @@ + Commons Email Package + Version 1.3.2 + Release Notes + +INTRODUCTION: +- + +Commons Email aims to provide a API for sending email. It builds on the JavaMail +API with the aim of presenting a simplified API which is easy for developers who +are not mail experts to use. It is a compact component with a small number of +classes. + +The Commons Email website is the source for the most recent information, +downloads, reports, and bug status: + +http://commons.apache.org/email/ + +This is a maintenance release which fixes several bugs present in the 1.3.1 +release. All current users are encouraged to upgrade. + +CHANGES FROM 1.3.1: +- + +== Compatibility == + +* Java 5 or later is required (unchanged since 1.3). + +== Fixed Bugs == + +* Change visibility of DataSourceUrlResourceResolver.createUrl(String) to protected so + that sub-classes can override it. + Issue: EMAIL-135. Thanks to Andreas Kohn. + +* Support default mime charset property "mail.mime.charset" when adding text content + to instances of either SimpleEmail or HtmlEmail. + Issue: EMAIL-104. Thanks to Hiroshi Ikeda. + +* Added support for sending partial emails in case of invalid addresses. + Issue: EMAIL-132. Thanks to Allen Xudong Cheng. + +* The MimeMessageParser will now correctly parse MIME multi-parts of type "text/plain" + and "text/html" with a content disposition header of "attachment". The parts will + be added to the list of attachments even if there is no other text or html content. + Issue: EMAIL-131. Thanks to Raju Y. + +* Special characters in the body of an HTML email could lead to an exception when the + mime message was built. + Issue: EMAIL-127. Thanks to Dominik Stadler. + + +CHANGES FROM 1.3: +- + +== Compatibility == + +* Java 5 or later is required (unchanged since 1.3). + +== Fixed Bugs == + +* DataSourceClassPathResolver will now correctly set the DataSource name for resolved + resources. Additionally, it is now possible to set the name for a ByteArrayDataSource. + Issue: EMAIL-125. Thanks to Jean-Marc. + +* Header values are not folded twice anymore. The actual encoding and folding is + now only performed in Email.buildMimeMessage(). + Issue: EMAIL-124. Thanks to Stefan Schueffler. + + +CHANGES FROM 1.2: +- + +== Compatibility == + +* Java 5 or later is now required. + +== New Features == + +* Added new methods addTo(String[]), addCc(String[]) and addBcc(String[]) to Email. + Issue: EMAIL-114. Thanks to Gokul Nanthakumar C. + +* HtmlmageEmail should support class path resources + Issue: EMAIL-108. Thanks to Elisabeth Kasimir, Alexander Kasimir. + +* Added a MultiPartEmail.attach(File) method since attaching a file is a simple and common. + +* Added MimeMessageParser and MimeMessageUtils. + +== Fixed Bugs == + +* Use the provided Content-ID in HtmlEmail#embed(File, String) instead of creating + a random one. The used and returned Content-ID will be URL encoded (see RFC 2392). + Issue: EMAIL-101. Thanks to Andrew Starodub. + +* Upgraded source and binary compatibility to JDK 1.5. Additionally the public/protected + methods and fields have been properly generified. + Issue: EMAIL-122. Thanks to sebb. + +* Do not set the personal name of an address to the email address unless it is + ex
Nexus: Staging Completed.
Description:Prepare for vote of commons-email 1.3.2 based on RC1,Details:The following artifacts have been staged to the org.apache.commons-182 (u:tn, a:81.11.244.28) repository.archetype-catalog.xmlcommons-email-1.3.2.jarcommons-email-1.3.2-tests.jar.asccommons-email-1.3.2-bin.tar.gzcommons-email-1.3.2-sources.jar.asccommons-email-1.3.2-javadoc.jarcommons-email-1.3.2.jar.asccommons-email-1.3.2-src.tar.gz.asccommons-email-1.3.2-tests.jarcommons-email-1.3.2-test-sources.jar.asccommons-email-1.3.2.pomcommons-email-1.3.2-src.zip.asccommons-email-1.3.2-src.zipcommons-email-1.3.2-bin.zip.asccommons-email-1.3.2-test-sources.jarcommons-email-1.3.2-bin.zipcommons-email-1.3.2-src.tar.gzcommons-email-1.3.2-javadoc.jar.asccommons-email-1.3.2-bin.tar.gz.asccommons-email-1.3.2.pom.asccommons-email-1.3.2-sources.jar
svn commit: r1532553 - in /commons/proper/email/tags/EMAIL_1_3_2_RC1: ./ pom.xml src/changes/changes.xml src/site/site.xml src/site/xdoc/download_email.xml src/site/xdoc/index.xml
Author: tn Date: Tue Oct 15 21:47:03 2013 New Revision: 1532553 URL: http://svn.apache.org/r1532553 Log: Creating Commons Email v1.3.2 RC1 tag. Added: commons/proper/email/tags/EMAIL_1_3_2_RC1/ - copied from r1532551, commons/proper/email/trunk/ Modified: commons/proper/email/tags/EMAIL_1_3_2_RC1/pom.xml commons/proper/email/tags/EMAIL_1_3_2_RC1/src/changes/changes.xml commons/proper/email/tags/EMAIL_1_3_2_RC1/src/site/site.xml commons/proper/email/tags/EMAIL_1_3_2_RC1/src/site/xdoc/download_email.xml commons/proper/email/tags/EMAIL_1_3_2_RC1/src/site/xdoc/index.xml Modified: commons/proper/email/tags/EMAIL_1_3_2_RC1/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3_2_RC1/pom.xml?rev=1532553&r1=1532551&r2=1532553&view=diff == --- commons/proper/email/tags/EMAIL_1_3_2_RC1/pom.xml (original) +++ commons/proper/email/tags/EMAIL_1_3_2_RC1/pom.xml Tue Oct 15 21:47:03 2013 @@ -24,7 +24,7 @@ 4.0.0 org.apache.commons commons-email -1.3.2-SNAPSHOT +1.3.2 Commons Email 2001 Modified: commons/proper/email/tags/EMAIL_1_3_2_RC1/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3_2_RC1/src/changes/changes.xml?rev=1532553&r1=1532551&r2=1532553&view=diff == --- commons/proper/email/tags/EMAIL_1_3_2_RC1/src/changes/changes.xml (original) +++ commons/proper/email/tags/EMAIL_1_3_2_RC1/src/changes/changes.xml Tue Oct 15 21:47:03 2013 @@ -22,7 +22,7 @@ - + Change visibility of DataSourceUrlResourceResolver.createUrl(String) to protected so that sub-classes can override it. Modified: commons/proper/email/tags/EMAIL_1_3_2_RC1/src/site/site.xml URL: http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3_2_RC1/src/site/site.xml?rev=1532553&r1=1532551&r2=1532553&view=diff == --- commons/proper/email/tags/EMAIL_1_3_2_RC1/src/site/site.xml (original) +++ commons/proper/email/tags/EMAIL_1_3_2_RC1/src/site/site.xml Tue Oct 15 21:47:03 2013 @@ -24,9 +24,12 @@ - -http://commons.apache.org/email/download_email.cgi"/> - + +http://commons.apache.org/email/download_email.cgi"/> + + + + Modified: commons/proper/email/tags/EMAIL_1_3_2_RC1/src/site/xdoc/download_email.xml URL: http://svn.apache.org/viewvc/commons/proper/email/tags/EMAIL_1_3_2_RC1/src/site/xdoc/download_email.xml?rev=1532553&r1=1532551&r2=1532553&view=diff == --- commons/proper/email/tags/EMAIL_1_3_2_RC1/src/site/xdoc/download_email.xml (original) +++ commons/proper/email/tags/EMAIL_1_3_2_RC1/src/site/xdoc/download_email.xml Tue Oct 15 21:47:03 2013 @@ -95,32 +95,32 @@ limitations under the License. - + - commons-email-1.3.1-bin.tar.gz - http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.1-bin.tar.gz.md5";>md5 - http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.1-bin.tar.gz.asc";>pgp + commons-email-1.3.2-bin.tar.gz + http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.2-bin.tar.gz.md5";>md5 + http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.2-bin.tar.gz.asc";>pgp - commons-email-1.3.1-bin.zip - http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.1-bin.zip.md5";>md5 - http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.1-bin.zip.asc";>pgp + commons-email-1.3.2-bin.zip + http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.2-bin.zip.md5";>md5 + http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.2-bin.zip.asc";>pgp - commons-email-1.3.1-src.tar.gz - http://www.apache.org/dist/commons/email/source/commons-email-1.3.1-src.tar.gz.md5";>md5 - http://www.apache.org/dist/commons/email/source/commons-email-1.3.1-src.tar.gz.asc";>pgp + commons-email-1.3.2-src.tar.gz + http://www.apache.org/dist/commons/email/source/commons-email-1.3.2-src.tar.gz.md5";>md5 + http://www.apache.org/dist/commons/email/source/commons-email-1.3.2-src.tar.gz.asc";>pgp - commons-email-1.3.1-src.zip - http://www.apache.org/dist/commons/email/source/commons-email-1.3.1-src.zip.md5";>md5 - http://www.apach
svn commit: r1532551 - /commons/proper/email/trunk/RELEASE-NOTES.txt
Author: tn Date: Tue Oct 15 21:44:12 2013 New Revision: 1532551 URL: http://svn.apache.org/r1532551 Log: Update release notes. Modified: commons/proper/email/trunk/RELEASE-NOTES.txt Modified: commons/proper/email/trunk/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/RELEASE-NOTES.txt?rev=1532551&r1=1532550&r2=1532551&view=diff == --- commons/proper/email/trunk/RELEASE-NOTES.txt (original) +++ commons/proper/email/trunk/RELEASE-NOTES.txt Tue Oct 15 21:44:12 2013 @@ -1,5 +1,5 @@ Commons Email Package - Version 1.3.1 + Version 1.3.2 Release Notes INTRODUCTION: @@ -15,9 +15,38 @@ downloads, reports, and bug status: http://commons.apache.org/email/ -This is a maintenance release which fixes several bugs present in the 1.3 +This is a maintenance release which fixes several bugs present in the 1.3.1 release. All current users are encouraged to upgrade. +CHANGES FROM 1.3.1: +- + +== Compatibility == + +* Java 5 or later is required (unchanged since 1.3). + +== Fixed Bugs == + +* Change visibility of DataSourceUrlResourceResolver.createUrl(String) to protected so + that sub-classes can override it. + Issue: EMAIL-135. Thanks to Andreas Kohn. + +* Support default mime charset property "mail.mime.charset" when adding text content + to instances of either SimpleEmail or HtmlEmail. + Issue: EMAIL-104. Thanks to Hiroshi Ikeda. + +* Added support for sending partial emails in case of invalid addresses. + Issue: EMAIL-132. Thanks to Allen Xudong Cheng. + +* The MimeMessageParser will now correctly parse MIME multi-parts of type "text/plain" + and "text/html" with a content disposition header of "attachment". The parts will + be added to the list of attachments even if there is no other text or html content. + Issue: EMAIL-131. Thanks to Raju Y. + +* Special characters in the body of an HTML email could lead to an exception when the + mime message was built. + Issue: EMAIL-127. Thanks to Dominik Stadler. + CHANGES FROM 1.3: -
svn commit: r1532538 - in /commons/proper/email/trunk/src: changes/changes.xml main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java
Author: tn
Date: Tue Oct 15 21:21:18 2013
New Revision: 1532538
URL: http://svn.apache.org/r1532538
Log:
[EMAIL-135] Changed DataSourceUrlResolver.createUrl(String) to protected.
Modified:
commons/proper/email/trunk/src/changes/changes.xml
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java
Modified: commons/proper/email/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/changes/changes.xml?rev=1532538&r1=1532537&r2=1532538&view=diff
==
--- commons/proper/email/trunk/src/changes/changes.xml (original)
+++ commons/proper/email/trunk/src/changes/changes.xml Tue Oct 15 21:21:18 2013
@@ -23,6 +23,10 @@
+
+Change visibility of DataSourceUrlResourceResolver.createUrl(String)
to protected so
+that sub-classes can override it.
+
Support default mime charset property "mail.mime.charset" when adding
text content
to instances of either SimpleEmail or HtmlEmail.
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java?rev=1532538&r1=1532537&r2=1532538&view=diff
==
---
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java
(original)
+++
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java
Tue Oct 15 21:21:18 2013
@@ -109,7 +109,7 @@ public class DataSourceUrlResolver exten
* @return the corresponding URL
* @throws java.net.MalformedURLException creating the URL failed
*/
-private URL createUrl(final String resourceLocation) throws
MalformedURLException
+protected URL createUrl(final String resourceLocation) throws
MalformedURLException
{
// if we get an non-existing base url than the resource can
// be directly used to create an URL
svn commit: r1532531 - in /commons/proper/email/trunk/src: changes/ main/java/org/apache/commons/mail/ test/java/org/apache/commons/mail/
Author: tn
Date: Tue Oct 15 21:13:11 2013
New Revision: 1532531
URL: http://svn.apache.org/r1532531
Log:
[EMAIL-104] Add support for default mime charset when added text content to
SimpleEmail or HtmlEmail.
Modified:
commons/proper/email/trunk/src/changes/changes.xml
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailConstants.java
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/HtmlEmailTest.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SimpleEmailTest.java
Modified: commons/proper/email/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/changes/changes.xml?rev=1532531&r1=1532530&r2=1532531&view=diff
==
--- commons/proper/email/trunk/src/changes/changes.xml (original)
+++ commons/proper/email/trunk/src/changes/changes.xml Tue Oct 15 21:13:11 2013
@@ -23,6 +23,10 @@
+
+Support default mime charset property "mail.mime.charset" when adding
text content
+to instances of either SimpleEmail or HtmlEmail.
+
Added support for sending partial emails in case of invalid addresses.
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java?rev=1532531&r1=1532530&r2=1532531&view=diff
==
--- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
(original)
+++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
Tue Oct 15 21:13:11 2013
@@ -1284,7 +1284,17 @@ public abstract class Email
if (this.content != null)
{
-this.message.setContent(this.content, this.contentType);
+if
(EmailConstants.TEXT_PLAIN.equalsIgnoreCase(this.contentType)
+&& this.content instanceof String)
+{
+// EMAIL-104: call explicitly setText to use default mime
charset
+//(property "mail.mime.charset") in case none
has been set
+this.message.setText(this.content.toString(),
this.charset);
+}
+else
+{
+this.message.setContent(this.content, this.contentType);
+}
}
else if (this.emailBody != null)
{
@@ -1299,7 +1309,7 @@ public abstract class Email
}
else
{
-this.message.setContent("", Email.TEXT_PLAIN);
+this.message.setText("");
}
if (this.fromAddress != null)
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailConstants.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailConstants.java?rev=1532531&r1=1532530&r2=1532531&view=diff
==
---
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailConstants.java
(original)
+++
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailConstants.java
Tue Oct 15 21:13:11 2013
@@ -107,6 +107,9 @@ public final class EmailConstants
/** defines the text/html content type */
public static final String TEXT_HTML = "text/html";
+/** defines the html subtype */
+public static final String TEXT_SUBTYPE_HTML = "html";
+
/** defines the text/plain content type */
public static final String TEXT_PLAIN = "text/plain";
@@ -221,6 +224,12 @@ public final class EmailConstants
*/
public static final String MAIL_SMTPS_SEND_PARTIAL =
"mail.smtps.sendpartial";
+/**
+ * Defines the default mime charset to use when none has been specified
for the message.
+ * @since 1.3.2
+ */
+public static final String MAIL_MIME_CHARSET = "mail.mime.charset";
+
/** Hide constructor. */
private EmailConstants()
{
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java?rev=1532531&r1=1532530&r2=1532531&view=diff
==
---
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java
(original)
+++
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java
Tue Oct 15 21:13:11 2013
@@ -534,8 +534,8 @@ public class HtmlEmail extends MultiPart
svn commit: r1532527 - /commons/trunks-proper/CHALLENGE.txt
Author: ggregory Date: Tue Oct 15 20:54:04 2013 New Revision: 1532527 URL: http://svn.apache.org/r1532527 Log: my interests Modified: commons/trunks-proper/CHALLENGE.txt Modified: commons/trunks-proper/CHALLENGE.txt URL: http://svn.apache.org/viewvc/commons/trunks-proper/CHALLENGE.txt?rev=1532527&r1=1532526&r2=1532527&view=diff == --- commons/trunks-proper/CHALLENGE.txt (original) +++ commons/trunks-proper/CHALLENGE.txt Tue Oct 15 20:54:04 2013 @@ -11,11 +11,11 @@ betwixt= bsf= chain=britter cli= -codec=sebb +codec=sebb,ggregory collections=mbenson,britter compress=bodewig,sebb configuration= -csv=adrianc*,britter,sebb,rwhitcomb* +csv=adrianc*,britter,sebb,rwhitcomb*,ggregory daemon=sebb[partial] dbcp=psteitz dbutils= @@ -27,13 +27,13 @@ exec= fileupload= functor=kinow,mbenson imaging= -io=joehni,sebb +io=joehni,sebb,ggregory jci= jcs= jelly=polx,kinow jexl=sebb jxpath=mbenson -lang=bayard,joehni,mbenson,britter,sebb,pbenedict* +lang=bayard,joehni,mbenson,britter,sebb,pbenedict*,ggregory launcher= logging=rwhitcomb* math=psteitz,erans,luc,[sebb] @@ -45,5 +45,5 @@ primitives= proxy=mbenson scxml=ate,woonsan validator= -vfs=joehni,"Bernd Eckenfels",rwhitcomb* +vfs=joehni,"Bernd Eckenfels",rwhitcomb*,ggregory weaver=mbenson
svn commit: r1532526 - /commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/MapFormat.java
Author: jlmonteiro
Date: Tue Oct 15 20:47:51 2013
New Revision: 1532526
URL: http://svn.apache.org/r1532526
Log:
Remove the mantis part, it makes things really bad in the UI
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/MapFormat.java
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/MapFormat.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/MapFormat.java?rev=1532526&r1=1532525&r2=1532526&view=diff
==
---
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/MapFormat.java
(original)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/MapFormat.java
Tue Oct 15 20:47:51 2013
@@ -29,7 +29,7 @@ import java.util.concurrent.CopyOnWriteA
public abstract class MapFormat {
protected static final Collection ATTRIBUTES_ORDERED_LIST =
buildMetricDataHeader();
-private static final DecimalFormat NUMBER_FORMATTER = new
DecimalFormat("###,###,###,##0.00###E0");
+private static final DecimalFormat NUMBER_FORMATTER = new
DecimalFormat("###,###,###,##0.00");
protected static Collection buildMetricDataHeader() {
final Collection list = new CopyOnWriteArrayList();
svn commit: r1532520 - /commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/MapFormat.java
Author: jlmonteiro
Date: Tue Oct 15 20:30:19 2013
New Revision: 1532520
URL: http://svn.apache.org/r1532520
Log:
Better rendering numbers in report plugin
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/MapFormat.java
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/MapFormat.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/MapFormat.java?rev=1532520&r1=1532519&r2=1532520&view=diff
==
---
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/MapFormat.java
(original)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/report/format/MapFormat.java
Tue Oct 15 20:30:19 2013
@@ -21,6 +21,7 @@ import org.apache.commons.monitoring.cou
import org.apache.commons.monitoring.counters.Unit;
import org.apache.commons.monitoring.repositories.Repository;
+import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
@@ -28,6 +29,7 @@ import java.util.concurrent.CopyOnWriteA
public abstract class MapFormat {
protected static final Collection ATTRIBUTES_ORDERED_LIST =
buildMetricDataHeader();
+private static final DecimalFormat NUMBER_FORMATTER = new
DecimalFormat("###,###,###,##0.00###E0");
protected static Collection buildMetricDataHeader() {
final Collection list = new CopyOnWriteArrayList();
@@ -83,7 +85,11 @@ public abstract class MapFormat {
if (md.isTime() && compatible && timeUnit != counterUnit) {
value = timeUnit.convert(value, counterUnit);
}
-line.add(Double.toString(value));
+if (!Double.isNaN(value) && !Double.isInfinite(value)) {
+line.add(NUMBER_FORMATTER.format(value));
+} else {
+line.add(Double.toString(value));
+}
}
}
return data;
svn commit: r1532517 - /commons/trunks-proper/CHALLENGE.txt
Author: psteitz Date: Tue Oct 15 20:23:36 2013 New Revision: 1532517 URL: http://svn.apache.org/r1532517 Log: Added rwhitcomb to logging, csv, vfs. Modified: commons/trunks-proper/CHALLENGE.txt Modified: commons/trunks-proper/CHALLENGE.txt URL: http://svn.apache.org/viewvc/commons/trunks-proper/CHALLENGE.txt?rev=1532517&r1=1532516&r2=1532517&view=diff == --- commons/trunks-proper/CHALLENGE.txt (original) +++ commons/trunks-proper/CHALLENGE.txt Tue Oct 15 20:23:36 2013 @@ -15,7 +15,7 @@ codec=sebb collections=mbenson,britter compress=bodewig,sebb configuration= -csv=adrianc*,britter,sebb +csv=adrianc*,britter,sebb,rwhitcomb* daemon=sebb[partial] dbcp=psteitz dbutils= @@ -35,7 +35,7 @@ jexl=sebb jxpath=mbenson lang=bayard,joehni,mbenson,britter,sebb,pbenedict* launcher= -logging= +logging=rwhitcomb* math=psteitz,erans,luc,[sebb] modeler= net=sebb @@ -45,5 +45,5 @@ primitives= proxy=mbenson scxml=ate,woonsan validator= -vfs=joehni,"Bernd Eckenfels" +vfs=joehni,"Bernd Eckenfels",rwhitcomb* weaver=mbenson
svn commit: r1532500 - in /commons/sandbox/monitoring/trunk: core/src/main/java/org/apache/commons/monitoring/store/BatchCounterDataStore.java graphite/src/test/java/org/apache/commons/monitoring/grap
Author: jlmonteiro
Date: Tue Oct 15 19:39:39 2013
New Revision: 1532500
URL: http://svn.apache.org/r1532500
Log:
Fixing bad scheduling and Graphite test accordingly.
Modified:
commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/store/BatchCounterDataStore.java
commons/sandbox/monitoring/trunk/graphite/src/test/java/org/apache/commons/monitoring/graphite/GraphiteTest.java
Modified:
commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/store/BatchCounterDataStore.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/store/BatchCounterDataStore.java?rev=1532500&r1=1532499&r2=1532500&view=diff
==
---
commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/store/BatchCounterDataStore.java
(original)
+++
commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/store/BatchCounterDataStore.java
Tue Oct 15 19:39:39 2013
@@ -35,8 +35,7 @@ public abstract class BatchCounterDataSt
final long period =
Configuration.getInteger(Configuration.COMMONS_MONITORING_PREFIX + name +
".period", 6);
final ScheduledExecutorService ses =
Executors.newSingleThreadScheduledExecutor(new DaemonThreadFactory(name +
"-schedule-"));
-final ScheduledFuture future = ses.schedule(new
BatchPushCountersTask(), period, TimeUnit.MILLISECONDS);
-ses.shutdown(); // don't add anything more now
+final ScheduledFuture future = ses.scheduleAtFixedRate(new
BatchPushCountersTask(), period, period, TimeUnit.MILLISECONDS);
scheduledTask = new BatchFuture(ses, future);
}
@@ -70,6 +69,7 @@ public abstract class BatchCounterDataSt
public void done() {
try {
+executor.shutdown(); // don't add anything more now
task.cancel(false);
executor.awaitTermination(1, TimeUnit.MINUTES);
if (!task.isDone()) {
Modified:
commons/sandbox/monitoring/trunk/graphite/src/test/java/org/apache/commons/monitoring/graphite/GraphiteTest.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/graphite/src/test/java/org/apache/commons/monitoring/graphite/GraphiteTest.java?rev=1532500&r1=1532499&r2=1532500&view=diff
==
---
commons/sandbox/monitoring/trunk/graphite/src/test/java/org/apache/commons/monitoring/graphite/GraphiteTest.java
(original)
+++
commons/sandbox/monitoring/trunk/graphite/src/test/java/org/apache/commons/monitoring/graphite/GraphiteTest.java
Tue Oct 15 19:39:39 2013
@@ -22,6 +22,7 @@ import org.apache.commons.monitoring.rep
import org.junit.Test;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import static org.junit.Assert.assertEquals;
@@ -53,7 +54,7 @@ public class GraphiteTest extends Graphi
}
{ // counters
-assertEquals(13, counters.size());
+assertEquals(39, counters.size());
assertTrue(counters.contains("counter-performances-test-Hits
2.00"));
assertTrue(counters.contains("counter-performances-test-Max
1.60"));
assertTrue(counters.contains("counter-performances-test-Mean
1.50"));
svn commit: r1532499 - /commons/trunks-proper/CHALLENGE.txt
Author: psteitz Date: Tue Oct 15 19:36:46 2013 New Revision: 1532499 URL: http://svn.apache.org/r1532499 Log: Added pbenedict to lang. Modified: commons/trunks-proper/CHALLENGE.txt Modified: commons/trunks-proper/CHALLENGE.txt URL: http://svn.apache.org/viewvc/commons/trunks-proper/CHALLENGE.txt?rev=1532499&r1=1532498&r2=1532499&view=diff == --- commons/trunks-proper/CHALLENGE.txt (original) +++ commons/trunks-proper/CHALLENGE.txt Tue Oct 15 19:36:46 2013 @@ -33,7 +33,7 @@ jcs= jelly=polx,kinow jexl=sebb jxpath=mbenson -lang=bayard,joehni,mbenson,britter,sebb +lang=bayard,joehni,mbenson,britter,sebb,pbenedict* launcher= logging= math=psteitz,erans,luc,[sebb]
svn commit: r1532491 - in /commons/proper/lang/trunk/src: main/java/org/apache/commons/lang3/BooleanUtils.java test/java/org/apache/commons/lang3/BooleanUtilsTest.java
Author: britter
Date: Tue Oct 15 19:09:31 2013
New Revision: 1532491
URL: http://svn.apache.org/r1532491
Log:
LANG-922 - Add isOneTrue(booleans...) to BooleanUtils to preserve old behavior
of BooleanUtils.xor(booleans...). Added isOneTrue for primitives and wrappers,
isOneFalse still missing.
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/BooleanUtils.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/BooleanUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/BooleanUtils.java?rev=1532491&r1=1532490&r2=1532491&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/BooleanUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/BooleanUtils.java
Tue Oct 15 19:09:31 2013
@@ -141,6 +141,82 @@ public class BooleanUtils {
return !isFalse(bool);
}
+/**
+ * Checks if exactly one of the given booleans is true.
+ *
+ *
+ * BooleanUtils.isOneTrue(true, true) = false
+ * BooleanUtils.isOneTrue(false, false) = false
+ * BooleanUtils.isOneTrue(true, false) = true
+ * BooleanUtils.isOneTrue(true, true) = false
+ * BooleanUtils.isOneTrue(false, false) = false
+ * BooleanUtils.isOneTrue(true, false) = true
+ *
+ *
+ * @param array an array of {@code boolean}s
+ * @return {@code true} if the array containes the value true only once.
+ * @throws IllegalArgumentException if {@code array} is {@code null}
+ * @throws IllegalArgumentException if {@code array} is empty.
+ * @since 3.2
+ */
+public static boolean isOneTrue(final boolean... array) {
+// Validates input
+if (array == null) {
+throw new IllegalArgumentException("The Array must not be null");
+}
+if (array.length == 0) {
+throw new IllegalArgumentException("Array is empty");
+}
+
+// Loops through array, comparing each item
+int trueCount = 0;
+for (final boolean element : array) {
+// If item is true, and trueCount is < 1, increments count
+// Else, isOneTrue fails
+if (element) {
+if (trueCount < 1) {
+trueCount++;
+} else {
+return false;
+}
+}
+}
+
+// Returns true if there was exactly 1 true item
+return trueCount == 1;
+}
+
+/**
+ * Checks if exactly one of the given Booleans is true.
+ *
+ *
+ * BooleanUtils.isOneTrue(new Boolean[] { Boolean.TRUE, Boolean.TRUE })
= Boolean.FALSE
+ * BooleanUtils.isOneTrue(new Boolean[] { Boolean.FALSE, Boolean.FALSE
}) = Boolean.FALSE
+ * BooleanUtils.isOneTrue(new Boolean[] { Boolean.TRUE, Boolean.FALSE })
= Boolean.TRUE
+ *
+ *
+ * @param array an array of {@code Boolean}s
+ * @return {@code true} if the array containes a Boolean with value true
only once.
+ * @throws IllegalArgumentException if {@code array} is {@code null}
+ * @throws IllegalArgumentException if {@code array} is empty.
+ * @throws IllegalArgumentException if {@code array} contains a {@code
null}
+ * @since 3.2
+ */
+public static Boolean isOneTrue(final Boolean... array) {
+if (array == null) {
+throw new IllegalArgumentException("The Array must not be null");
+}
+if (array.length == 0) {
+throw new IllegalArgumentException("Array is empty");
+}
+try {
+final boolean[] primitive = ArrayUtils.toPrimitive(array);
+return isOneTrue(primitive) ? Boolean.TRUE : Boolean.FALSE;
+} catch (final NullPointerException ex) {
+throw new IllegalArgumentException("The array must not contain any
null elements");
+}
+}
+
//---
/**
* Converts a Boolean to a boolean handling {@code null}
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java?rev=1532491&r1=1532490&r2=1532491&view=diff
==
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java
Tue Oct 15 19:09:31 2013
@@ -53,6 +53,189 @@ public class BooleanUtilsTest {
assertSame(Boolean.FALSE, BooleanUtils.negate(Boolean.TRUE));
}
+//
svn commit: r1532476 - in /commons/proper/lang/trunk/src: changes/changes.xml main/java/org/apache/commons/lang3/BooleanUtils.java test/java/org/apache/commons/lang3/BooleanUtilsTest.java
Author: britter
Date: Tue Oct 15 18:31:40 2013
New Revision: 1532476
URL: http://svn.apache.org/r1532476
Log:
LANG-921 - BooleanUtils.xor(boolean...) produces wrong results
Modified:
commons/proper/lang/trunk/src/changes/changes.xml
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/BooleanUtils.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java
Modified: commons/proper/lang/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/changes/changes.xml?rev=1532476&r1=1532475&r2=1532476&view=diff
==
--- commons/proper/lang/trunk/src/changes/changes.xml (original)
+++ commons/proper/lang/trunk/src/changes/changes.xml Tue Oct 15 18:31:40 2013
@@ -22,6 +22,7 @@
+BooleanUtils.xor(boolean...) produces wrong results
StringUtils.normalizeSpace now handles non-breaking spaces (Unicode
00A0)
Redundant check for zero in HashCodeBuilder ctor
StrSubstitutor now supports default values for variables
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/BooleanUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/BooleanUtils.java?rev=1532476&r1=1532475&r2=1532476&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/BooleanUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/BooleanUtils.java
Tue Oct 15 18:31:40 2013
@@ -1028,14 +1028,6 @@ public class BooleanUtils {
* BooleanUtils.xor(true, false) = true
*
*
- * Note that this method behaves different from using the binary XOR
operator (^). Instead of combining the given
- * booleans using the XOR operator from left to right, this method counts
the appearances of true in the given
- * array. It will only return true if exactly one boolean in the given
array is true:
- *
- * true ^ true ^ false ^ true = true
- * BooleanUtils.xor(true, true, false, true) = false
- *
- *
* @param array an array of {@code boolean}s
* @return {@code true} if the xor is successful.
* @throws IllegalArgumentException if {@code array} is {@code null}
@@ -1050,22 +1042,13 @@ public class BooleanUtils {
throw new IllegalArgumentException("Array is empty");
}
-// Loops through array, comparing each item
-int trueCount = 0;
+// false if the neutral element of the xor operator
+boolean result = false;
for (final boolean element : array) {
-// If item is true, and trueCount is < 1, increments count
-// Else, xor fails
-if (element) {
-if (trueCount < 1) {
-trueCount++;
-} else {
-return false;
-}
-}
+result ^= element;
}
-// Returns true if there was exactly 1 true item
-return trueCount == 1;
+return result;
}
/**
@@ -1077,9 +1060,6 @@ public class BooleanUtils {
* BooleanUtils.xor(new Boolean[] { Boolean.TRUE, Boolean.FALSE }) =
Boolean.TRUE
*
*
- * Note that this method behaves different from using the binary XOR
operator (^). See
- * {@link #xor(boolean...)}.
- *
* @param array an array of {@code Boolean}s
* @return {@code true} if the xor is successful.
* @throws IllegalArgumentException if {@code array} is {@code null}
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java?rev=1532476&r1=1532475&r2=1532476&view=diff
==
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java
Tue Oct 15 18:31:40 2013
@@ -446,56 +446,68 @@ public class BooleanUtilsTest {
@Test
public void testXor_primitive_validInput_2items() {
-assertTrue(
-"True result for (true, true)",
-! BooleanUtils.xor(new boolean[] { true, true }));
-
-assertTrue(
-"True result for (false, false)",
-! BooleanUtils.xor(new boolean[] { false, false }));
-
-assertTrue(
-"False result for (true, false)",
+assertEquals(
+"true ^ true",
+true ^ true ,
+BooleanUtils.xor(new boolean[] { true, true }));
+
+assertEquals(
+"false ^ false",
+false ^ false,
+
svn commit: r1532471 - /commons/proper/email/trunk/pom.xml
Author: tn Date: Tue Oct 15 18:22:18 2013 New Revision: 1532471 URL: http://svn.apache.org/r1532471 Log: Prepare for RC1. Modified: commons/proper/email/trunk/pom.xml Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1532471&r1=1532470&r2=1532471&view=diff == --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Tue Oct 15 18:22:18 2013 @@ -280,8 +280,8 @@ email EMAIL 12310474 -1.3.1 -RC3 +1.3.2 +RC1 -bin
svn commit: r1532470 - /commons/proper/email/trunk/conf/checkstyle.xml
Author: tn Date: Tue Oct 15 18:22:00 2013 New Revision: 1532470 URL: http://svn.apache.org/r1532470 Log: Remove DoubleCheckedLocking check as it has been removed since checkstyle 5.6 Modified: commons/proper/email/trunk/conf/checkstyle.xml Modified: commons/proper/email/trunk/conf/checkstyle.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/conf/checkstyle.xml?rev=1532470&r1=1532469&r2=1532470&view=diff == --- commons/proper/email/trunk/conf/checkstyle.xml (original) +++ commons/proper/email/trunk/conf/checkstyle.xml Tue Oct 15 18:22:00 2013 @@ -136,7 +136,6 @@ -
svn commit: r1532460 - /commons/trunks-proper/CHALLENGE.txt
Author: sebb Date: Tue Oct 15 18:05:01 2013 New Revision: 1532460 URL: http://svn.apache.org/r1532460 Log: (empty) Modified: commons/trunks-proper/CHALLENGE.txt Modified: commons/trunks-proper/CHALLENGE.txt URL: http://svn.apache.org/viewvc/commons/trunks-proper/CHALLENGE.txt?rev=1532460&r1=1532459&r2=1532460&view=diff == --- commons/trunks-proper/CHALLENGE.txt (original) +++ commons/trunks-proper/CHALLENGE.txt Tue Oct 15 18:05:01 2013 @@ -11,12 +11,12 @@ betwixt= bsf= chain=britter cli= -codec= +codec=sebb collections=mbenson,britter -compress=bodewig +compress=bodewig,sebb configuration= -csv=adrianc*,britter -daemon= +csv=adrianc*,britter,sebb +daemon=sebb[partial] dbcp=psteitz dbutils= digester= @@ -27,18 +27,18 @@ exec= fileupload= functor=kinow,mbenson imaging= -io=joehni +io=joehni,sebb jci= jcs= jelly=polx,kinow -jexl= +jexl=sebb jxpath=mbenson -lang=bayard,joehni,mbenson,britter +lang=bayard,joehni,mbenson,britter,sebb launcher= logging= -math=psteitz,erans,luc +math=psteitz,erans,luc,[sebb] modeler= -net= +net=sebb ognl= pool=psteitz primitives=
svn commit: r1532459 - in /commons/proper/math/trunk/src: changes/changes.xml main/java/org/apache/commons/math3/stat/descriptive/AbstractUnivariateStatistic.java main/java/org/apache/commons/math3/ut
Author: sebb
Date: Tue Oct 15 17:57:08 2013
New Revision: 1532459
URL: http://svn.apache.org/r1532459
Log:
MATH-1002 AbstractUnivariateStatistic.test(double[] values, int begin, int
length, boolean allowEmpty) has uses outside subclasses
Modified:
commons/proper/math/trunk/src/changes/changes.xml
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/stat/descriptive/AbstractUnivariateStatistic.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/MathArrays.java
Modified: commons/proper/math/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/changes/changes.xml?rev=1532459&r1=1532458&r2=1532459&view=diff
==
--- commons/proper/math/trunk/src/changes/changes.xml (original)
+++ commons/proper/math/trunk/src/changes/changes.xml Tue Oct 15 17:57:08 2013
@@ -51,6 +51,10 @@ If the output is not quite correct, chec
+
+AbstractUnivariateStatistic.test(double[] values, int begin, int
length, boolean allowEmpty)
+has uses outside subclasses; implementation moved to MathArrays.
+
The "KalmanFilter" wrongly enforced a column dimension of 1 for
the provided control and measurement noise matrix.
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/stat/descriptive/AbstractUnivariateStatistic.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/stat/descriptive/AbstractUnivariateStatistic.java?rev=1532459&r1=1532458&r2=1532459&view=diff
==
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/stat/descriptive/AbstractUnivariateStatistic.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/stat/descriptive/AbstractUnivariateStatistic.java
Tue Oct 15 17:57:08 2013
@@ -22,6 +22,7 @@ import org.apache.commons.math3.exceptio
import org.apache.commons.math3.exception.NumberIsTooLargeException;
import org.apache.commons.math3.exception.MathIllegalArgumentException;
import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.util.MathArrays;
/**
* Abstract base class for all implementations of the
@@ -151,12 +152,14 @@ public abstract class AbstractUnivariate
* @param length the number of elements to include
* @return true if the parameters are valid and designate a subarray of
positive length
* @throws MathIllegalArgumentException if the indices are invalid or the
array is null
+ * @deprecated 3.3 Use {@link MathArrays#test(double[], int, int)} instead
*/
+@Deprecated
protected boolean test(
final double[] values,
final int begin,
final int length) throws MathIllegalArgumentException {
-return test(values, begin, length, false);
+return MathArrays.test(values, begin, length, false);
}
/**
@@ -179,33 +182,12 @@ public abstract class AbstractUnivariate
* @return true if the parameters are valid
* @throws MathIllegalArgumentException if the indices are invalid or the
array is null
* @since 3.0
+ * @deprecated 3.3 Use {@link MathArrays#test(double[], int, int,
boolean)} instead
*/
+@Deprecated
protected boolean test(final double[] values, final int begin,
final int length, final boolean allowEmpty) throws
MathIllegalArgumentException {
-
-if (values == null) {
-throw new NullArgumentException(LocalizedFormats.INPUT_ARRAY);
-}
-
-if (begin < 0) {
-throw new NotPositiveException(LocalizedFormats.START_POSITION,
begin);
-}
-
-if (length < 0) {
-throw new NotPositiveException(LocalizedFormats.LENGTH, length);
-}
-
-if (begin + length > values.length) {
-throw new
NumberIsTooLargeException(LocalizedFormats.SUBARRAY_ENDS_AFTER_ARRAY_END,
-begin + length, values.length,
true);
-}
-
-if (length == 0 && !allowEmpty) {
-return false;
-}
-
-return true;
-
+return MathArrays.test(values, begin, length, allowEmpty);
}
/**
@@ -236,13 +218,15 @@ public abstract class AbstractUnivariate
* @return true if the parameters are valid and designate a subarray of
positive length
* @throws MathIllegalArgumentException if the indices are invalid or the
array is null
* @since 2.1
+ * @deprecated 3.3 Use {@link MathArrays#test(double[], double[], int,
int)} instead
*/
+@Deprecated
protected boolean test(
final double[] values,
final double[] weights,
final int begin,
final int length) throws MathIllegalArgumentException {
-return test(valu
svn commit: r3272 - in /dev/commons/compress: binaries/ source/
Author: bodewig Date: Tue Oct 15 17:53:02 2013 New Revision: 3272 Log: Commons Compress 1.6 RC2 Modified: dev/commons/compress/binaries/commons-compress-1.6-bin.tar.gz dev/commons/compress/binaries/commons-compress-1.6-bin.tar.gz.asc dev/commons/compress/binaries/commons-compress-1.6-bin.tar.gz.md5 dev/commons/compress/binaries/commons-compress-1.6-bin.tar.gz.sha1 dev/commons/compress/binaries/commons-compress-1.6-bin.zip dev/commons/compress/binaries/commons-compress-1.6-bin.zip.asc dev/commons/compress/binaries/commons-compress-1.6-bin.zip.md5 dev/commons/compress/binaries/commons-compress-1.6-bin.zip.sha1 dev/commons/compress/source/commons-compress-1.6-src.tar.gz dev/commons/compress/source/commons-compress-1.6-src.tar.gz.asc dev/commons/compress/source/commons-compress-1.6-src.tar.gz.md5 dev/commons/compress/source/commons-compress-1.6-src.tar.gz.sha1 dev/commons/compress/source/commons-compress-1.6-src.zip dev/commons/compress/source/commons-compress-1.6-src.zip.asc dev/commons/compress/source/commons-compress-1.6-src.zip.md5 dev/commons/compress/source/commons-compress-1.6-src.zip.sha1 Modified: dev/commons/compress/binaries/commons-compress-1.6-bin.tar.gz == Binary files - no diff available. Modified: dev/commons/compress/binaries/commons-compress-1.6-bin.tar.gz.asc == --- dev/commons/compress/binaries/commons-compress-1.6-bin.tar.gz.asc (original) +++ dev/commons/compress/binaries/commons-compress-1.6-bin.tar.gz.asc Tue Oct 15 17:53:02 2013 @@ -1,7 +1,7 @@ -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) -iEYEABECAAYFAlJaKO4ACgkQohFa4V9ri3KECQCfZE1PzMOUoZGxng7E2qhilvNM -5xAAoKTHPLAkQSrKyE+XxIlAiKrcrsOv -=BThx +iEYEABECAAYFAlJde7gACgkQohFa4V9ri3KJZwCffvtvhMw3hR+BJA+PMFFupotT +FnQAnRcn39OM1fooHxD6nk7hdxAStrw4 +=i82q -END PGP SIGNATURE- Modified: dev/commons/compress/binaries/commons-compress-1.6-bin.tar.gz.md5 == --- dev/commons/compress/binaries/commons-compress-1.6-bin.tar.gz.md5 (original) +++ dev/commons/compress/binaries/commons-compress-1.6-bin.tar.gz.md5 Tue Oct 15 17:53:02 2013 @@ -1 +1 @@ -850d5bda0803c5a0452c0c6a4bc55a3e \ No newline at end of file +a5224d1e005364c6fe13cc1d0838b66e \ No newline at end of file Modified: dev/commons/compress/binaries/commons-compress-1.6-bin.tar.gz.sha1 == --- dev/commons/compress/binaries/commons-compress-1.6-bin.tar.gz.sha1 (original) +++ dev/commons/compress/binaries/commons-compress-1.6-bin.tar.gz.sha1 Tue Oct 15 17:53:02 2013 @@ -1 +1 @@ -9f94d3374ec07c9edbab62d2f3dae45938582a8f \ No newline at end of file +f8536b352e551959439dd9d67ef722c345f1cbfe \ No newline at end of file Modified: dev/commons/compress/binaries/commons-compress-1.6-bin.zip == Binary files - no diff available. Modified: dev/commons/compress/binaries/commons-compress-1.6-bin.zip.asc == --- dev/commons/compress/binaries/commons-compress-1.6-bin.zip.asc (original) +++ dev/commons/compress/binaries/commons-compress-1.6-bin.zip.asc Tue Oct 15 17:53:02 2013 @@ -1,7 +1,7 @@ -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) -iEYEABECAAYFAlJaKO4ACgkQohFa4V9ri3IbGQCeOeIuzNVlTj2Skk/Ea/Jq61ji -fCMAnjq17rVyVMiYJwS5Q/SDt/Lo12WW -=05nz +iEYEABECAAYFAlJde7gACgkQohFa4V9ri3Jr/gCeOt/+G6WQb4JYcwpm7GR7XXwv +Z6gAniNnI06Xm6zxrTfF5oTpsHmEb7Hq +=Q+w0 -END PGP SIGNATURE- Modified: dev/commons/compress/binaries/commons-compress-1.6-bin.zip.md5 == --- dev/commons/compress/binaries/commons-compress-1.6-bin.zip.md5 (original) +++ dev/commons/compress/binaries/commons-compress-1.6-bin.zip.md5 Tue Oct 15 17:53:02 2013 @@ -1 +1 @@ -4a9019b99f976da7ee10ecc99ca42add \ No newline at end of file +41cd266ab1d8d388753a2e711d2d5b33 \ No newline at end of file Modified: dev/commons/compress/binaries/commons-compress-1.6-bin.zip.sha1 == --- dev/commons/compress/binaries/commons-compress-1.6-bin.zip.sha1 (original) +++ dev/commons/compress/binaries/commons-compress-1.6-bin.zip.sha1 Tue Oct 15 17:53:02 2013 @@ -1 +1 @@ -2d8f332e7e73f1b88e0d08bfd7594c4900fcb751 \ No newline at end of file +67b5e583364271c0ed364a619d08edbcebdc2c2d \ No newline at end of file Modified: dev/commons/compress/source/commons-compress-1.6-src.tar.gz == Binary files - no diff available. Modified: dev/commons/compress/source/commons-compress-1.6-
Nexus: Staging Completed.
Description:Commons Compress 1.6 RC2Details:The following artifacts have been staged to the org.apache.commons-178 (u:bodewig, a:80.137.145.94) repository.archetype-catalog.xmlcommons-compress-1.6.jar.asccommons-compress-1.6-javadoc.jarcommons-compress-1.6-tests.jar.asccommons-compress-1.6-sources.jarcommons-compress-1.6-test-sources.jarcommons-compress-1.6-javadoc.jar.asccommons-compress-1.6.pom.asccommons-compress-1.6-test-sources.jar.asccommons-compress-1.6.jarcommons-compress-1.6-sources.jar.asccommons-compress-1.6-tests.jarcommons-compress-1.6.pom
svn commit: r1532449 - in /commons/proper/compress/tags/COMPRESS-1.6-RC2: ./ pom.xml src/site/xdoc/index.xml
Author: bodewig Date: Tue Oct 15 17:21:29 2013 New Revision: 1532449 URL: http://svn.apache.org/r1532449 Log: Creating COMPRESS-1.6-RC2 tag Added: commons/proper/compress/tags/COMPRESS-1.6-RC2/ (props changed) - copied from r1532446, commons/proper/compress/trunk/ Modified: commons/proper/compress/tags/COMPRESS-1.6-RC2/pom.xml commons/proper/compress/tags/COMPRESS-1.6-RC2/src/site/xdoc/index.xml Propchange: commons/proper/compress/tags/COMPRESS-1.6-RC2/ -- --- subclipse:tags (added) +++ subclipse:tags Tue Oct 15 17:21:29 2013 @@ -0,0 +1,2 @@ +1152546,COMPRESS_1.2,/commons/proper/compress/tags/COMPRESS_1.2,tag +1196226,COMPRESS_1.3,/commons/proper/compress/tags/COMPRESS_1.3,tag Propchange: commons/proper/compress/tags/COMPRESS-1.6-RC2/ -- --- svn:ignore (added) +++ svn:ignore Tue Oct 15 17:21:29 2013 @@ -0,0 +1,7 @@ +target +*.iml +*.ipr +*.iws +.* +maven-eclipse.xml +TAGS Propchange: commons/proper/compress/tags/COMPRESS-1.6-RC2/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Oct 15 17:21:29 2013 @@ -0,0 +1,2 @@ +/commons/proper/compress/branches/LZMA:1491183-1525352 +/commons/proper/compress/branches/zip64:1149597-1152684 Modified: commons/proper/compress/tags/COMPRESS-1.6-RC2/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/compress/tags/COMPRESS-1.6-RC2/pom.xml?rev=1532449&r1=1532446&r2=1532449&view=diff == --- commons/proper/compress/tags/COMPRESS-1.6-RC2/pom.xml (original) +++ commons/proper/compress/tags/COMPRESS-1.6-RC2/pom.xml Tue Oct 15 17:21:29 2013 @@ -25,7 +25,7 @@ org.apache.commons commons-compress - 1.6-SNAPSHOT + 1.6 Commons Compress http://commons.apache.org/proper/commons-compress/ Modified: commons/proper/compress/tags/COMPRESS-1.6-RC2/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/commons/proper/compress/tags/COMPRESS-1.6-RC2/src/site/xdoc/index.xml?rev=1532449&r1=1532446&r2=1532449&view=diff == --- commons/proper/compress/tags/COMPRESS-1.6-RC2/src/site/xdoc/index.xml (original) +++ commons/proper/compress/tags/COMPRESS-1.6-RC2/src/site/xdoc/index.xml Tue Oct 15 17:21:29 2013 @@ -51,17 +51,13 @@ - The current release is 1.5 and requires Java 5. + The current release is 1.6 and requires Java 5. Below we highlight some new features, for a full list of changes see the Changes Report. - -The 1.5 release is a bug-fix release with important -fixes to the tar and zip packages. - - + Support for the 7z format. Read-only support for uncompressed ARJ @@ -70,6 +66,7 @@ format. +
svn commit: r1532448 - /commons/trunks-proper/CHALLENGE.txt
Author: britter Date: Tue Oct 15 17:19:58 2013 New Revision: 1532448 URL: http://svn.apache.org/r1532448 Log: Document the components I'm working on Modified: commons/trunks-proper/CHALLENGE.txt Modified: commons/trunks-proper/CHALLENGE.txt URL: http://svn.apache.org/viewvc/commons/trunks-proper/CHALLENGE.txt?rev=1532448&r1=1532447&r2=1532448&view=diff == --- commons/trunks-proper/CHALLENGE.txt (original) +++ commons/trunks-proper/CHALLENGE.txt Tue Oct 15 17:19:58 2013 @@ -6,16 +6,16 @@ # PROJECT=login,login attributes= bcel= -beanutils= +beanutils=britter betwixt= bsf= -chain= +chain=britter cli= codec= -collections=mbenson +collections=mbenson,britter compress=bodewig configuration= -csv=adrianc* +csv=adrianc*,britter daemon= dbcp=psteitz dbutils= @@ -33,7 +33,7 @@ jcs= jelly=polx,kinow jexl= jxpath=mbenson -lang=bayard,joehni,mbenson +lang=bayard,joehni,mbenson,britter launcher= logging= math=psteitz,erans,luc
svn commit: r1532430 - /commons/trunks-proper/CHALLENGE.txt
Author: psteitz Date: Tue Oct 15 17:00:56 2013 New Revision: 1532430 URL: http://svn.apache.org/r1532430 Log: Added Bernd Eckenfels and conventions for representing people who are not Commons committers. Modified: commons/trunks-proper/CHALLENGE.txt Modified: commons/trunks-proper/CHALLENGE.txt URL: http://svn.apache.org/viewvc/commons/trunks-proper/CHALLENGE.txt?rev=1532430&r1=1532429&r2=1532430&view=diff == --- commons/trunks-proper/CHALLENGE.txt (original) +++ commons/trunks-proper/CHALLENGE.txt Tue Oct 15 17:00:56 2013 @@ -1,6 +1,7 @@ # This is a baseline dormancy challenge. Please put your id next to any component # you plan to actively maintain (you monitor commits, JIRA, mail, and develop code for that component). +# ASF commiters who are not commons committers end with *, non-ASF committers have names in quotes. # PROJECT=login,login attributes= @@ -14,7 +15,7 @@ codec= collections=mbenson compress=bodewig configuration= -csv=adrianc +csv=adrianc* daemon= dbcp=psteitz dbutils= @@ -44,5 +45,5 @@ primitives= proxy=mbenson scxml=ate,woonsan validator= -vfs=joehni +vfs=joehni,"Bernd Eckenfels" weaver=mbenson
svn commit: r1532422 - /commons/trunks-proper/CHALLENGE.txt
Author: luc Date: Tue Oct 15 16:43:06 2013 New Revision: 1532422 URL: http://svn.apache.org/r1532422 Log: trying to do some work... Modified: commons/trunks-proper/CHALLENGE.txt Modified: commons/trunks-proper/CHALLENGE.txt URL: http://svn.apache.org/viewvc/commons/trunks-proper/CHALLENGE.txt?rev=1532422&r1=1532421&r2=1532422&view=diff == --- commons/trunks-proper/CHALLENGE.txt (original) +++ commons/trunks-proper/CHALLENGE.txt Tue Oct 15 16:43:06 2013 @@ -35,7 +35,7 @@ jxpath=mbenson lang=bayard,joehni,mbenson launcher= logging= -math=psteitz,erans +math=psteitz,erans,luc modeler= net= ognl=
svn commit: r1532386 - /commons/proper/scxml/trunk/pom.xml
Author: woonsan Date: Tue Oct 15 15:28:55 2013 New Revision: 1532386 URL: http://svn.apache.org/r1532386 Log: adding myself as developer Modified: commons/proper/scxml/trunk/pom.xml Modified: commons/proper/scxml/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/pom.xml?rev=1532386&r1=1532385&r2=1532386&view=diff == --- commons/proper/scxml/trunk/pom.xml (original) +++ commons/proper/scxml/trunk/pom.xml Tue Oct 15 15:28:55 2013 @@ -62,6 +62,12 @@ ate AT douma.nu Hippo B.V. + + Woonsan Ko + woonsan + woonsan AT apache.org + The Apache Software Foundation +
svn commit: r1532385 - /commons/trunks-proper/CHALLENGE.txt
Author: woonsan Date: Tue Oct 15 15:21:33 2013 New Revision: 1532385 URL: http://svn.apache.org/r1532385 Log: active on scxml subproject Modified: commons/trunks-proper/CHALLENGE.txt Modified: commons/trunks-proper/CHALLENGE.txt URL: http://svn.apache.org/viewvc/commons/trunks-proper/CHALLENGE.txt?rev=1532385&r1=1532384&r2=1532385&view=diff == --- commons/trunks-proper/CHALLENGE.txt (original) +++ commons/trunks-proper/CHALLENGE.txt Tue Oct 15 15:21:33 2013 @@ -42,7 +42,7 @@ ognl= pool=psteitz primitives= proxy=mbenson -scxml=ate +scxml=ate,woonsan validator= vfs=joehni weaver=mbenson
svn commit: r1532375 [4/4] - in /commons/proper/scxml/trunk: ./ src/main/java/org/apache/commons/scxml/ src/main/java/org/apache/commons/scxml2/ src/main/java/org/apache/commons/scxml2/env/ src/main/j
Modified:
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/RhinoEvaluatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/RhinoEvaluatorTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==
---
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/RhinoEvaluatorTest.java
(original)
+++
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/RhinoEvaluatorTest.java
Tue Oct 15 14:59:18 2013
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.scxml.env.rhino;
+package org.apache.commons.scxml2.env.rhino;
import junit.framework.TestCase;
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.SCXMLExpressionException;
+import org.apache.commons.scxml2.Context;
+import org.apache.commons.scxml2.Evaluator;
+import org.apache.commons.scxml2.SCXMLExpressionException;
public class RhinoEvaluatorTest extends TestCase {
Modified:
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/RhinoExampleTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/RhinoExampleTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==
---
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/RhinoExampleTest.java
(original)
+++
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/rhino/RhinoExampleTest.java
Tue Oct 15 14:59:18 2013
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.scxml.env.rhino;
+package org.apache.commons.scxml2.env.rhino;
import java.net.URL;
import java.util.Set;
import junit.framework.TestCase;
-import org.apache.commons.scxml.SCXMLExecutor;
-import org.apache.commons.scxml.SCXMLTestHelper;
-import org.apache.commons.scxml.model.State;
-import org.apache.commons.scxml.model.TransitionTarget;
+import org.apache.commons.scxml2.SCXMLExecutor;
+import org.apache.commons.scxml2.SCXMLTestHelper;
+import org.apache.commons.scxml2.model.State;
+import org.apache.commons.scxml2.model.TransitionTarget;
public class RhinoExampleTest extends TestCase {
@@ -39,7 +39,7 @@ public class RhinoExampleTest extends Te
@Override
protected void setUp() throws Exception {
example01 = this.getClass().getClassLoader().
-getResource("org/apache/commons/scxml/env/rhino/example-01.xml");
+getResource("org/apache/commons/scxml2/env/rhino/example-01.xml");
}
@Override
Modified:
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/servlet/ServletContextResolverTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/servlet/ServletContextResolverTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==
---
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/servlet/ServletContextResolverTest.java
(original)
+++
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/servlet/ServletContextResolverTest.java
Tue Oct 15 14:59:18 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.scxml.env.servlet;
+package org.apache.commons.scxml2.env.servlet;
import junit.framework.TestCase;
Modified:
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/xpath/XPathExampleTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/xpath/XPathExampleTest.java?rev=1532375&r1=1532061&r2=1532375&view=diff
==
---
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/xpath/XPathExampleTest.java
(original)
+++
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/env/xpath/XPathExampleTest.java
Tue Oct 15 14:59:18 2013
@@ -15,21 +15,21 @@
* limitations under the License.
*/
-package org.apache.commons.scxml.env.xpath;
+package org.apache.commons.scxml2.env.xpath;
import java.net.URL;
import java.util.Set;
import junit.framework.TestCase;
-import org.apache.commons.scxml.Context;
-import org.apache.commons.scxml.Evaluator;
-import org.apache.commons.scxml.SCXMLExecutor;
-import org.apache.commons.scxml.SCXMLTestHelper;
-import org.apache.commons.scxml.TriggerEvent;
-import org.apache.
svn commit: r1532346 - /commons/trunks-proper/CHALLENGE.txt
Author: mbenson Date: Tue Oct 15 14:14:56 2013 New Revision: 1532346 URL: http://svn.apache.org/r1532346 Log: register Modified: commons/trunks-proper/CHALLENGE.txt Modified: commons/trunks-proper/CHALLENGE.txt URL: http://svn.apache.org/viewvc/commons/trunks-proper/CHALLENGE.txt?rev=1532346&r1=1532345&r2=1532346&view=diff == --- commons/trunks-proper/CHALLENGE.txt (original) +++ commons/trunks-proper/CHALLENGE.txt Tue Oct 15 14:14:56 2013 @@ -11,7 +11,7 @@ bsf= chain= cli= codec= -collections= +collections=mbenson compress=bodewig configuration= csv=adrianc @@ -24,15 +24,15 @@ el= email= exec= fileupload= -functor=kinow +functor=kinow,mbenson imaging= io=joehni jci= jcs= jelly=polx,kinow jexl= -jxpath= -lang=bayard,joehni +jxpath=mbenson +lang=bayard,joehni,mbenson launcher= logging= math=psteitz,erans @@ -41,8 +41,8 @@ net= ognl= pool=psteitz primitives= -proxy= +proxy=mbenson scxml=ate validator= vfs=joehni -weaver= +weaver=mbenson
svn commit: r1532299 - in /commons/sandbox/monitoring/trunk: core/src/main/java/org/apache/commons/monitoring/configuration/ src/site/markdown/ web/src/main/java/org/apache/commons/monitoring/web/regi
Author: rmannibucau
Date: Tue Oct 15 11:59:55 2013
New Revision: 1532299
URL: http://svn.apache.org/r1532299
Log:
doc config + allowing to monitor multiple urls
Modified:
commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/configuration/Configuration.java
commons/sandbox/monitoring/trunk/src/site/markdown/configuration.md
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/registration/WebMonitoringInitializer.java
Modified:
commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/configuration/Configuration.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/configuration/Configuration.java?rev=1532299&r1=1532298&r2=1532299&view=diff
==
---
commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/configuration/Configuration.java
(original)
+++
commons/sandbox/monitoring/trunk/core/src/main/java/org/apache/commons/monitoring/configuration/Configuration.java
Tue Oct 15 11:59:55 2013
@@ -42,10 +42,11 @@ import java.util.logging.Logger;
public final class Configuration {
private static final Logger LOGGER =
Logger.getLogger(Configuration.class.getName());
+public static final String COMMONS_MONITORING_PREFIX =
"org.apache.commons.monitoring.";
+
private static final Map, Object> SINGLETONS = new
ConcurrentHashMap, Object>();
private static final Collection INSTANCES = new
ArrayList();
-public static final String COMMONS_MONITORING_PREFIX =
"org.apache.commons.monitoring.";
private static final String DEFAULT_CONFIGURATION_FILE =
"commons-monitoring.properties";
private static Thread shutdownHook = null;
Modified: commons/sandbox/monitoring/trunk/src/site/markdown/configuration.md
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/site/markdown/configuration.md?rev=1532299&r1=1532298&r2=1532299&view=diff
==
--- commons/sandbox/monitoring/trunk/src/site/markdown/configuration.md
(original)
+++ commons/sandbox/monitoring/trunk/src/site/markdown/configuration.md Tue Oct
15 11:59:55 2013
@@ -38,15 +38,37 @@ you'll need to either configure the `jav
`org.apache.commons.monitoring.web.lifecycle.CommonsMonitoringLifecycle` from
reporting module
or to call manually `Configuration.shutdown()` method.
-### Main configuration keys
+### Main configuration keys (by module)
+ Core
+
+* org.apache.commons.monitoring.configuration: the configuration file path if
not using the default
* org.apache.commons.monitoring.shutdown.hook: boolean, true by default.
Should be set to false when deploying commons-monitoring-core in an application
(see Utilities part).
-* [plugin name].activated: boolean, true by default. Should the plugin
referenced by [plugin.name] be used.
-* org.apache.commons.monitoring.jmx.method.allowed: boolean, true by default.
Are JMX method invocation allowed.
* org.apache.commons.monitoring.gauge.max-size: int, 100 by default. Number of
gauge measures to keep in memory when not persistent.
* org.apache.commons.monitoring.gauge.memory.period: int, 4000 (ms) by
default. Period for memory gauge.
* org.apache.commons.monitoring.gauge.cpu.period: int, 4000 (ms) by default.
Period for CPU gauge.
-* org.apache.commons.monitoring.gauge.csv.separator: char, ';' by default. CSV
separator for CSV report.
-* org.apache.commons.proxy.ProxyFactory: qualified class name. ProxyFactory to
use for client aop.
* org.apache.commons.monitoring.store.DataStore: qualified class name, default
`org.apache.commons.monitoring.store.DefaultDataStore`. DataStore to use.
* org.apache.commons.monitoring.repositories.Repository: qualified class name,
default `org.apache.commons.monitoring.repositories.DefaultRepository`.
Repository to use.
+* org.apache.commons.monitoring..period: the period to use to flush
counters for a batch data store (like graphite one)
+
+ Reporting
+
+* org.apache.commons.proxy.ProxyFactory: qualified class name. ProxyFactory to
use for client aop.
+* [plugin name].activated: boolean, true by default. Should the plugin
referenced by [plugin.name] be used.
+* org.apache.commons.monitoring.jmx.method.allowed: boolean, true by default.
Are JMX method invocation allowed.
+* org.apache.commons.monitoring.gauge.csv.separator: char, ';' by default. CSV
separator for CSV report.
+* org.apache.commons.monitoring.gauge.jta.period: jta gauge period
+* org.apache.commons.monitoring.gauge.memory.period: memory gauge period
+* org.apache.commons.monitoring.gauge.cpu.period: cpu gauge period
+* org.apache.commons.monitoring.reporting.activated: if auto deployment of
reporting module is activated
+* org.apache.commons.monitoring.reporting.mapping: the mapping of monitoring
GUI
svn commit: r1532294 - in /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress: archivers/sevenz/SevenZFile.java compressors/lzma/LZMACompressorInputStream.java
Author: bodewig
Date: Tue Oct 15 11:53:16 2013
New Revision: 1532294
URL: http://svn.apache.org/r1532294
Log:
cosmetic improvements
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java?rev=1532294&r1=1532293&r2=1532294&view=diff
==
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
Tue Oct 15 11:53:16 2013
@@ -63,6 +63,9 @@ import org.apache.commons.compress.utils
*/
public class SevenZFile {
static final int SIGNATURE_HEADER_SIZE = 32;
+
+private static final int DRAIN_BUF_SIZE = 64 * 1024;
+
private RandomAccessFile file;
private final Archive archive;
private int currentEntryIndex = -1;
@@ -181,6 +184,7 @@ public class SevenZFile {
}
if (nid == NID.kHeader) {
readHeader(nextHeaderInputStream, archive);
+nextHeaderInputStream.close();
} else {
throw new IOException("Broken or unsupported archive: no Header");
}
@@ -815,7 +819,7 @@ public class SevenZFile {
private void drainPreviousEntry() throws IOException {
if (currentEntryInputStream != null) {
-final byte[] buffer = new byte[64*1024];
+final byte[] buffer = new byte[DRAIN_BUF_SIZE];
while (currentEntryInputStream.read(buffer) >= 0) { // NOPMD
}
currentEntryInputStream.close();
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java?rev=1532294&r1=1532293&r2=1532294&view=diff
==
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java
Tue Oct 15 11:53:16 2013
@@ -52,7 +52,7 @@ public class LZMACompressorInputStream e
@Override
public int read() throws IOException {
int ret = in.read();
-count(ret == -1 ? -1 : 1);
+count(ret == -1 ? 0 : 1);
return ret;
}
svn commit: r1532292 - in /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers: arj/ArjArchiveInputStream.java sevenz/Coders.java sevenz/SevenZFile.java
Author: bodewig
Date: Tue Oct 15 11:49:44 2013
New Revision: 1532292
URL: http://svn.apache.org/r1532292
Log:
remove debug logging
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java?rev=1532292&r1=1532291&r2=1532292&view=diff
==
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStream.java
Tue Oct 15 11:49:44 2013
@@ -39,7 +39,6 @@ import org.apache.commons.compress.utils
* @since 1.6
*/
public class ArjArchiveInputStream extends ArchiveInputStream {
-private static final boolean DEBUG = false;
private static final int ARJ_MAGIC_1 = 0x60;
private static final int ARJ_MAGIC_2 = 0xEA;
private final DataInputStream in;
@@ -88,10 +87,6 @@ public class ArjArchiveInputStream exten
in.close();
}
-private static void debug(final String message) {
-System.out.println(message);
-}
-
private int read8(final DataInputStream in) throws IOException {
int value = in.readUnsignedByte();
count(1);
@@ -212,10 +207,6 @@ public class ArjArchiveInputStream exten
}
}
-if (DEBUG) {
-debug(mainHeader.toString());
-}
-
return mainHeader;
}
@@ -271,10 +262,6 @@ public class ArjArchiveInputStream exten
}
localFileHeader.extendedHeaders = extendedHeaders.toArray(new
byte[extendedHeaders.size()][]);
-if (DEBUG) {
-debug(localFileHeader.toString());
-}
-
return localFileHeader;
}
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java?rev=1532292&r1=1532291&r2=1532292&view=diff
==
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
Tue Oct 15 11:49:44 2013
@@ -161,7 +161,6 @@ class Coders {
final int byte1 = 0xff & coder.properties[1];
final int ivSize = ((byte0 >> 6) & 1) + (byte1 & 0x0f);
final int saltSize = ((byte0 >> 7) & 1) + (byte1 >> 4);
-//debug("numCyclesPower=" + numCyclesPower + ", saltSize="
+ saltSize + ", ivSize=" + ivSize);
if (2 + saltSize + ivSize > coder.properties.length) {
throw new IOException("Salt size + IV size too long");
}
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java?rev=1532292&r1=1532291&r2=1532292&view=diff
==
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
Tue Oct 15 11:49:44 2013
@@ -62,7 +62,6 @@ import org.apache.commons.compress.utils
* @since 1.6
*/
public class SevenZFile {
-private static final boolean DEBUG = false;
static final int SIGNATURE_HEADER_SIZE = 32;
private RandomAccessFile file;
private final Archive archive;
@@ -121,18 +120,6 @@ public class SevenZFile {
}
}
-private static void debug(String str) {
-if (DEBUG) {
-System.out.println(str);
-}
-}
-
-private static void debug(String fmt, Object... args) {
-if (DEBUG) {
-System.out.format(fmt, args);
-}
-}
-
/**
* Returns the next Archive Entry in this archive.
*
@@ -151,8 +138,6 @@ public class SevenZFile {
}
private Archive readHeaders(byte[] password) throws IOException {
-
svn commit: r1532290 - /commons/trunks-proper/CHALLENGE.txt
Author: kinow Date: Tue Oct 15 11:20:29 2013 New Revision: 1532290 URL: http://svn.apache.org/r1532290 Log: (empty) Modified: commons/trunks-proper/CHALLENGE.txt Modified: commons/trunks-proper/CHALLENGE.txt URL: http://svn.apache.org/viewvc/commons/trunks-proper/CHALLENGE.txt?rev=1532290&r1=1532289&r2=1532290&view=diff == --- commons/trunks-proper/CHALLENGE.txt (original) +++ commons/trunks-proper/CHALLENGE.txt Tue Oct 15 11:20:29 2013 @@ -24,12 +24,12 @@ el= email= exec= fileupload= -functor= +functor=kinow imaging= io=joehni jci= jcs= -jelly=polx +jelly=polx,kinow jexl= jxpath= lang=bayard,joehni
svn commit: r1532283 - in /commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl: AbandonedConfig.java BaseGenericObjectPool.java BaseObjectPoolConfig.java
Author: markt
Date: Tue Oct 15 10:51:19 2013
New Revision: 1532283
URL: http://svn.apache.org/r1532283
Log:
Fix some more checkstyle warnings
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java?rev=1532283&r1=1532282&r2=1532283&view=diff
==
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java
Tue Oct 15 10:51:19 2013
@@ -208,6 +208,8 @@ public class AbandonedConfig {
* If the pool implements {@link UsageTracking}, should the pool record a
* stack trace every time a method is called on a pooled object and retain
* the most recent stack trace to aid debugging of abandoned objects?
+ *
+ * @return true if usage tracking is enabled
*/
public boolean getUseUsageTracking() {
return useUsageTracking;
@@ -218,6 +220,10 @@ public class AbandonedConfig {
* should record a stack trace every time a method is called on a pooled
* object and retain the most recent stack trace to aid debugging of
* abandoned objects.
+ *
+ * @param useUsageTrackingA value of true will enable
+ * the recording of a stack trace on every use
+ * of a pooled object
*/
public void setUseUsageTracking(boolean useUsageTracking) {
this.useUsageTracking = useUsageTracking;
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java?rev=1532283&r1=1532282&r2=1532283&view=diff
==
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
Tue Oct 15 10:51:19 2013
@@ -764,6 +764,8 @@ public abstract class BaseGenericObjectP
/**
* The listener used (if any) to receive notifications of exceptions
* unavoidably swallowed by the pool.
+ *
+ * @return The listener or null for no listener
*/
public SwallowedExceptionListener getSwallowedExceptionListener() {
return swallowedExceptionListener;
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java?rev=1532283&r1=1532282&r2=1532283&view=diff
==
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
Tue Oct 15 10:51:19 2013
@@ -163,6 +163,10 @@ public abstract class BaseObjectPoolConf
/**
* Get the value for the {@code lifo} configuration attribute for pools
* created with this configuration instance.
+ *
+ * @return The current setting of {@code lifo} for this configuration
+ * instance
+ *
* @see GenericObjectPool#getLifo()
* @see GenericKeyedObjectPool#getLifo()
*/
@@ -183,6 +187,10 @@ public abstract class BaseObjectPoolConf
/**
* Get the value for the {@code maxWait} configuration attribute for pools
* created with this configuration instance.
+ *
+ * @return The current setting of {@code maxWait} for this
+ * configuration instance
+ *
* @see GenericObjectPool#getMaxWaitMillis()
* @see GenericKeyedObjectPool#getMaxWaitMillis()
*/
@@ -203,6 +211,10 @@ public abstract class BaseObjectPoolConf
/**
* Get the value for the {@code minEvictableIdleTimeMillis} configuration
* attribute for pools created with this configuration instance.
+ *
+ * @return The current setting of {@code minEvictableIdleTimeMillis} for
+ * this configuration instance
+ *
* @see GenericObjectPool#getMinEvictableIdleTimeMillis()
* @see GenericKeyedObjectPool#getMinEvictableIdleTimeMillis()
*/
@@ -224,6 +236,10 @@ public abstract c
svn commit: r1532278 - in /commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2: PooledObject.java SwallowedExceptionListener.java UsageTracking.java
Author: markt
Date: Tue Oct 15 10:38:12 2013
New Revision: 1532278
URL: http://svn.apache.org/r1532278
Log:
Fix some more checkstyle warnings
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PooledObject.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/SwallowedExceptionListener.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/UsageTracking.java
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PooledObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PooledObject.java?rev=1532278&r1=1532277&r2=1532278&view=diff
==
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PooledObject.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PooledObject.java
Tue Oct 15 10:38:12 2013
@@ -119,8 +119,24 @@ public interface PooledObject extends
@Override
String toString();
+/**
+ * Attempt to place the pooled object in the
+ * {@link PooledObjectState#EVICTION} state.
+ *
+ * @return true if the object was placed in the
+ * {@link PooledObjectState#EVICTION} state otherwise
+ * false
+ */
boolean startEvictionTest();
+/**
+ * Called to inform the object that the eviction test has ended.
+ *
+ * @param idleQueue The queue if idle objects to which the object should be
+ * returned
+ *
+ * @return Currently not used
+ */
boolean endEvictionTest(Deque> idleQueue);
/**
@@ -147,6 +163,9 @@ public interface PooledObject extends
* Is abandoned object tracking being used? If this is true the
* implementation will need to record the stack trace of the last caller to
* borrow this object.
+ *
+ * @param logAbandonedThe new configuration setting for abandoned
+ * object tracking
*/
void setLogAbandoned(boolean logAbandoned);
@@ -159,6 +178,8 @@ public interface PooledObject extends
* Prints the stack trace of the code that borrowed this pooled object and
* the stack trace of the last code to use this object (if available) to
* the supplied writer.
+ *
+ * @param writer The destination for the debug output
*/
void printStackTrace(PrintWriter writer);
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/SwallowedExceptionListener.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/SwallowedExceptionListener.java?rev=1532278&r1=1532277&r2=1532278&view=diff
==
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/SwallowedExceptionListener.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/SwallowedExceptionListener.java
Tue Oct 15 10:38:12 2013
@@ -26,5 +26,11 @@ package org.apache.commons.pool2;
*/
public interface SwallowedExceptionListener {
+/**
+ * This method is called every time the implementation unavoidably swallows
+ * an exception.
+ *
+ * @param e The exception that was swallowed
+ */
void onSwallowException(Exception e);
}
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/UsageTracking.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/UsageTracking.java?rev=1532278&r1=1532277&r2=1532278&view=diff
==
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/UsageTracking.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/UsageTracking.java
Tue Oct 15 10:38:12 2013
@@ -23,10 +23,17 @@ package org.apache.commons.pool2;
* using allowing more informed decisions and reporting to be made regarding
* abandoned objects.
*
- * @version $Revision:$
+ * @paramThe type of object provided by the pool.
*
* @since 2.0
*/
public interface UsageTracking {
+
+/**
+ * This method is called every time a pooled object to enable the pool to
+ * better track borrowed objects.
+ *
+ * @param pooledObject The object that is being used
+ */
void use(T pooledObject);
}
svn commit: r1532275 - /commons/trunks-proper/CHALLENGE.txt
Author: ate Date: Tue Oct 15 10:19:10 2013 New Revision: 1532275 URL: http://svn.apache.org/r1532275 Log: active on scxml Modified: commons/trunks-proper/CHALLENGE.txt Modified: commons/trunks-proper/CHALLENGE.txt URL: http://svn.apache.org/viewvc/commons/trunks-proper/CHALLENGE.txt?rev=1532275&r1=1532274&r2=1532275&view=diff == --- commons/trunks-proper/CHALLENGE.txt (original) +++ commons/trunks-proper/CHALLENGE.txt Tue Oct 15 10:19:10 2013 @@ -42,7 +42,7 @@ ognl= pool=psteitz primitives= proxy= -scxml= +scxml=ate validator= vfs=joehni weaver=
svn commit: r1532272 - /commons/trunks-proper/CHALLENGE.txt
Author: erans Date: Tue Oct 15 10:12:08 2013 New Revision: 1532272 URL: http://svn.apache.org/r1532272 Log: Contributor. Modified: commons/trunks-proper/CHALLENGE.txt Modified: commons/trunks-proper/CHALLENGE.txt URL: http://svn.apache.org/viewvc/commons/trunks-proper/CHALLENGE.txt?rev=1532272&r1=1532271&r2=1532272&view=diff == --- commons/trunks-proper/CHALLENGE.txt (original) +++ commons/trunks-proper/CHALLENGE.txt Tue Oct 15 10:12:08 2013 @@ -35,7 +35,7 @@ jxpath= lang=bayard,joehni launcher= logging= -math=psteitz +math=psteitz,erans modeler= net= ognl=
svn commit: r1532271 - in /commons/sandbox/monitoring/trunk: reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/web/ reporting/src/main/resources/META-INF/services/ reporting/s
Author: rmannibucau
Date: Tue Oct 15 10:10:27 2013
New Revision: 1532271
URL: http://svn.apache.org/r1532271
Log:
adding web plugin - Note: js graph part should be reworked to be centralized
Added:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/web/
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/web/WebEndpoints.java
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/web/WebPlugin.java
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/web/
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/web/web.vm
- copied, changed from r1532191,
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/jta/jta.vm
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/resources/META-INF/services/org.apache.commons.monitoring.reporting.web.plugin.Plugin
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/SessionGauge.java
Added:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/web/WebEndpoints.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/web/WebEndpoints.java?rev=1532271&view=auto
==
---
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/web/WebEndpoints.java
(added)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/web/WebEndpoints.java
Tue Oct 15 10:10:27 2013
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+package org.apache.commons.monitoring.reporting.web.plugin.web;
+
+import org.apache.commons.monitoring.Role;
+import org.apache.commons.monitoring.reporting.web.handler.api.Regex;
+import org.apache.commons.monitoring.reporting.web.handler.api.Template;
+import org.apache.commons.monitoring.reporting.web.plugin.json.Jsons;
+import org.apache.commons.monitoring.repositories.Repository;
+import org.apache.commons.monitoring.web.session.SessionGauge;
+
+public class WebEndpoints {
+@Regex
+public Template home() {
+return new Template("web/web.vm");
+}
+
+@Regex("/sessions/([0-9]*)/([0-9]*)")
+public String sessions(final long start, final long end) {
+final StringBuilder builder = new StringBuilder();
+for (final Role gauge : SessionGauge.gauges().keySet()) {
+builder.append("{ \"data\": ")
+.append(Jsons.toJson(Repository.INSTANCE.getGaugeValues(start,
end, gauge)))
+.append(", \"label\": \"").append(gauge.getName()).append("\",
\"color\": \"#317eac\" }")
+.append(",");
+}
+
+final int length = builder.length();
+if (length > 0) {
+return builder.toString().substring(0, length - 1);
+}
+return builder.toString();
+}
+}
Added:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/web/WebPlugin.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/web/WebPlugin.java?rev=1532271&view=auto
==
---
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/web/WebPlugin.java
(added)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/plugin/web/WebPlugin.java
Tue Oct 15 10:10:27 2013
@@ -0,0 +1,36 @@
+/*
+ * 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
svn commit: r1532267 - /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
Author: bodewig
Date: Tue Oct 15 09:49:33 2013
New Revision: 1532267
URL: http://svn.apache.org/r1532267
Log:
clear password on close, don't swallow exception
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java?rev=1532267&r1=1532266&r2=1532267&view=diff
==
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
Tue Oct 15 09:49:33 2013
@@ -110,13 +110,14 @@ public class SevenZFile {
/**
* Closes the archive.
*/
-public void close() {
+public void close() throws IOException {
if (file != null) {
try {
file.close();
-} catch (IOException ignored) { // NOPMD
+} finally {
+file = null;
+password = null;
}
-file = null;
}
}
svn commit: r1532264 - in /commons/proper/compress/trunk/src: main/java/org/apache/commons/compress/archivers/sevenz/ test/java/org/apache/commons/compress/archivers/sevenz/ test/resources/
Author: bodewig
Date: Tue Oct 15 09:37:27 2013
New Revision: 1532264
URL: http://svn.apache.org/r1532264
Log:
password String => byte[] in SevnZFile including test for decryption
Added:
commons/proper/compress/trunk/src/test/resources/bla.encrypted.7z (with
props)
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/LZMA2Decoder.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java?rev=1532264&r1=1532263&r2=1532264&view=diff
==
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
Tue Oct 15 09:37:27 2013
@@ -42,7 +42,7 @@ import org.tukaani.xz.LZMAInputStream;
class Coders {
static InputStream addDecoder(final InputStream is,
-final Coder coder, final String password) throws IOException {
+final Coder coder, final byte[] password) throws IOException {
for (final CoderId coderId : coderTable) {
if (Arrays.equals(coderId.method.getId(),
coder.decompressionMethodId)) {
return coderId.coder.decode(is, coder, password);
@@ -53,7 +53,7 @@ class Coders {
}
static OutputStream addEncoder(final OutputStream out, final SevenZMethod
method,
- final String password) throws IOException {
+ final byte[] password) throws IOException {
for (final CoderId coderId : coderTable) {
if (coderId.method.equals(method)) {
return coderId.coder.encode(out, password);
@@ -83,8 +83,8 @@ class Coders {
static abstract class CoderBase {
abstract InputStream decode(final InputStream in, final Coder coder,
-String password) throws IOException;
-OutputStream encode(final OutputStream out, final String password)
+byte[] password) throws IOException;
+OutputStream encode(final OutputStream out, final byte[] password)
throws IOException {
throw new UnsupportedOperationException("method doesn't support
writing");
}
@@ -93,11 +93,11 @@ class Coders {
static class CopyDecoder extends CoderBase {
@Override
InputStream decode(final InputStream in, final Coder coder,
-String password) throws IOException {
+byte[] password) throws IOException {
return in;
}
@Override
-OutputStream encode(final OutputStream out, final String password) {
+OutputStream encode(final OutputStream out, final byte[] password) {
return out;
}
}
@@ -105,7 +105,7 @@ class Coders {
static class LZMADecoder extends CoderBase {
@Override
InputStream decode(final InputStream in, final Coder coder,
-String password) throws IOException {
+byte[] password) throws IOException {
byte propsByte = coder.properties[0];
long dictSize = coder.properties[1];
for (int i = 1; i < 4; i++) {
@@ -120,25 +120,25 @@ class Coders {
static class DeflateDecoder extends CoderBase {
@Override
-InputStream decode(final InputStream in, final Coder coder, final
String password)
+InputStream decode(final InputStream in, final Coder coder, final
byte[] password)
throws IOException {
return new InflaterInputStream(new DummyByteAddingInputStream(in),
new Inflater(true));
}
@Override
-OutputStream encode(final OutputStream out, final String password) {
+OutputStream encode(final OutputStream out, final byte[] password) {
return new DeflaterOutputStream(out, new Deflater(9, true));
}
}
static class BZIP2Decoder extends CoderBase {
@Override
-InputStream decode(final InputStream in, final Coder coder, final
String password)
+InputStream decode(final InputStream in, final Coder coder, final
byte[] password)
throws IOException {
return new BZip2CompressorInputStream(in);
}
@Override
-OutputStream encode(final OutputStream o
svn commit: r1532262 - in /commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web: registration/WebMonitoringInitializer.java session/MonitoringSessionListener.java sessi
Author: rmannibucau
Date: Tue Oct 15 09:31:41 2013
New Revision: 1532262
URL: http://svn.apache.org/r1532262
Log:
adding a session gauge to monitor the number of sessions and renaming old
session counter to session-durations which is more appropriated
Added:
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/SessionGauge.java
Modified:
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/registration/WebMonitoringInitializer.java
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/MonitoringSessionListener.java
Modified:
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/registration/WebMonitoringInitializer.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/registration/WebMonitoringInitializer.java?rev=1532262&r1=1532261&r2=1532262&view=diff
==
---
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/registration/WebMonitoringInitializer.java
(original)
+++
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/registration/WebMonitoringInitializer.java
Tue Oct 15 09:31:41 2013
@@ -36,8 +36,8 @@ public class WebMonitoringInitializer im
return;
}
-ctx.addListener(GaugeDiscoveryListener.class);
ctx.addListener(MonitoringSessionListener.class);
+ctx.addListener(GaugeDiscoveryListener.class);
String monitoredUrls =
ctx.getInitParameter(Configuration.COMMONS_MONITORING_PREFIX +
"web.monitored-urls");
if (monitoredUrls == null) {
Modified:
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/MonitoringSessionListener.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/MonitoringSessionListener.java?rev=1532262&r1=1532261&r2=1532262&view=diff
==
---
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/MonitoringSessionListener.java
(original)
+++
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/MonitoringSessionListener.java
Tue Oct 15 09:31:41 2013
@@ -28,16 +28,21 @@ import javax.servlet.http.HttpSessionEve
import javax.servlet.http.HttpSessionListener;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
public class MonitoringSessionListener implements HttpSessionListener,
ServletContextListener {
private final Map watches = new
ConcurrentHashMap();
+private final AtomicLong sessionNumber = new AtomicLong(0);
+
private Counter counter;
+private SessionGauge gauge;
@Override
public void sessionCreated(final HttpSessionEvent httpSessionEvent) {
final StopWatch watch = Repository.INSTANCE.start(counter);
watches.put(httpSessionEvent.getSession().getId(), watch);
+sessionNumber.incrementAndGet();
}
@Override
@@ -46,6 +51,7 @@ public class MonitoringSessionListener i
if (watch != null) {
watch.stop();
}
+sessionNumber.decrementAndGet();
}
@Override
@@ -54,11 +60,14 @@ public class MonitoringSessionListener i
if (contextPath == null || contextPath.isEmpty()) {
contextPath = "/";
}
-counter = Repository.INSTANCE.getCounter(new Counter.Key(new
Role("sessions", Unit.UNARY), "sessions-" + contextPath));
+counter = Repository.INSTANCE.getCounter(new Counter.Key(new
Role("session-durations", Unit.Time.NANOSECOND), "session-durations-" +
contextPath));
+
+gauge = new SessionGauge(contextPath, sessionNumber);
+Repository.INSTANCE.addGauge(gauge);
}
@Override
public void contextDestroyed(final ServletContextEvent sce) {
-// no-op
+Repository.INSTANCE.stopGauge(gauge.role());
}
}
Added:
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/SessionGauge.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/SessionGauge.java?rev=1532262&view=auto
==
---
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/SessionGauge.java
(added)
+++
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/SessionGauge.java
Tue Oct 15 09:31:41 2013
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contri
svn commit: r1532258 - /commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/MonitoringSessionListener.java
Author: rmannibucau
Date: Tue Oct 15 09:18:14 2013
New Revision: 1532258
URL: http://svn.apache.org/r1532258
Log:
typo (plural) + using context path in counter name instead of role name for a
better filtering
Modified:
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/MonitoringSessionListener.java
Modified:
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/MonitoringSessionListener.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/MonitoringSessionListener.java?rev=1532258&r1=1532257&r2=1532258&view=diff
==
---
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/MonitoringSessionListener.java
(original)
+++
commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/MonitoringSessionListener.java
Tue Oct 15 09:18:14 2013
@@ -54,7 +54,7 @@ public class MonitoringSessionListener i
if (contextPath == null || contextPath.isEmpty()) {
contextPath = "/";
}
-counter = Repository.INSTANCE.getCounter(new Counter.Key(new
Role("sessions-" + contextPath, Unit.UNARY), "session"));
+counter = Repository.INSTANCE.getCounter(new Counter.Key(new
Role("sessions", Unit.UNARY), "sessions-" + contextPath));
}
@Override
svn commit: r1532257 - in /commons/sandbox/monitoring/trunk: src/site/markdown/ web/src/main/java/org/apache/commons/monitoring/web/registration/ web/src/main/java/org/apache/commons/monitoring/web/se
Author: rmannibucau Date: Tue Oct 15 09:15:56 2013 New Revision: 1532257 URL: http://svn.apache.org/r1532257 Log: making web monitoring automatic in a servlet 3 container (but still configurable) + fixing role name of session monitoring (to distinguish between apps Added: commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/registration/ commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/registration/WebMonitoringInitializer.java commons/sandbox/monitoring/trunk/web/src/main/resources/META-INF/ commons/sandbox/monitoring/trunk/web/src/main/resources/META-INF/services/ commons/sandbox/monitoring/trunk/web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer Modified: commons/sandbox/monitoring/trunk/src/site/markdown/jta.md commons/sandbox/monitoring/trunk/src/site/markdown/web.md commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/session/MonitoringSessionListener.java Modified: commons/sandbox/monitoring/trunk/src/site/markdown/jta.md URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/site/markdown/jta.md?rev=1532257&r1=1532256&r2=1532257&view=diff == --- commons/sandbox/monitoring/trunk/src/site/markdown/jta.md (original) +++ commons/sandbox/monitoring/trunk/src/site/markdown/jta.md Tue Oct 15 09:15:56 2013 @@ -35,6 +35,7 @@ to add `commons-monitoring-web` to your Note: you can register it manually using `org.apache.commons.monitoring.gauges.Gauge$LoaderHelper` or `org.apache.commons.monitoring.repositories.Repository#addGauge`. +Note 2: in a servlet 3 container it is done automatically if `org.apache.commons.monitoring.web.activated` is true (by default) Then you need to add on the beans which can be enrolled in transactions you want to monitor the annotation `org.apache.commons.monitoring.jta.JTAMonitored` (CDI beans) or the interceptor `org.apache.commons.monitoring.jta.JTAInterceptor` Modified: commons/sandbox/monitoring/trunk/src/site/markdown/web.md URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/site/markdown/web.md?rev=1532257&r1=1532256&r2=1532257&view=diff == --- commons/sandbox/monitoring/trunk/src/site/markdown/web.md (original) +++ commons/sandbox/monitoring/trunk/src/site/markdown/web.md Tue Oct 15 09:15:56 2013 @@ -37,14 +37,19 @@ Simply add the filter `org.apache.common /* +Note: in a servlet 3 container you can simply configure `org.apache.commons.monitoring.web.monitored-urls` to the +servlet pattern you want to match. If you want to register the `MonitoringFilter` yourself just set the +init parameter `org.apache.commons.monitoring.web.activated` to false. + ## Monitor sessions Simply add the listener `org.apache.commons.monitoring.web.servlet.MonitoringFilter`: - org.apache.commons.monitoring.web.servlet.MonitoringFilter + org.apache.commons.monitoring.web.session.MonitoringSessionListener +Note: in a servlet 3 container and if `org.apache.commons.monitoring.web.activated` is not set to false it is added by default. ## Accessing results Added: commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/registration/WebMonitoringInitializer.java URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/registration/WebMonitoringInitializer.java?rev=1532257&view=auto == --- commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/registration/WebMonitoringInitializer.java (added) +++ commons/sandbox/monitoring/trunk/web/src/main/java/org/apache/commons/monitoring/web/registration/WebMonitoringInitializer.java Tue Oct 15 09:15:56 2013 @@ -0,0 +1,48 @@ +/* + * 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. + */ +package org.apache.commons.monitoring.web.registration; + +import org.apache.commons.monitoring.configura
svn commit: r1532256 - /commons/trunks-proper/CHALLENGE.txt
Author: polx Date: Tue Oct 15 09:14:06 2013 New Revision: 1532256 URL: http://svn.apache.org/r1532256 Log: added polx. paul Modified: commons/trunks-proper/CHALLENGE.txt Modified: commons/trunks-proper/CHALLENGE.txt URL: http://svn.apache.org/viewvc/commons/trunks-proper/CHALLENGE.txt?rev=1532256&r1=1532255&r2=1532256&view=diff == --- commons/trunks-proper/CHALLENGE.txt (original) +++ commons/trunks-proper/CHALLENGE.txt Tue Oct 15 09:14:06 2013 @@ -29,7 +29,7 @@ imaging= io=joehni jci= jcs= -jelly= +jelly=polx jexl= jxpath= lang=bayard,joehni
svn commit: r1532253 - in /commons/sandbox/monitoring/trunk: ./ cdi/ graphite/ reporting/ reporting/src/main/java/org/apache/commons/monitoring/reporting/web/ reporting/src/main/java/org/apache/common
Author: rmannibucau
Date: Tue Oct 15 09:04:54 2013
New Revision: 1532253
URL: http://svn.apache.org/r1532253
Log:
allowing to register automatically reporting gui
Added:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/registration/
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/registration/MonitoringReportingInitializer.java
commons/sandbox/monitoring/trunk/reporting/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
Modified:
commons/sandbox/monitoring/trunk/cdi/pom.xml
commons/sandbox/monitoring/trunk/graphite/pom.xml
commons/sandbox/monitoring/trunk/pom.xml
commons/sandbox/monitoring/trunk/reporting/pom.xml
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringController.java
commons/sandbox/monitoring/trunk/src/site/markdown/reporting.md
commons/sandbox/monitoring/trunk/web/pom.xml
Modified: commons/sandbox/monitoring/trunk/cdi/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/cdi/pom.xml?rev=1532253&r1=1532252&r2=1532253&view=diff
==
--- commons/sandbox/monitoring/trunk/cdi/pom.xml (original)
+++ commons/sandbox/monitoring/trunk/cdi/pom.xml Tue Oct 15 09:04:54 2013
@@ -54,7 +54,7 @@
org.apache.geronimo.specs
- geronimo-servlet_2.5_spec
+ geronimo-servlet_3.0_spec
test
Modified: commons/sandbox/monitoring/trunk/graphite/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/graphite/pom.xml?rev=1532253&r1=1532252&r2=1532253&view=diff
==
--- commons/sandbox/monitoring/trunk/graphite/pom.xml (original)
+++ commons/sandbox/monitoring/trunk/graphite/pom.xml Tue Oct 15 09:04:54 2013
@@ -32,7 +32,7 @@
org.apache.geronimo.specs
- geronimo-servlet_2.5_spec
+ geronimo-servlet_3.0_spec
Modified: commons/sandbox/monitoring/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/pom.xml?rev=1532253&r1=1532252&r2=1532253&view=diff
==
--- commons/sandbox/monitoring/trunk/pom.xml (original)
+++ commons/sandbox/monitoring/trunk/pom.xml Tue Oct 15 09:04:54 2013
@@ -157,8 +157,8 @@
org.apache.geronimo.specs
-geronimo-servlet_2.5_spec
-1.2
+geronimo-servlet_3.0_spec
+1.0
provided
Modified: commons/sandbox/monitoring/trunk/reporting/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/pom.xml?rev=1532253&r1=1532252&r2=1532253&view=diff
==
--- commons/sandbox/monitoring/trunk/reporting/pom.xml (original)
+++ commons/sandbox/monitoring/trunk/reporting/pom.xml Tue Oct 15 09:04:54 2013
@@ -37,7 +37,7 @@
org.apache.geronimo.specs
- geronimo-servlet_2.5_spec
+ geronimo-servlet_3.0_spec
org.apache.commons.monitoring
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringController.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringController.java?rev=1532253&r1=1532252&r2=1532253&view=diff
==
---
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringController.java
(original)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringController.java
Tue Oct 15 09:04:54 2013
@@ -51,14 +51,14 @@ import java.util.regex.Pattern;
public class MonitoringController implements Filter {
private final Map cachedResources = new
ConcurrentHashMap();
private final Map invokers = new HashMap();
-private String mapping;
+private String mapping = null;
private ClassLoader classloader;
private Invoker defaultInvoker;
@Override
public void init(final FilterConfig config) throws ServletException {
classloader = Thread.currentThread().getContextClassLoader();
-initMapping(config);
+initMapping(config.getInitParameter("monitoring-mapping"));
Templates.init(config.getServletContext().getContextPath(), mapping);
initHandlers();
}
@@ -79,13 +79,23 @@ public class MonitoringController implem
}
}
-private void initMapping(FilterConfig config) {
-mapping = config.getInitParameter("monitoring-mapping");
-if (mapping == null)
svn commit: r1532238 - /commons/sandbox/javaflow/trunk/pom.xml
Author: ebourg Date: Tue Oct 15 08:02:22 2013 New Revision: 1532238 URL: http://svn.apache.org/r1532238 Log: Updated the dependencies Modified: commons/sandbox/javaflow/trunk/pom.xml Modified: commons/sandbox/javaflow/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/sandbox/javaflow/trunk/pom.xml?rev=1532238&r1=1532237&r2=1532238&view=diff == --- commons/sandbox/javaflow/trunk/pom.xml (original) +++ commons/sandbox/javaflow/trunk/pom.xml Tue Oct 15 08:02:22 2013 @@ -62,12 +62,12 @@ commons-logging commons-logging - 1.1.1 + 1.1.3 org.apache.commons commons-jci-core - 1.0 + 1.1 org.ow2.asm
svn commit: r1532236 - in /commons/sandbox/monitoring/trunk/cdi/src: main/java/org/apache/commons/monitoring/cdi/internal/ main/resources/META-INF/services/ test/java/org/apache/commons/monitoring/cdi
Author: rmannibucau
Date: Tue Oct 15 07:50:19 2013
New Revision: 1532236
URL: http://svn.apache.org/r1532236
Log:
allowing to configure cdi monitoring through properties file
Added:
commons/sandbox/monitoring/trunk/cdi/src/main/java/org/apache/commons/monitoring/cdi/internal/
commons/sandbox/monitoring/trunk/cdi/src/main/java/org/apache/commons/monitoring/cdi/internal/CommonsMonitoringPerformanceExtension.java
commons/sandbox/monitoring/trunk/cdi/src/main/java/org/apache/commons/monitoring/cdi/internal/WrappedAnnotatedType.java
commons/sandbox/monitoring/trunk/cdi/src/main/resources/META-INF/services/
commons/sandbox/monitoring/trunk/cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
commons/sandbox/monitoring/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringExtensionTest.java
- copied, changed from r1532191,
commons/sandbox/monitoring/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringInterceptorTest.java
commons/sandbox/monitoring/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringExtensionTestBase.java
commons/sandbox/monitoring/trunk/cdi/src/test/resources/commons-monitoring.properties
Modified:
commons/sandbox/monitoring/trunk/cdi/src/test/java/org/apache/commons/monitoring/cdi/CommonsMonitoringInterceptorTest.java
Added:
commons/sandbox/monitoring/trunk/cdi/src/main/java/org/apache/commons/monitoring/cdi/internal/CommonsMonitoringPerformanceExtension.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/cdi/src/main/java/org/apache/commons/monitoring/cdi/internal/CommonsMonitoringPerformanceExtension.java?rev=1532236&view=auto
==
---
commons/sandbox/monitoring/trunk/cdi/src/main/java/org/apache/commons/monitoring/cdi/internal/CommonsMonitoringPerformanceExtension.java
(added)
+++
commons/sandbox/monitoring/trunk/cdi/src/main/java/org/apache/commons/monitoring/cdi/internal/CommonsMonitoringPerformanceExtension.java
Tue Oct 15 07:50:19 2013
@@ -0,0 +1,155 @@
+/*
+ * 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.
+ */
+package org.apache.commons.monitoring.cdi.internal;
+
+import org.apache.commons.monitoring.cdi.Monitored;
+import org.apache.commons.monitoring.configuration.Configuration;
+import org.apache.commons.monitoring.util.ClassLoaders;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import java.io.Serializable;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class CommonsMonitoringPerformanceExtension implements Extension {
+private static final Logger LOGGER =
Logger.getLogger(CommonsMonitoringPerformanceExtension.class.getName());
+
+private static final String PERFORMANCE_MARKER = "performance";
+
+private final boolean enabled =
Configuration.is(Configuration.COMMONS_MONITORING_PREFIX + "cdi.enabled", true);
+private final Monitored binding = newAnnotation(Monitored.class);
+private final Map, Annotation> otherBindings =
new HashMap, Annotation>();
+
+ void processAnnotatedType(final @Observes ProcessAnnotatedType pat)
{
+if (!enabled) {
+return;
+}
+
+final String beanClassName =
pat.getAnnotatedType().getJavaClass().getName();
+final String configuration = findConfiguration(beanClassName);
+if (configuration == null) {
+return;
+}
+
+final Collection configForThisBean =
Arrays.asList(configuration.split(","));
+if (!configForThisBean.isEmpty()) {
+final WrappedAnnotatedType wrapper = new
WrappedAnnotatedType(pat.getAnnotatedType());
+for (final String rawConfig : configForThisBean) {
+final String config = rawConfig.trim();
+
+
svn commit: r1532233 - in /commons/sandbox/javaflow/trunk: ./ .project
Author: ebourg Date: Tue Oct 15 07:43:00 2013 New Revision: 1532233 URL: http://svn.apache.org/r1532233 Log: Ignore IntelliJ/Eclipse project files Removed: commons/sandbox/javaflow/trunk/.project Modified: commons/sandbox/javaflow/trunk/ (props changed) Propchange: commons/sandbox/javaflow/trunk/ -- --- svn:ignore (original) +++ svn:ignore Tue Oct 15 07:43:00 2013 @@ -1,9 +1,13 @@ -build.properties -dist +*.iml +*.ipr +*.iws +.idea +.checkstyle .classpath .project -.checkstyle -target +build.properties +dist +eclipse_classes maven.log +target velocity.log -eclipse_classes
svn commit: r1532231 - in /commons/sandbox/javaflow/trunk/src/main/java/org/apache/commons/javaflow: ant/ bytecode/ bytecode/transformation/asm/ stores/ utils/
Author: ebourg
Date: Tue Oct 15 07:39:14 2013
New Revision: 1532231
URL: http://svn.apache.org/r1532231
Log:
Java 5 syntax
Modified:
commons/sandbox/javaflow/trunk/src/main/java/org/apache/commons/javaflow/ant/AntRewriteTask.java
commons/sandbox/javaflow/trunk/src/main/java/org/apache/commons/javaflow/bytecode/Stack.java
commons/sandbox/javaflow/trunk/src/main/java/org/apache/commons/javaflow/bytecode/transformation/asm/ContinuationMethodAdapter.java
commons/sandbox/javaflow/trunk/src/main/java/org/apache/commons/javaflow/stores/TransformingResourceStore.java
commons/sandbox/javaflow/trunk/src/main/java/org/apache/commons/javaflow/utils/CompositeTransformer.java
commons/sandbox/javaflow/trunk/src/main/java/org/apache/commons/javaflow/utils/ReflectionUtils.java
Modified:
commons/sandbox/javaflow/trunk/src/main/java/org/apache/commons/javaflow/ant/AntRewriteTask.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/javaflow/trunk/src/main/java/org/apache/commons/javaflow/ant/AntRewriteTask.java?rev=1532231&r1=1532230&r2=1532231&view=diff
==
---
commons/sandbox/javaflow/trunk/src/main/java/org/apache/commons/javaflow/ant/AntRewriteTask.java
(original)
+++
commons/sandbox/javaflow/trunk/src/main/java/org/apache/commons/javaflow/ant/AntRewriteTask.java
Tue Oct 15 07:39:14 2013
@@ -112,9 +112,7 @@ public class AntRewriteTask extends Matc
}
try {
-for (int i = 0; i < fileNames.length; i++) {
-final String fileName = fileNames[i];
-
+for (final String fileName : fileNames) {
final File source = new File(srcDir, fileName);
final File destination = new File(dstDir, fileName);
Modified:
commons/sandbox/javaflow/trunk/src/main/java/org/apache/commons/javaflow/bytecode/Stack.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/javaflow/trunk/src/main/java/org/apache/commons/javaflow/bytecode/Stack.java?rev=1532231&r1=1532230&r2=1532231&view=diff
==
---
commons/sandbox/javaflow/trunk/src/main/java/org/apache/commons/javaflow/bytecode/Stack.java
(original)
+++
commons/sandbox/javaflow/trunk/src/main/java/org/apache/commons/javaflow/bytecode/Stack.java
Tue Oct 15 07:39:14 2013
@@ -288,7 +288,7 @@ public class Stack implements Serializab
private String getStats() {
if (log.isDebugEnabled()) {
-final StringBuffer sb = new StringBuffer();
+final StringBuilder sb = new StringBuilder();
sb.append("i[").append(iTop).append("],");
sb.append("l[").append(lTop).append("],");
sb.append("d[").append(dTop).append("],");
@@ -302,7 +302,7 @@ public class Stack implements Serializab
}
private String getContent() {
-final StringBuffer sb = new StringBuffer();
+final StringBuilder sb = new StringBuilder();
sb.append("i[").append(iTop).append("]\n");
sb.append("l[").append(lTop).append("]\n");
sb.append("d[").append(dTop).append("]\n");
Modified:
commons/sandbox/javaflow/trunk/src/main/java/org/apache/commons/javaflow/bytecode/transformation/asm/ContinuationMethodAdapter.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/javaflow/trunk/src/main/java/org/apache/commons/javaflow/bytecode/transformation/asm/ContinuationMethodAdapter.java?rev=1532231&r1=1532230&r2=1532231&view=diff
==
---
commons/sandbox/javaflow/trunk/src/main/java/org/apache/commons/javaflow/bytecode/transformation/asm/ContinuationMethodAdapter.java
(original)
+++
commons/sandbox/javaflow/trunk/src/main/java/org/apache/commons/javaflow/bytecode/transformation/asm/ContinuationMethodAdapter.java
Tue Oct 15 07:39:14 2013
@@ -23,7 +23,6 @@ import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type;
-import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.MethodInsnNode;
import org.objectweb.asm.tree.analysis.Analyzer;
import org.objectweb.asm.tree.analysis.BasicValue;
@@ -90,10 +89,10 @@ public final class ContinuationMethodAda
// switch cases
for (int i = 0; i < fsize; i++) {
-Label frameLabel = (Label) labels.get(i);
+Label frameLabel = labels.get(i);
mv.visitLabel(restoreLabels[i]);
-MethodInsnNode mnode = (MethodInsnNode) nodes.get(i);
+MethodInsnNode mnode = nodes.get(i);
Frame frame = analyzer.getFrames()[canalyzer.getIndex(mnode)];
// for each local variable store the value in locals popping it
from the stack!
@@ -132,9 +131,9 @@ public final class ContinuationMethodAda
if (frame instanceof MonitoringFrame)
svn commit: r1532229 - in /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier: VerifierAppFrame.java VerifierFactoryListModel.java
Author: dbrosius
Date: Tue Oct 15 07:07:43 2013
New Revision: 1532229
URL: http://svn.apache.org/r1532229
Log:
List only is generified in jdk7 so strip for now
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java?rev=1532229&r1=1532228&r2=1532229&view=diff
==
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
Tue Oct 15 07:07:43 2013
@@ -58,7 +58,7 @@ public class VerifierAppFrame extends JF
JPanel jPanel2 = new JPanel();
JSplitPane jSplitPane2 = new JSplitPane();
JPanel jPanel3 = new JPanel();
-JList classNamesJList = new JList();
+JList classNamesJList = new JList();
GridLayout gridLayout1 = new GridLayout();
JPanel messagesPanel = new JPanel();
GridLayout gridLayout2 = new GridLayout();
@@ -83,8 +83,8 @@ public class VerifierAppFrame extends JF
JScrollPane jScrollPane5 = new JScrollPane();
JScrollPane jScrollPane6 = new JScrollPane();
JScrollPane jScrollPane7 = new JScrollPane();
-JList pass3aJList = new JList();
-JList pass3bJList = new JList();
+JList pass3aJList = new JList();
+JList pass3bJList = new JList();
JTextPane pass3aTextPane = new JTextPane();
JTextPane pass3bTextPane = new JTextPane();
JMenu jMenu2 = new JMenu();
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java?rev=1532229&r1=1532228&r2=1532229&view=diff
==
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java
Tue Oct 15 07:07:43 2013
@@ -33,7 +33,7 @@ import javax.swing.event.ListDataListene
* @author Enver Haase
*/
public class VerifierFactoryListModel implements
org.apache.bcel.verifier.VerifierFactoryObserver,
-javax.swing.ListModel {
+javax.swing.ListModel {
private List listeners = new
ArrayList();
private Set cache = new TreeSet();
