svn commit: r1170067 - in /commons/sandbox/runtime/trunk/src/main/native: Makefile.unx.in include/acr/ssl.h modules/openssl/api.c modules/openssl/bio.c modules/openssl/ctx.c
Author: mturk
Date: Tue Sep 13 07:36:52 2011
New Revision: 1170067
URL: http://svn.apache.org/viewvc?rev=1170067&view=rev
Log:
Add ssl BIO wrapper and missing api
Added:
commons/sandbox/runtime/trunk/src/main/native/modules/openssl/bio.c (with
props)
Modified:
commons/sandbox/runtime/trunk/src/main/native/Makefile.unx.in
commons/sandbox/runtime/trunk/src/main/native/include/acr/ssl.h
commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c
commons/sandbox/runtime/trunk/src/main/native/modules/openssl/ctx.c
Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.unx.in
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.unx.in?rev=1170067&r1=1170066&r2=1170067&view=diff
==
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.unx.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.unx.in Tue Sep 13
07:36:52 2011
@@ -150,6 +150,7 @@ LIBSOURCES=\
SSLSOURCES=\
$(TOPDIR)/modules/openssl/api.c \
+ $(TOPDIR)/modules/openssl/bio.c \
$(TOPDIR)/modules/openssl/ctx.c \
$(TOPDIR)/modules/openssl/init.c \
$(TOPDIR)/modules/openssl/password.c \
Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr/ssl.h
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr/ssl.h?rev=1170067&r1=1170066&r2=1170067&view=diff
==
--- commons/sandbox/runtime/trunk/src/main/native/include/acr/ssl.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr/ssl.h Tue Sep 13
07:36:52 2011
@@ -278,8 +278,6 @@ typedef struct acr_ssl_ctxt_t {
X509_STORE *crl;
/* pointer to the context verify store */
X509_STORE *store;
-const char *cert_files[SSL_AIDX_MAX];
-const char *key_files[SSL_AIDX_MAX];
X509*certs[SSL_AIDX_MAX];
EVP_PKEY*keys[SSL_AIDX_MAX];
@@ -287,7 +285,6 @@ typedef struct acr_ssl_ctxt_t {
int shutdown_type;
char*rand_file;
-const char *cipher_suite;
/* for client or downstream server authentication */
int verify_depth;
int verify_mode;
@@ -301,14 +298,14 @@ typedef struct acr_ssl_ctxt_t {
int stapling_fake_trylater;
int stapling_errcache_timeout;
acr_time_t stapling_responder_timeout;
-const char *stapling_force_url;
+char*stapling_force_url;
#endif
int ocsp_enabled; /* true if OCSP verification enabled
*/
int ocsp_force_default; /* true if the default responder URL
is
* used regardless of per-cert URL
*/
-const char *ocsp_responder; /* default responder URL */
+char*ocsp_responder; /* default responder URL */
long ocsp_resptime_skew;
long ocsp_resp_maxage;
acr_time_t ocsp_responder_timeout;
Modified: commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c?rev=1170067&r1=1170066&r2=1170067&view=diff
==
--- commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c
(original)
+++ commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c Tue Sep
13 07:36:52 2011
@@ -86,9 +86,13 @@ struct SSLAPIst {
/*** BIO ***/
long(*fpBIO_ctrl)(BIO *, int, long, void *);
int (*fpBIO_free)(BIO *);
+void(*fpBIO_free_all)(BIO *);
BIO*(*fpBIO_new)(BIO_METHOD *);
BIO*(*fpBIO_new_file)(const char *, const char *);
BIO*(*fpBIO_new_fp)(FILE *, int);
+BIO*(*fpBIO_push)(BIO *, BIO *);
+
+BIO_METHOD* (*fpBIO_f_base64)(void);
BIO_METHOD* (*fpBIO_s_file)(void);
BIO_METHOD* (*fpBIO_s_mem)(void);
int (*fpBIO_printf)(BIO *, const char *, ...);
@@ -98,6 +102,8 @@ struct SSLAPIst {
BIGNUM* (*fpBN_bin2bn)(const unsigned char *, int, BIGNUM *);
/*** CRYPTO ***/
+void(*fpCRYPTO_free)(void *);
+void* (*fpCRYPTO_malloc)(int, const char *, int);
int (*fpCRYPTO_num_locks)(void);
void(*fpCRYPTO_set_dynlock_create_callback)(struct
CRYPTO_dynlock_value *(*)(const char *, int));
void(*fpCRYPTO_set_dynlock_lock_callback)(void (*)(int,
struct CRYPTO_dynlock_value *, const char *, int));
@@ -111,11 +117,15 @@ struct SSLAPIst {
Nexus: Promotion Completed.
Description:Release Commons Daemon 1.0.6Details:The following artifacts have been promoted to the Releases repository.commons-daemon-1.0.6.pomcommons-daemon-1.0.6-sources.jarcommons-daemon-1.0.6.pom.asccommons-daemon-1.0.6.jar.asccommons-daemon-1.0.6.jarcommons-daemon-1.0.6-javadoc.jar.asccommons-daemon-1.0.6-sources.jar.asccommons-daemon-1.0.6-javadoc.jararchetype-catalog.xml
Nexus: Promotion Completed.
Description:Release Commons Daemon 1.0.7Details:The following artifacts have been promoted to the Releases repository.commons-daemon-1.0.7-sources.jarcommons-daemon-1.0.7-sources.jar.asccommons-daemon-1.0.7.pom.asccommons-daemon-1.0.7-javadoc.jarcommons-daemon-1.0.7-javadoc.jar.asccommons-daemon-1.0.7.jarcommons-daemon-1.0.7.jar.asccommons-daemon-1.0.7.pomarchetype-catalog.xml
svn commit: r1170197 - in /commons/proper/jexl/trunk/src: main/java/org/apache/commons/jexl2/ test/java/org/apache/commons/jexl2/
Author: henrib
Date: Tue Sep 13 14:36:46 2011
New Revision: 1170197
URL: http://svn.apache.org/viewvc?rev=1170197&view=rev
Log:
Moved bitwise operations to JexlArithmetic (so they can be overriden);
Fixed small issue in Debugger that was not quoting identifiers that needed it;
Fixed issue in Interpreter that was reporting undefined variables when
registers used as references contained null
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Debugger.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlArithmetic.java
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IssuesTest.java
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Debugger.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Debugger.java?rev=1170197&r1=1170196&r2=1170197&view=diff
==
---
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Debugger.java
(original)
+++
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Debugger.java
Tue Sep 13 14:36:46 2011
@@ -16,6 +16,7 @@
*/
package org.apache.commons.jexl2;
+import java.util.regex.Pattern;
import org.apache.commons.jexl2.parser.ASTAdditiveNode;
import org.apache.commons.jexl2.parser.ASTAdditiveOperator;
import org.apache.commons.jexl2.parser.ASTAmbiguous;
@@ -401,9 +402,17 @@ final class Debugger implements ParserVi
return infixChildren(node, " > ", false, data);
}
+// check identifiers that contain space, quote, double-quotes or backspace
+private static final Pattern QUOTED_IDENTIFIER =
Pattern.compile("['\"\\s]");
+
/** {@inheritDoc} */
public Object visit(ASTIdentifier node, Object data) {
-return check(node, node.image, data);
+String image = node.image;
+if (QUOTED_IDENTIFIER.matcher(image).find()) {
+// quote it
+image = "'" + node.image.replace("'", "\\'") + "'";
+}
+return check(node, image, data);
}
/** {@inheritDoc} */
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java?rev=1170197&r1=1170196&r2=1170197&view=diff
==
---
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java
(original)
+++
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java
Tue Sep 13 14:36:46 2011
@@ -251,7 +251,7 @@ public class Interpreter implements Pars
* @return the left, right or parent node
*/
protected JexlNode findNullOperand(RuntimeException xrt, JexlNode node,
Object left, Object right) {
-if (xrt instanceof NullPointerException
+if (xrt instanceof ArithmeticException
&& (Object) JexlException.NULL_OPERAND == xrt.getMessage()) {
if (left == null) {
return node.jjtGetChild(0);
@@ -377,7 +377,7 @@ public class Interpreter implements Pars
throw new UnsupportedOperationException("unknown operator
" + which);
}
throw new IllegalArgumentException("unknown operator " + op);
-} catch (RuntimeException xrt) {
+} catch (ArithmeticException xrt) {
JexlNode xnode = findNullOperand(xrt, node, left, right);
throw new JexlException(xnode, "+/- error", xrt);
}
@@ -407,7 +407,7 @@ public class Interpreter implements Pars
if (!rightValue) {
return Boolean.FALSE;
}
-} catch (RuntimeException xrt) {
+} catch (ArithmeticException xrt) {
throw new JexlException(node.jjtGetChild(1), "boolean coercion
error", xrt);
}
return Boolean.TRUE;
@@ -585,15 +585,10 @@ public class Interpreter implements Pars
public Object visit(ASTBitwiseAndNode node, Object data) {
Object left = node.jjtGetChild(0).jjtAccept(this, data);
Object right = node.jjtGetChild(1).jjtAccept(this, data);
-int n = 0;
-// coerce these two values longs and 'and'.
try {
-long l = arithmetic.toLong(left);
-n = 1;
-long r = arithmetic.toLong(right);
-return Long.valueOf(l & r);
-} catch (RuntimeException xrt) {
-throw new JexlException(node.jjtGetChild(n), "long coercion
error", xrt);
+return arithmetic.bitwiseAnd(left, right);
+} catch (ArithmeticException xrt) {
+throw new JexlException(node, "& error", xrt);
}
}
@@ -601,10 +596,9 @@ public class
svn commit: r1170317 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/DoUntil.java
Author: simonetripodi
Date: Tue Sep 13 19:36:50 2011
New Revision: 1170317
URL: http://svn.apache.org/viewvc?rev=1170317&view=rev
Log:
fixed checkstyle violation: Method 'run' is not designed for extension - needs
to be abstract, final or empty.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/DoUntil.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/DoUntil.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/DoUntil.java?rev=1170317&r1=1170316&r2=1170317&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/DoUntil.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/DoUntil.java
Tue Sep 13 19:36:50 2011
@@ -43,7 +43,7 @@ public class DoUntil extends PredicatedL
/**
* {@inheritDoc}
*/
-public void run() {
+public final void run() {
do {
getBody().run();
} while (!getTest().test());
svn commit: r1170319 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/DoWhile.java
Author: simonetripodi
Date: Tue Sep 13 19:39:33 2011
New Revision: 1170319
URL: http://svn.apache.org/viewvc?rev=1170319&view=rev
Log:
fixed checkstyle violation: Method 'run' is not designed for extension - needs
to be abstract, final or empty.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/DoWhile.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/DoWhile.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/DoWhile.java?rev=1170319&r1=1170318&r2=1170319&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/DoWhile.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/DoWhile.java
Tue Sep 13 19:39:33 2011
@@ -43,7 +43,7 @@ public class DoWhile extends PredicatedL
/**
* {@inheritDoc}
*/
-public void run() {
+public final void run() {
do {
getBody().run();
} while (getTest().test());
svn commit: r1170326 - in /commons/sandbox/runtime/trunk/src/main: java/org/apache/commons/runtime/ssl/ native/include/acr/ native/modules/openssl/
Author: mturk
Date: Tue Sep 13 19:59:36 2011
New Revision: 1170326
URL: http://svn.apache.org/viewvc?rev=1170326&view=rev
Log:
Create almost complete ssl context
Modified:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/SSLContext.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/SSLProtocolMethod.java
commons/sandbox/runtime/trunk/src/main/native/include/acr/ssl.h
commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c
commons/sandbox/runtime/trunk/src/main/native/modules/openssl/ctx.c
commons/sandbox/runtime/trunk/src/main/native/modules/openssl/init.c
commons/sandbox/runtime/trunk/src/main/native/modules/openssl/password.c
commons/sandbox/runtime/trunk/src/main/native/modules/openssl/util.c
Modified:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/SSLContext.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/SSLContext.java?rev=1170326&r1=1170325&r2=1170326&view=diff
==
---
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/SSLContext.java
(original)
+++
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/SSLContext.java
Tue Sep 13 19:59:36 2011
@@ -33,13 +33,19 @@ public final class SSLContext extends Na
// Hide NativePointer
private final long pointer = 0L;
-private static native long new0();
+private static native long new0(int protocol, int mode);
+
+private SSLContext()
+{
+// No instance
+}
+
/**
* Creates a new object instance.
*/
-public SSLContext()
+public SSLContext(SSLProtocolMethod method, SSLProtocolMode mode)
{
-super.pointer = new0();
+super.pointer = new0(method.valueOf(), mode.valueOf());
}
}
Modified:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/SSLProtocolMethod.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/SSLProtocolMethod.java?rev=1170326&r1=1170325&r2=1170326&view=diff
==
---
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/SSLProtocolMethod.java
(original)
+++
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/SSLProtocolMethod.java
Tue Sep 13 19:59:36 2011
@@ -42,9 +42,17 @@ public enum SSLProtocolMethod
*/
TLSv1( 4),
/**
+ * TLSv1.1.
+ */
+TLSv11( 5),
+/**
+ * TLSv1.2.
+ */
+TLSv12( 6),
+/**
* DTLSv1.0.
*/
-DTLSv1( 5);
+DTLSv1( 7);
private int value;
private SSLProtocolMethod(int v)
Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr/ssl.h
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr/ssl.h?rev=1170326&r1=1170325&r2=1170326&view=diff
==
--- commons/sandbox/runtime/trunk/src/main/native/include/acr/ssl.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr/ssl.h Tue Sep 13
19:59:36 2011
@@ -157,7 +157,9 @@
#define SSL_PROTOCOL_SSLV3 2
#define SSL_PROTOCOL_SSLV23 3
#define SSL_PROTOCOL_TLSV1 4
-#define SSL_PROTOCOL_DTLSV1 5
+#define SSL_PROTOCOL_TLSV11 5
+#define SSL_PROTOCOL_TLSV12 6
+#define SSL_PROTOCOL_DTLSV1 7
#define SSL_MODE_CLIENT 0
#define SSL_MODE_SERVER 1
@@ -166,6 +168,7 @@
#define SSL_BIO_FLAG_RDONLY 1
#define SSL_BIO_FLAG_CALLBACK 2
#define SSL_DEFAULT_CACHE_SIZE 256
+#define SSL_DEFAULT_VHOST_NAME "unknown:443"
#define SSL_MAX_STR_LEN 2048
#define SSL_CVERIFY_UNSET (-1)
@@ -361,6 +364,7 @@ voidssl_init_app_data2_idx(void)
void *ssl_get_app_data2(SSL *);
voidssl_set_app_data2(SSL *, void *);
int ssl_password_callback(char *, int, int, void *);
+int ssl_no_password_callback(char *buf, int bufsiz, int verify, void
*cb);
voidssl_bio_close(BIO *);
voidssl_bio_doref(BIO *);
DH *ssl_dh_get_tmp_param(int);
@@ -372,6 +376,7 @@ voidssl_vhost_algo_id(const unsi
int ssl_ctx_use_certificate_chain(SSL_CTX *, const char *, int);
int ssl_callback_ssl_verify(int, X509_STORE_CTX *);
int ssl_rand_seed(const char *file);
+voidssl_throw_errno(JNI_STDENV, int cls);
#endif
#endif /* _ACR_SSL_H_ */
Modified: commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c?rev=1170326&r1=1170325&r2=1170326&view=diff
svn commit: r1170340 - /commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/impl/ContextBase.java
Author: simonetripodi
Date: Tue Sep 13 20:42:09 2011
New Revision: 1170340
URL: http://svn.apache.org/viewvc?rev=1170340&view=rev
Log:
ConcurrentHashMap#put(K, V) method doesn't allow neither the key nor the value
be null, managed null values for retro-compatibility (old users would be maybe
used to set null values)
Modified:
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/impl/ContextBase.java
Modified:
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/impl/ContextBase.java
URL:
http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/impl/ContextBase.java?rev=1170340&r1=1170339&r2=1170340&view=diff
==
---
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/impl/ContextBase.java
(original)
+++
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/impl/ContextBase.java
Tue Sep 13 20:42:09 2011
@@ -325,6 +325,17 @@ public class ContextBase extends Concurr
* have both a read method and a write method
*/
public Object put(String key, Object value) {
+/*
+ * ConcurrentHashMap doesn't accept null values, see
+ *
http://download.oracle.com/javase/1.5.0/docs/api/java/util/concurrent/ConcurrentHashMap.html#put(K,
V)
+ */
+if (value == null) {
+if (containsKey(key)) {
+remove(key);
+}
+
+return null;
+}
// Case 1 -- no local properties
if (descriptors == null) {
svn commit: r1170351 - in /commons/proper/codec/trunk/src/java/org/apache/commons/codec: ./ binary/ language/ net/
Author: ggregory
Date: Tue Sep 13 21:09:09 2011
New Revision: 1170351
URL: http://svn.apache.org/viewvc?rev=1170351&view=rev
Log:
Apply patch from [CODEC-128] Documentation spelling fixes.
https://issues.apache.org/jira/secure/attachment/12494312/codec-spelling.patch
Modified:
commons/proper/codec/trunk/src/java/org/apache/commons/codec/CharEncoding.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/Encoder.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringEncoder.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/StringUtils.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/ColognePhonetic.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/RefinedSoundex.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QCodec.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/RFC1522Codec.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/package.html
Modified:
commons/proper/codec/trunk/src/java/org/apache/commons/codec/CharEncoding.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/CharEncoding.java?rev=1170351&r1=1170350&r2=1170351&view=diff
==
---
commons/proper/codec/trunk/src/java/org/apache/commons/codec/CharEncoding.java
(original)
+++
commons/proper/codec/trunk/src/java/org/apache/commons/codec/CharEncoding.java
Tue Sep 13 21:09:09 2011
@@ -45,7 +45,7 @@ package org.apache.commons.codec;
*
*
* This perhaps would best belong in the [lang] project. Even if a similar
interface is defined in [lang], it is not
- * forseen that [codec] would be made to depend on [lang].
+ * foreseen that [codec] would be made to depend on [lang].
*
* @see http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html";>Standard
charsets
* @author Apache Software Foundation
Modified:
commons/proper/codec/trunk/src/java/org/apache/commons/codec/Encoder.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/Encoder.java?rev=1170351&r1=1170350&r2=1170351&view=diff
==
--- commons/proper/codec/trunk/src/java/org/apache/commons/codec/Encoder.java
(original)
+++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/Encoder.java
Tue Sep 13 21:09:09 2011
@@ -33,7 +33,7 @@ public interface Encoder {
* as an Object. The Objects here may just be byte[]
* or Strings depending on the implementation used.
*
- * @param source An object ot encode
+ * @param source An object to encode
*
* @return An "encoded" Object
*
Modified:
commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringEncoder.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringEncoder.java?rev=1170351&r1=1170350&r2=1170351&view=diff
==
---
commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringEncoder.java
(original)
+++
commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringEncoder.java
Tue Sep 13 21:09:09 2011
@@ -33,7 +33,7 @@ public interface StringEncoder extends E
* @return the encoded String
*
* @throws EncoderException thrown if there is
- * an error conidition during the Encoding process.
+ * an error condition during the encoding process.
*/
String encode(String source) throws EncoderException;
}
Modified:
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/StringUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/StringUtils.java?rev=1170351&r1=1170350&r2=1170351&view=diff
==
---
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/StringUtils.java
(original)
+++
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/StringUtils.java
Tue Sep 13 21:09:09 2011
@@ -175,7 +175,7 @@ public class StringUtils {
* @param charsetName
*The name of a required {@link java.nio.charset.Charset}
* @return A new String decoded from the specified array of
bytes using the given charset,
- * or null if the input byte arrray was
null.
+ * or null if the input byte array was
null.
* @throws IllegalStateException
* Thrown when a {@link UnsupportedEncodingException} is
caught, which should never happen for a
* required charset name.
Modified:
commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/ColognePhonetic.java
URL:
http://svn.apache.org/v
svn commit: r1170355 - /commons/proper/codec/trunk/src/changes/changes.xml
Author: ggregory Date: Tue Sep 13 21:15:46 2011 New Revision: 1170355 URL: http://svn.apache.org/viewvc?rev=1170355&view=rev Log: Add entry for [CODEC-128] Documentation spelling fixes. Modified: commons/proper/codec/trunk/src/changes/changes.xml Modified: commons/proper/codec/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/changes/changes.xml?rev=1170355&r1=1170354&r2=1170355&view=diff == --- commons/proper/codec/trunk/src/changes/changes.xml (original) +++ commons/proper/codec/trunk/src/changes/changes.xml Tue Sep 13 21:15:46 2011 @@ -26,6 +26,9 @@ org.apache.commons.codec.net.URLCodec charset field final. --> + +Documentation spelling fixes. + Fix various character encoding issues in comments and test cases.
svn commit: r1170368 - /commons/proper/chain/trunk/pom.xml
Author: sebb Date: Tue Sep 13 22:23:06 2011 New Revision: 1170368 URL: http://svn.apache.org/viewvc?rev=1170368&view=rev Log: Remove Java 1.5 profile. It was originally a profile to support Java 1.3, but 1.3 was accidentally changed to 1.5 in r1162332, as part of the move to Java 1.5 (global edit error). There's no need to revert profile to 1.3 as we don't support that Java version any more, so just rm. Modified: commons/proper/chain/trunk/pom.xml Modified: commons/proper/chain/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/pom.xml?rev=1170368&r1=1170367&r2=1170368&view=diff == --- commons/proper/chain/trunk/pom.xml (original) +++ commons/proper/chain/trunk/pom.xml Tue Sep 13 22:23:06 2011 @@ -241,36 +241,6 @@ - - - -java-1.5 - - -xml-apis -xml-apis -2.0.2 - - -xerces -xercesImpl -2.2.1 -test - - - - - -maven-surefire-plugin - -always - - - - - - -
