svn commit: r1145120 - /velocity/engine/trunk/velocity-engine-core/pom.xml
Author: cbrisson Date: Mon Jul 11 10:55:09 2011 New Revision: 1145120 URL: http://svn.apache.org/viewvc?rev=1145120view=rev Log: fix commons-lang shading Modified: velocity/engine/trunk/velocity-engine-core/pom.xml Modified: velocity/engine/trunk/velocity-engine-core/pom.xml URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/pom.xml?rev=1145120r1=1145119r2=1145120view=diff == --- velocity/engine/trunk/velocity-engine-core/pom.xml (original) +++ velocity/engine/trunk/velocity-engine-core/pom.xml Mon Jul 11 10:55:09 2011 @@ -51,11 +51,13 @@ filter artifactcommons-lang:commons-lang/artifact includes - includeorg/apache/commons/lang/Entities*/include - includeorg/apache/commons/lang/StringEscapeUtils*/include - includeorg/apache/commons/lang/StringUtils*/include - includeorg/apache/commons/lang/UnhandledException*/include - includeorg/apache/commons/lang/exception/NestableRuntimeException*/include + includeorg/apache/commons/lang/Entities*.class/include + includeorg/apache/commons/lang/IntHashMap*.class/include + includeorg/apache/commons/lang/StringEscapeUtils.class/include + includeorg/apache/commons/lang/StringUtils.class/include + includeorg/apache/commons/lang/UnhandledException.class/include + includeorg/apache/commons/lang/exception/Nestable.class/include + includeorg/apache/commons/lang/exception/NestableRuntimeException.class/include /includes /filter /filters @@ -144,4 +146,4 @@ /plugin /plugins /reporting -/project \ No newline at end of file +/project
svn commit: r1145142 - in /velocity/tools/trunk: src/site/xdoc/ velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ velocity-tools-generic/src/main/java/org/apache/velocity/tools/ge
Author: cbrisson Date: Mon Jul 11 12:31:48 2011 New Revision: 1145142 URL: http://svn.apache.org/viewvc?rev=1145142view=rev Log: reflet shading of commons-lang and commons-collections packages Modified: velocity/tools/trunk/src/site/xdoc/dependencies.xml velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/PropertiesFactoryConfiguration.java velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/EscapeTool.java velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/WebappLoader.java Modified: velocity/tools/trunk/src/site/xdoc/dependencies.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/site/xdoc/dependencies.xml?rev=1145142r1=1145141r2=1145142view=diff == --- velocity/tools/trunk/src/site/xdoc/dependencies.xml (original) +++ velocity/tools/trunk/src/site/xdoc/dependencies.xml Mon Jul 11 12:31:48 2011 @@ -55,13 +55,6 @@ /td /tr tr - tdcommons-collections/td - td3.1/td - tdYes/td - tdYes/td - tdVelocity requires this./td -/tr -tr tdcommons-digester/td td1.8/td tdYes/td @@ -71,15 +64,6 @@ /td /tr tr - tdcommons-lang/td - td2.1/td - tdYes/td - tdNo/td - tdRequired for -a href=javadoc/org/apache/velocity/tools/generic/EscapeTool.htmlEscapeTool/a - /td -/tr -tr tdcommons-logging/td td1.1/td tdYes/td @@ -140,13 +124,6 @@ /td /tr tr - tdcommons-collections/td - td3.1/td - tdYes/td - tdYes/td - tdVelocity requires this./td -/tr -tr tdcommons-digester/td td1.8/td tdYes/td @@ -156,17 +133,6 @@ /td /tr tr - tdcommons-lang/td - td2.1/td - tdYes/td - tdNo/td - tdRequired for -a href=javadoc/org/apache/velocity/tools/generic/EscapeTool.htmlEscapeTool/a -and -a href=javadoc/org/apache/velocity/tools/view/VelocityViewServlet.htmlVelocityViewServlet/a - /td -/tr -tr tdcommons-logging/td td1.1/td tdYes/td @@ -249,13 +215,6 @@ tdStruts 1.3+ requires this./td /tr tr - tdcommons-collections/td - td3.1/td - tdYes/td - tdYes/td - tdVelocity requires this./td -/tr -tr tdcommons-digester/td td1.8/td tdYes/td @@ -265,17 +224,6 @@ /td /tr tr - tdcommons-lang/td - td2.1/td - tdYes/td - tdYes/td - tdRequired for Struts, -a href=javadoc/org/apache/velocity/tools/generic/EscapeTool.htmlEscapeTool/a -and -a href=javadoc/org/apache/velocity/tools/view/VelocityViewServlet.htmlVelocityViewServlet/a - /td -/tr -tr tdcommons-logging/td td1.1/td tdYes/td Modified: velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/PropertiesFactoryConfiguration.java URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/PropertiesFactoryConfiguration.java?rev=1145142r1=1145141r2=1145142view=diff == --- velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/PropertiesFactoryConfiguration.java (original) +++ velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/PropertiesFactoryConfiguration.java Mon Jul 11 12:31:48 2011 @@ -23,7 +23,7 @@ import java.io.InputStream; import java.io.IOException; import java.util.Iterator; import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.collections.ExtendedProperties; +import
svn commit: r1145144 - /velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/velocity/examples/showcase/ViewToolsIT.java
Author: cbrisson
Date: Mon Jul 11 12:32:02 2011
New Revision: 1145144
URL: http://svn.apache.org/viewvc?rev=1145144view=rev
Log:
fixed showcase webapp broken test
Modified:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/velocity/examples/showcase/ViewToolsIT.java
Modified:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/velocity/examples/showcase/ViewToolsIT.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/velocity/examples/showcase/ViewToolsIT.java?rev=1145144r1=1145143r2=1145144view=diff
==
---
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/velocity/examples/showcase/ViewToolsIT.java
(original)
+++
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/velocity/examples/showcase/ViewToolsIT.java
Mon Jul 11 12:32:02 2011
@@ -306,8 +306,8 @@ public class ViewToolsIT {
/* check getString(bar,foo) */
WebForm form = resp.getFormWithName(getString2);
-form.setParameter(getString1,'bar');
-form.setParameter(getString2,'foo');
+form.setParameter(getString1,bar);
+form.setParameter(getString2,foo);
resp = form.submit();
checkText(resp,getString2,foo);
svn commit: r1145145 - /velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MathTool.java
Author: cbrisson
Date: Mon Jul 11 12:32:14 2011
New Revision: 1145145
URL: http://svn.apache.org/viewvc?rev=1145145view=rev
Log:
MathTool: fixed result type calculations and added bitwise operations
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MathTool.java
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MathTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MathTool.java?rev=1145145r1=1145144r2=1145145view=diff
==
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MathTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MathTool.java
Mon Jul 11 12:32:14 2011
@@ -89,6 +89,21 @@ public class MathTool extends FormatConf
return min(new Object[] { num1, num2 });
}
+public Number bitwiseOr(Object num1, Object num2)
+{
+return bitwiseOr(new Object[] { num1, num2 });
+}
+
+public Number bitwiseAnd(Object num1, Object num2)
+{
+return bitwiseAnd(new Object[] { num1, num2 });
+}
+
+public Number bitwiseXOr(Object num1, Object num2)
+{
+return bitwiseXOr(new Object[] { num1, num2 });
+}
+
/**
* @param nums the numbers to be added
* @return the sum of the numbers or
@@ -99,14 +114,15 @@ public class MathTool extends FormatConf
{
double value = 0;
Number[] ns = new Number[nums.length];
-for (Object num : nums)
+for (int i=0; inums.length; i++)
{
-Number n = toNumber(num);
+Number n = toNumber(nums[i]);
if (n == null)
{
return null;
}
value += n.doubleValue();
+ns[i] = n;
}
return matchType(value, ns);
}
@@ -137,6 +153,7 @@ public class MathTool extends FormatConf
{
value -= n.doubleValue();
}
+ns[i] = n;
}
return matchType(value, ns);
}
@@ -152,14 +169,15 @@ public class MathTool extends FormatConf
{
double value = 1;
Number[] ns = new Number[nums.length];
-for (Object num : nums)
+for (int i=0; inums.length; i++)
{
-Number n = toNumber(num);
+Number n = toNumber(nums[i]);
if (n == null)
{
return null;
}
value *= n.doubleValue();
+ns[i] = n;
}
return matchType(value, ns);
}
@@ -196,6 +214,7 @@ public class MathTool extends FormatConf
}
value /= denominator;
}
+ns[i] = n;
}
return matchType(value, ns);
}
@@ -272,6 +291,79 @@ public class MathTool extends FormatConf
/**
+ * Bitwise Or
+ * @param nums the numbers to be Or'ed
+ * @return the bitwise Or of the numbers or
+ * codenull/code if they're invalid
+ * @see #toInteger
+ */
+public Number bitwiseOr(Object... nums)
+{
+long value = 0;
+Number[] ns = new Number[nums.length];
+for (int i=0; inums.length; i++)
+{
+Long n = toLong(nums[i]);
+if (n == null)
+{
+return null;
+}
+value |= n.longValue();
+ns[i] = n;
+}
+return matchType(value, ns);
+}
+
+/**
+ * Bitwise And
+ * @param nums the numbers to be And'ed
+ * @return the bitwise And of the numbers or
+ * codenull/code if they're invalid
+ * @see #toInteger
+ */
+public Number bitwiseAnd(Object... nums)
+{
+long value = Long.MIN_VALUE;
+Number[] ns = new Number[nums.length];
+for (int i=0; inums.length; i++)
+{
+Long n = toLong(nums[i]);
+if (n == null)
+{
+return null;
+}
+value = n.longValue();
+ns[i] = n;
+}
+return matchType(value, ns);
+}
+
+/**
+ * Bitwise XOr
+ * @param nums the numbers to be XOr'ed
+ * @return the bitwise XOr of the numbers or
+ * codenull/code if they're invalid
+ * @see #toInteger
+ */
+public Number bitwiseXOr(Object... nums)
+{
+long value = 0;
+Number[] ns = new Number[nums.length];
+for (int i=0; inums.length; i++)
+{
+Long n = toLong(nums[i]);
+if (n == null)
+{
+return null;
+}
+value ^= n.longValue();
+ns[i] = n;
+}
+return matchType(value, ns);
+}
+
+
+
svn commit: r1145229 - /velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MathTool.java
Author: cbrisson
Date: Mon Jul 11 16:21:47 2011
New Revision: 1145229
URL: http://svn.apache.org/viewvc?rev=1145229view=rev
Log:
fix bitwise AND
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MathTool.java
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MathTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MathTool.java?rev=1145229r1=1145228r2=1145229view=diff
==
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MathTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MathTool.java
Mon Jul 11 16:21:47 2011
@@ -323,7 +323,7 @@ public class MathTool extends FormatConf
*/
public Number bitwiseAnd(Object... nums)
{
-long value = Long.MIN_VALUE;
+long value = -1;
Number[] ns = new Number[nums.length];
for (int i=0; inums.length; i++)
{
