You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2005/09/11 17:40:30 UTC
svn commit: r280146 - in /jakarta/turbine/core/branches/TURBINE_2_3_BRANCH:
conf/ src/java/org/apache/turbine/util/parser/
src/rttest/testapp/WEB-INF/conf/ src/test-cactus/testapp/WEB-INF/conf/
src/test/org/apache/turbine/services/pull/util/ src/test/o...
Author: henning
Date: Sun Sep 11 08:40:20 2005
New Revision: 280146
URL: http://svn.apache.org/viewcvs?rev=280146&view=rev
Log:
Fix up licenses and a number of trailing blanks.
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/CodeWrestler.excludes
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/rttest/testapp/WEB-INF/conf/TurbineCacheTest.properties
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/services/pull/util/UIManagerTest.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/parser/BaseValueParserTest.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/parser/PropertyBean.java
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/CodeWrestler.excludes
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/CodeWrestler.excludes?rev=280146&r1=280145&r2=280146&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/CodeWrestler.excludes (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/CodeWrestler.excludes Sun Sep 11 08:40:20 2005
@@ -11,3 +11,4 @@
conf/openldap/turbine\.schema$
conf/openldap/turbine\.ldif$
conf/openldap/slapd\.conf$
+/target/
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties?rev=280146&r1=280145&r2=280146&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties Sun Sep 11 08:40:20 2005
@@ -438,7 +438,7 @@
# instantiated for the request only anyway).
services.PullService.tools.per.request.refresh=true
-# Path to the resources of the application tools, relative to the
+# Path to the resources of the application tools, relative to the
# application root
#services.PullService.tools.resources.dir=/resources/
@@ -544,8 +544,8 @@
#
# The ui tool normally returns absolute URIs.
-# Setting this property to true allows you to change the behaviour if you
-# want only relative URIs (e.g. if you run behind a reverse proxy or a load
+# Setting this property to true allows you to change the behaviour if you
+# want only relative URIs (e.g. if you run behind a reverse proxy or a load
# balancer).
#tool.ui.want.relative=false
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java?rev=280146&r1=280145&r2=280146&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java Sun Sep 11 08:40:20 2005
@@ -396,7 +396,7 @@
}
/**
- * This method is only used in toString() and can be used by
+ * This method is only used in toString() and can be used by
* derived classes to add their local parameters to the toString()
* @param name A string with the name
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/rttest/testapp/WEB-INF/conf/TurbineCacheTest.properties
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/rttest/testapp/WEB-INF/conf/TurbineCacheTest.properties?rev=280146&r1=280145&r2=280146&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/rttest/testapp/WEB-INF/conf/TurbineCacheTest.properties (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/rttest/testapp/WEB-INF/conf/TurbineCacheTest.properties Sun Sep 11 08:40:20 2005
@@ -529,7 +529,7 @@
# instantiated for the request only anyway).
services.PullService.tools.per.request.refresh=true
-# Path to the resources of the application tools, relative to the
+# Path to the resources of the application tools, relative to the
# application root
#services.PullService.tools.resources.dir=/resources/
@@ -621,8 +621,8 @@
#
# The ui tool normally returns absolute URIs.
-# Setting this property to true allows you to change the behaviour if you
-# want only relative URIs (e.g. if you run behind a reverse proxy or a load
+# Setting this property to true allows you to change the behaviour if you
+# want only relative URIs (e.g. if you run behind a reverse proxy or a load
# balancer).
#tool.ui.want.relative=false
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties?rev=280146&r1=280145&r2=280146&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties Sun Sep 11 08:40:20 2005
@@ -386,7 +386,7 @@
# instantiated for the request only anyway).
services.PullService.tools.per.request.refresh=true
-# Path to the resources of the application tools, relative to the
+# Path to the resources of the application tools, relative to the
# application root
#services.PullService.tools.resources.dir=/resources/
@@ -474,8 +474,8 @@
#
# The ui tool normally returns absolute URIs.
-# Setting this property to true allows you to change the behaviour if you
-# want only relative URIs (e.g. if you run behind a reverse proxy or a load
+# Setting this property to true allows you to change the behaviour if you
+# want only relative URIs (e.g. if you run behind a reverse proxy or a load
# balancer).
#tool.ui.want.relative=false
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/services/pull/util/UIManagerTest.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/services/pull/util/UIManagerTest.java?rev=280146&r1=280145&r2=280146&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/services/pull/util/UIManagerTest.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/services/pull/util/UIManagerTest.java Sun Sep 11 08:40:20 2005
@@ -1,13 +1,5 @@
package org.apache.turbine.services.pull.util;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.turbine.services.pull.PullService;
-import org.apache.turbine.services.pull.TurbinePull;
-import org.apache.turbine.test.BaseTurbineTest;
-import org.apache.velocity.context.Context;
-
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
@@ -23,6 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.turbine.services.pull.PullService;
+import org.apache.turbine.services.pull.TurbinePull;
+import org.apache.turbine.test.BaseTurbineTest;
+import org.apache.velocity.context.Context;
+
public class UIManagerTest
extends BaseTurbineTest
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/parser/BaseValueParserTest.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/parser/BaseValueParserTest.java?rev=280146&r1=280145&r2=280146&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/parser/BaseValueParserTest.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/parser/BaseValueParserTest.java Sun Sep 11 08:40:20 2005
@@ -121,7 +121,7 @@
vp.add("bar", "foo");
assertEquals("Wrong number of keys", 2, vp.keySet().size());
-
+
vp.add("bar", "baz");
assertEquals("Wrong number of keys", 2, vp.keySet().size());
@@ -422,9 +422,9 @@
public void testStringArray()
{
ValueParser vp = new BaseValueParser();
-
+
assertEquals("Wrong number of keys", 0, vp.keySet().size());
-
+
String [] testValue = new String [] {
"foo", "bar", "baz"
};
@@ -487,7 +487,7 @@
// Test removing null value
assertNull(vp.remove(null));
}
-
+
public void testRemoveArray()
{
ValueParser vp = new BaseValueParser();
@@ -663,9 +663,9 @@
public void testDoubleArray()
{
ValueParser vp = new BaseValueParser();
-
+
assertEquals("Wrong number of keys", 0, vp.keySet().size());
-
+
double [] testValue = {
1.0, 2.0, 3.0
};
@@ -731,9 +731,9 @@
public void testFloatArray()
{
ValueParser vp = new BaseValueParser();
-
+
assertEquals("Wrong number of keys", 0, vp.keySet().size());
-
+
float [] testValue = {
1.0f, 2.0f, 3.0f
};
@@ -799,9 +799,9 @@
public void testBigDecimalArray()
{
ValueParser vp = new BaseValueParser();
-
+
assertEquals("Wrong number of keys", 0, vp.keySet().size());
-
+
long [] testValue = {
12345678,87654321,1092837465,
};
@@ -847,9 +847,9 @@
public void testIntegerArray()
{
ValueParser vp = new BaseValueParser();
-
+
assertEquals("Wrong number of keys", 0, vp.keySet().size());
-
+
int [] testValue = {
1, 2, 3
};
@@ -915,9 +915,9 @@
public void testLongArray()
{
ValueParser vp = new BaseValueParser();
-
+
assertEquals("Wrong number of keys", 0, vp.keySet().size());
-
+
long [] testValue = {
1l, 2l, 3l
};
@@ -984,9 +984,9 @@
throws Exception
{
ValueParser vp = new BaseValueParser();
-
+
assertEquals("Wrong number of keys", 0, vp.keySet().size());
-
+
String testValue = "abcdefg";
vp.add("foo", testValue);
@@ -1008,7 +1008,7 @@
public void testByte()
{
ValueParser vp = new BaseValueParser();
-
+
assertEquals("Wrong number of keys", 0, vp.keySet().size());
String [] testValue = {
@@ -1016,7 +1016,7 @@
"0", "-127", "100"
};
-
+
for (int i = 0; i < testValue.length; i++)
{
vp.add("foo" + i, testValue[i]);
@@ -1043,7 +1043,7 @@
public void testStringDefault()
{
ValueParser vp = new BaseValueParser();
-
+
assertEquals("Wrong number of keys", 0, vp.keySet().size());
vp.add("foo", "bar");
@@ -1068,7 +1068,7 @@
vp.add("bar", "foo");
assertEquals("Wrong number of keys", 2, vp.keySet().size());
-
+
vp.add("bar", "baz");
assertEquals("Wrong number of keys", 2, vp.keySet().size());
@@ -1100,7 +1100,7 @@
vp.add("bar", "foo");
assertEquals("Wrong number of keys", 2, vp.keySet().size());
-
+
vp.add("bar", "baz");
assertEquals("Wrong number of keys", 2, vp.keySet().size());
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/parser/PropertyBean.java
URL: http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/parser/PropertyBean.java?rev=280146&r1=280145&r2=280146&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/parser/PropertyBean.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/parser/PropertyBean.java Sun Sep 11 08:40:20 2005
@@ -1,5 +1,21 @@
package org.apache.turbine.util.parser;
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
public class PropertyBean
{
private int intValue;
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org