You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2010/10/16 01:34:32 UTC
svn commit: r1023147 - in /openejb/trunk/openejb3: ./ container/openejb-core/
container/openejb-core/src/main/java/org/apache/openejb/math/
container/openejb-core/src/main/java/org/apache/openejb/math/stat/
container/openejb-core/src/main/java/org/apac...
Author: dblevins
Date: Fri Oct 15 23:34:31 2010
New Revision: 1023147
URL: http://svn.apache.org/viewvc?rev=1023147&view=rev
Log:
svn merge -r 1005321:1005322 https://svn.apache.org/repos/asf/openejb/branches/openejb-3.1.x
http://svn.apache.org/viewvc?view=revision&revision=1005322
------------------------------------------------------------------------
r1005322 | dblevins | 2010-10-06 20:18:24 -0700 (Wed, 06 Oct 2010) | 2 lines
Trim out large commons-math library and just grab the classes we need
------------------------------------------------------------------------
Added:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/
- copied from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/MathRuntimeException.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/MathRuntimeException.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/
- copied from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/
- copied from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/AbstractStorelessUnivariateStatistic.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/AbstractStorelessUnivariateStatistic.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/AbstractUnivariateStatistic.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/AbstractUnivariateStatistic.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/DescriptiveStatistics.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/DescriptiveStatistics.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/StatisticalSummary.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/StatisticalSummary.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/StorelessUnivariateStatistic.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/StorelessUnivariateStatistic.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/SynchronizedDescriptiveStatistics.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/SynchronizedDescriptiveStatistics.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/UnivariateStatistic.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/UnivariateStatistic.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/WeightedEvaluation.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/WeightedEvaluation.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/
- copied from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FirstMoment.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FirstMoment.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FourthMoment.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FourthMoment.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/GeometricMean.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/GeometricMean.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Kurtosis.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Kurtosis.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Mean.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Mean.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/SecondMoment.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/SecondMoment.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Skewness.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Skewness.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/ThirdMoment.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/ThirdMoment.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Variance.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Variance.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/
- copied from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Max.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Max.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Min.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Min.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Percentile.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Percentile.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/
- copied from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/Sum.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/Sum.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfLogs.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfLogs.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfSquares.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfSquares.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/util/
- copied from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/util/
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/util/DoubleArray.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/util/DoubleArray.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/util/MathUtils.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/util/MathUtils.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java
- copied unchanged from r1005322, openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java
Modified:
openejb/trunk/openejb3/ (props changed)
openejb/trunk/openejb3/container/openejb-core/pom.xml
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed)
openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed)
Propchange: openejb/trunk/openejb3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 15 23:34:31 2010
@@ -1,3 +1,3 @@
/openejb/branches/openejb-3.1.1:779593
-/openejb/branches/openejb-3.1.x:945409,945448,1004381
+/openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322
/openejb/branches/openejb-jcdi:984659-985270
Modified: openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/pom.xml?rev=1023147&r1=1023146&r2=1023147&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Fri Oct 15 23:34:31 2010
@@ -261,10 +261,8 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math</artifactId>
- </dependency>
+
+ <!-- ActiveMQ -->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java?rev=1023147&r1=1023146&r2=1023147&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java Fri Oct 15 23:34:31 2010
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.monitoring;
-import org.apache.commons.math.stat.descriptive.SynchronizedDescriptiveStatistics;
+import org.apache.openejb.math.stat.descriptive.SynchronizedDescriptiveStatistics;
import org.apache.xbean.finder.ClassFinder;
import org.apache.openejb.api.Monitor;
import org.apache.openejb.core.interceptor.InterceptorData;
Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 15 23:34:31 2010
@@ -1,3 +1,3 @@
/openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593
-/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448
+/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448,1005322
/openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:984659-985270
Propchange: openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 15 23:34:31 2010
@@ -1,3 +1,3 @@
/openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593
-/openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448
+/openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448,1005322
/openejb/branches/openejb-jcdi/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:984659-985270