You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2011/09/14 08:43:13 UTC

svn commit: r1170448 - in /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math: ./ stat/descriptive/ stat/descriptive/moment/ stat/descriptive/rank/ stat/descriptive/summary/ util/

Author: andygumbrecht
Date: Wed Sep 14 06:43:12 2011
New Revision: 1170448

URL: http://svn.apache.org/viewvc?rev=1170448&view=rev
Log:
Changed serialVersionUIDs in 'org.apache.openejb.math' that conflict with identical commons.math classes (from which they are copied). Not serious, but intellij, netbeans and possibly other IDEs see these classes as the same and can lead to incorrect imports.

Would it maybe be better to remove the 'org.apache.openejb.math' namespace and pull in a dep on commons.math?

Modified:
    openejb/trunk/openejb3/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/descriptive/DescriptiveStatistics.java
    openejb/trunk/openejb3/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/moment/FirstMoment.java
    openejb/trunk/openejb3/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
    openejb/trunk/openejb3/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
    openejb/trunk/openejb3/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
    openejb/trunk/openejb3/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
    openejb/trunk/openejb3/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
    openejb/trunk/openejb3/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/Sum.java
    openejb/trunk/openejb3/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
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/MathRuntimeException.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/MathRuntimeException.java?rev=1170448&r1=1170447&r2=1170448&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/MathRuntimeException.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/MathRuntimeException.java Wed Sep 14 06:43:12 2011
@@ -37,7 +37,7 @@ import java.util.ResourceBundle;
 public class MathRuntimeException extends RuntimeException {
 
     /** Serializable version identifier. */
-    private static final long serialVersionUID = -5128983364075381060L;
+    private static final long serialVersionUID = -1238983364075381060L;
 
     /**
      * Pattern used to build the message.

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/DescriptiveStatistics.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/DescriptiveStatistics.java?rev=1170448&r1=1170447&r2=1170448&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/DescriptiveStatistics.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/DescriptiveStatistics.java Wed Sep 14 06:43:12 2011
@@ -63,7 +63,7 @@ public class DescriptiveStatistics imple
     public static final int INFINITE_WINDOW = -1;
 
     /** Serialization UID */
-    private static final long serialVersionUID = 4133067267405273064L;
+    private static final long serialVersionUID = 1233067267405273064L;
 
     /** Name of the setQuantile method. */
     private static final String SET_QUANTILE_METHOD_NAME = "setQuantile";

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/SynchronizedDescriptiveStatistics.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/SynchronizedDescriptiveStatistics.java?rev=1170448&r1=1170447&r2=1170448&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/SynchronizedDescriptiveStatistics.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/SynchronizedDescriptiveStatistics.java Wed Sep 14 06:43:12 2011
@@ -32,7 +32,7 @@ package org.apache.openejb.math.stat.des
 public class SynchronizedDescriptiveStatistics extends DescriptiveStatistics {
 
     /** Serialization UID */
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 2L;
 
     /**
      * Construct an instance with infinite window

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FirstMoment.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FirstMoment.java?rev=1170448&r1=1170447&r2=1170448&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FirstMoment.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FirstMoment.java Wed Sep 14 06:43:12 2011
@@ -48,7 +48,7 @@ public class FirstMoment extends Abstrac
     implements Serializable {
 
     /** Serializable version identifier */
-    private static final long serialVersionUID = 6112755307178490473L;
+    private static final long serialVersionUID = 1232755307178490473L;
 
 
     /** Count of values that have been added */

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FourthMoment.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FourthMoment.java?rev=1170448&r1=1170447&r2=1170448&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FourthMoment.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FourthMoment.java Wed Sep 14 06:43:12 2011
@@ -53,7 +53,7 @@ import java.io.Serializable;
 public class FourthMoment extends ThirdMoment implements Serializable{
 
     /** Serializable version identifier */
-    private static final long serialVersionUID = 4763990447117157611L;
+    private static final long serialVersionUID = 1233990447117157611L;
 
     /** fourth moment of values that have been added */
     protected double m4;

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/GeometricMean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/GeometricMean.java?rev=1170448&r1=1170447&r2=1170448&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/GeometricMean.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/GeometricMean.java Wed Sep 14 06:43:12 2011
@@ -50,7 +50,7 @@ import org.apache.openejb.math.stat.desc
 public class GeometricMean extends AbstractStorelessUnivariateStatistic implements Serializable {
 
     /** Serializable version identifier */
-    private static final long serialVersionUID = -8178734905303459453L;
+    private static final long serialVersionUID = -1238734905303459453L;
 
     /** Wrapped SumOfLogs instance */
     private StorelessUnivariateStatistic sumOfLogs;

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Kurtosis.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Kurtosis.java?rev=1170448&r1=1170447&r2=1170448&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Kurtosis.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Kurtosis.java Wed Sep 14 06:43:12 2011
@@ -45,7 +45,7 @@ import org.apache.openejb.math.stat.desc
 public class Kurtosis extends AbstractStorelessUnivariateStatistic implements Serializable {
 
     /** Serializable version identifier */
-    private static final long serialVersionUID = 2784465764798260919L;
+    private static final long serialVersionUID = 1234465764798260919L;
 
     /**Fourth Moment on which this statistic is based */
     protected FourthMoment moment;

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Mean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Mean.java?rev=1170448&r1=1170447&r2=1170448&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Mean.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Mean.java Wed Sep 14 06:43:12 2011
@@ -60,7 +60,7 @@ public class Mean extends AbstractStorel
     implements Serializable, WeightedEvaluation {
 
     /** Serializable version identifier */
-    private static final long serialVersionUID = -1296043746617791564L;
+    private static final long serialVersionUID = -1236043746617791564L;
 
     /** First moment on which this statistic is based. */
     protected FirstMoment moment;

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/SecondMoment.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/SecondMoment.java?rev=1170448&r1=1170447&r2=1170448&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/SecondMoment.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/SecondMoment.java Wed Sep 14 06:43:12 2011
@@ -45,7 +45,7 @@ import java.io.Serializable;
 public class SecondMoment extends FirstMoment implements Serializable {
 
     /** Serializable version identifier */
-    private static final long serialVersionUID = 3942403127395076445L;
+    private static final long serialVersionUID = 1232403127395076445L;
 
     /** second moment of values that have been added */
     protected double m2;

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Skewness.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Skewness.java?rev=1170448&r1=1170447&r2=1170448&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Skewness.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Skewness.java Wed Sep 14 06:43:12 2011
@@ -40,7 +40,7 @@ import org.apache.openejb.math.stat.desc
 public class Skewness extends AbstractStorelessUnivariateStatistic implements Serializable {
 
     /** Serializable version identifier */
-    private static final long serialVersionUID = 7101857578996691352L;
+    private static final long serialVersionUID = 1231857578996691352L;
 
     /** Third moment on which this statistic is based */
     protected ThirdMoment moment = null;

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/ThirdMoment.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/ThirdMoment.java?rev=1170448&r1=1170447&r2=1170448&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/ThirdMoment.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/ThirdMoment.java Wed Sep 14 06:43:12 2011
@@ -47,7 +47,7 @@ import java.io.Serializable;
 public class ThirdMoment extends SecondMoment implements Serializable {
 
     /** Serializable version identifier */
-    private static final long serialVersionUID = -7818711964045118679L;
+    private static final long serialVersionUID = -1238711964045118679L;
 
     /** third moment of values that have been added */
     protected double m3;

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Variance.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Variance.java?rev=1170448&r1=1170447&r2=1170448&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Variance.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Variance.java Wed Sep 14 06:43:12 2011
@@ -67,7 +67,7 @@ import org.apache.openejb.math.stat.desc
 public class Variance extends AbstractStorelessUnivariateStatistic implements Serializable, WeightedEvaluation {
 
     /** Serializable version identifier */
-    private static final long serialVersionUID = -9111962718267217978L;
+    private static final long serialVersionUID = -1231962718267217978L;
 
     /** SecondMoment is used in incremental calculation of Variance*/
     protected SecondMoment moment = null;

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Max.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Max.java?rev=1170448&r1=1170447&r2=1170448&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Max.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Max.java Wed Sep 14 06:43:12 2011
@@ -40,7 +40,7 @@ import org.apache.openejb.math.stat.desc
 public class Max extends AbstractStorelessUnivariateStatistic implements Serializable {
 
     /** Serializable version identifier */
-    private static final long serialVersionUID = -5593383832225844641L;
+    private static final long serialVersionUID = -1233383832225844641L;
 
     /** Number of values that have been added */
     private long n;

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Min.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Min.java?rev=1170448&r1=1170447&r2=1170448&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Min.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Min.java Wed Sep 14 06:43:12 2011
@@ -40,7 +40,7 @@ import org.apache.openejb.math.stat.desc
 public class Min extends AbstractStorelessUnivariateStatistic implements Serializable {
 
     /** Serializable version identifier */
-    private static final long serialVersionUID = -2941995784909003131L;
+    private static final long serialVersionUID = -1231995784909003131L;
 
     /**Number of values that have been added */
     private long n;

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Percentile.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Percentile.java?rev=1170448&r1=1170447&r2=1170448&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Percentile.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Percentile.java Wed Sep 14 06:43:12 2011
@@ -68,7 +68,7 @@ import org.apache.openejb.math.stat.desc
 public class Percentile extends AbstractUnivariateStatistic implements Serializable {
 
     /** Serializable version identifier */
-    private static final long serialVersionUID = -8091216485095130416L;
+    private static final long serialVersionUID = -1231216485095130416L;
 
     /** Determines what percentile is computed when evaluate() is activated
      * with no quantile argument */

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/Sum.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/Sum.java?rev=1170448&r1=1170447&r2=1170448&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/Sum.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/Sum.java Wed Sep 14 06:43:12 2011
@@ -37,7 +37,7 @@ import org.apache.openejb.math.stat.desc
 public class Sum extends AbstractStorelessUnivariateStatistic implements Serializable {
 
     /** Serializable version identifier */
-    private static final long serialVersionUID = -8231831954703408316L;
+    private static final long serialVersionUID = -1231831954703408316L;
 
     /** */
     private long n;

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfLogs.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfLogs.java?rev=1170448&r1=1170447&r2=1170448&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfLogs.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfLogs.java Wed Sep 14 06:43:12 2011
@@ -44,7 +44,7 @@ import org.apache.openejb.math.stat.desc
 public class SumOfLogs extends AbstractStorelessUnivariateStatistic implements Serializable {
 
     /** Serializable version identifier */
-    private static final long serialVersionUID = -370076995648386763L;
+    private static final long serialVersionUID = -123076995648386763L;
 
     /**Number of values that have been added */
     private int n;

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfSquares.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfSquares.java?rev=1170448&r1=1170447&r2=1170448&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfSquares.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfSquares.java Wed Sep 14 06:43:12 2011
@@ -36,7 +36,7 @@ import org.apache.openejb.math.stat.desc
 public class SumOfSquares extends AbstractStorelessUnivariateStatistic implements Serializable {
 
     /** Serializable version identifier */
-    private static final long serialVersionUID = 1460986908574398008L;
+    private static final long serialVersionUID = 1230986908574398008L;
 
     /** */
     private long n;

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java?rev=1170448&r1=1170447&r2=1170448&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java Wed Sep 14 06:43:12 2011
@@ -80,7 +80,7 @@ public class ResizableDoubleArray implem
     public static final int MULTIPLICATIVE_MODE = 0;
 
     /** Serializable version identifier */
-    private static final long serialVersionUID = -3485529955529426875L;
+    private static final long serialVersionUID = -1235529955529426875L;
 
     /**
      * The contraction criteria determines when the internal array will be