svn commit: r1418477 - /commons/proper/configuration/trunk/src/test/resources/testExtendedXMLConfigurationProvider.xml
Author: oheger Date: Fri Dec 7 21:12:18 2012 New Revision: 1418477 URL: http://svn.apache.org/viewvc?rev=1418477&view=rev Log: Reverted changes in test file to fix failing tests. Modified: commons/proper/configuration/trunk/src/test/resources/testExtendedXMLConfigurationProvider.xml Modified: commons/proper/configuration/trunk/src/test/resources/testExtendedXMLConfigurationProvider.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testExtendedXMLConfigurationProvider.xml?rev=1418477&r1=1418476&r2=1418477&view=diff == --- commons/proper/configuration/trunk/src/test/resources/testExtendedXMLConfigurationProvider.xml (original) +++ commons/proper/configuration/trunk/src/test/resources/testExtendedXMLConfigurationProvider.xml Fri Dec 7 21:12:18 2012 @@ -18,11 +18,37 @@ + + + + + config-class="org.apache.commons.configuration.DefaultConfigurationBuilder$XMLConfigurationProvider" + configurationClass="org.apache.commons.configuration.TestDefaultConfigurationBuilder$ExtendedXMLConfiguration"/> + + + + table + list + + + - + + + + + + + + + + --> + + \ No newline at end of file
svn commit: r1418420 - /commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Author: sebb Date: Fri Dec 7 18:11:59 2012 New Revision: 1418420 URL: http://svn.apache.org/viewvc?rev=1418420&view=rev Log: Javadoc fixes Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java?rev=1418420&r1=1418419&r2=1418420&view=diff == --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java Fri Dec 7 18:11:59 2012 @@ -1432,8 +1432,8 @@ implements Configurable * it again. The default file type is FTP.ASCII_FILE_TYPE * if this method is never called. * - * N.B. currently calling any connect method will reset the mode to - * ACTIVE_LOCAL_DATA_CONNECTION_MODE. + * N.B. currently calling any connect method will reset the type to + * FTP.ASCII_FILE_TYPE. * @param fileType The _FILE_TYPE constant indcating the * type of file. * @return True if successfully completed, false if not. @@ -1470,8 +1470,8 @@ implements Configurable * is FTP.NON_PRINT_TEXT_FORMAT if this method is never * called. * - * N.B. currently calling any connect method will reset the mode to - * ACTIVE_LOCAL_DATA_CONNECTION_MODE. + * N.B. currently calling any connect method will reset the type to + * FTP.ASCII_FILE_TYPE and the formatOrByteSize to FTP.NON_PRINT_TEXT_FORMAT. * * @param fileType The _FILE_TYPE constant indcating the * type of file. @@ -1503,7 +1503,8 @@ implements Configurable /** * Sets the file structure. The default structure is - * FTP.FILE_STRUCTURE if this method is never called. + * FTP.FILE_STRUCTURE if this method is never called + * or if a connect method is called. * * @param structure The structure of the file (one of the FTP class * _STRUCTURE constants). @@ -1529,7 +1530,8 @@ implements Configurable /** * Sets the transfer mode. The default transfer mode - * FTP.STREAM_TRANSFER_MODE if this method is never called. + * FTP.STREAM_TRANSFER_MODE if this method is never called + * or if a connect method is called. * * @param mode The new transfer mode to use (one of the FTP class * _TRANSFER_MODE constants).
svn commit: r1418323 - /commons/sandbox/jndi/trunk/commons-jndi-browser/pom.xml
Author: jochen
Date: Fri Dec 7 14:14:00 2012
New Revision: 1418323
URL: http://svn.apache.org/viewvc?rev=1418323&view=rev
Log:
Initial import.
Added:
commons/sandbox/jndi/trunk/commons-jndi-browser/pom.xml
Added: commons/sandbox/jndi/trunk/commons-jndi-browser/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/jndi/trunk/commons-jndi-browser/pom.xml?rev=1418323&view=auto
==
--- commons/sandbox/jndi/trunk/commons-jndi-browser/pom.xml (added)
+++ commons/sandbox/jndi/trunk/commons-jndi-browser/pom.xml Fri Dec 7 14:14:00
2012
@@ -0,0 +1,40 @@
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ org.apache.commons
+ 0.1-SNAPSHOT
+ 4.0.0
+ JNDI Tomcat Demo
+ The xDWS Core
+ 2005
+ war
+
+
+
+ org.apache.maven.plugins
+ maven-war-plugin
+ 2.3
+
+
${project.build.directory}/xdws-webapp
+
+
+
+
+
+
+ javax.servlet
+ servlet-api
+ 2.5
+ provided
+
+
+
+ UTF8
+
+ commons-jndi-browser
+
+ org.apache.commons
+ commons-jndi
+ 0.1-SNAPSHOT
+
+
svn commit: r1418319 - in /commons/sandbox/jndi/trunk/commons-jndi-browser/src: ./ main/ main/java/ main/java/org/ main/java/org/apache/ main/java/org/apache/commons/ main/java/org/apache/commons/jndi
Author: jochen
Date: Fri Dec 7 14:05:13 2012
New Revision: 1418319
URL: http://svn.apache.org/viewvc?rev=1418319&view=rev
Log: (empty)
Added:
commons/sandbox/jndi/trunk/commons-jndi-browser/src/
commons/sandbox/jndi/trunk/commons-jndi-browser/src/main/
commons/sandbox/jndi/trunk/commons-jndi-browser/src/main/java/
commons/sandbox/jndi/trunk/commons-jndi-browser/src/main/java/org/
commons/sandbox/jndi/trunk/commons-jndi-browser/src/main/java/org/apache/
commons/sandbox/jndi/trunk/commons-jndi-browser/src/main/java/org/apache/commons/
commons/sandbox/jndi/trunk/commons-jndi-browser/src/main/java/org/apache/commons/jndi/
commons/sandbox/jndi/trunk/commons-jndi-browser/src/main/java/org/apache/commons/jndi/browser/
commons/sandbox/jndi/trunk/commons-jndi-browser/src/main/java/org/apache/commons/jndi/browser/JndiBrowserHelper.java
commons/sandbox/jndi/trunk/commons-jndi-browser/src/main/java/org/apache/commons/jndi/browser/JndiBrowserServlet.java
commons/sandbox/jndi/trunk/commons-jndi-browser/src/main/java/org/apache/commons/jndi/browser/MultiplexingOutputStream.java
commons/sandbox/jndi/trunk/commons-jndi-browser/src/main/java/org/apache/commons/jndi/browser/Strings.java
commons/sandbox/jndi/trunk/commons-jndi-browser/src/main/webapp/
commons/sandbox/jndi/trunk/commons-jndi-browser/src/main/webapp/WEB-INF/
commons/sandbox/jndi/trunk/commons-jndi-browser/src/main/webapp/WEB-INF/web.xml
commons/sandbox/jndi/trunk/commons-jndi-browser/src/test/
commons/sandbox/jndi/trunk/commons-jndi-browser/src/test/java/
commons/sandbox/jndi/trunk/commons-jndi-browser/src/test/java/org/
commons/sandbox/jndi/trunk/commons-jndi-browser/src/test/java/org/apache/
commons/sandbox/jndi/trunk/commons-jndi-browser/src/test/java/org/apache/commons/
commons/sandbox/jndi/trunk/commons-jndi-browser/src/test/java/org/apache/commons/jndi/
commons/sandbox/jndi/trunk/commons-jndi-browser/src/test/java/org/apache/commons/jndi/browser/
commons/sandbox/jndi/trunk/commons-jndi-browser/src/test/java/org/apache/commons/jndi/browser/JndiBrowserTest.java
Added:
commons/sandbox/jndi/trunk/commons-jndi-browser/src/main/java/org/apache/commons/jndi/browser/JndiBrowserHelper.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/jndi/trunk/commons-jndi-browser/src/main/java/org/apache/commons/jndi/browser/JndiBrowserHelper.java?rev=1418319&view=auto
==
---
commons/sandbox/jndi/trunk/commons-jndi-browser/src/main/java/org/apache/commons/jndi/browser/JndiBrowserHelper.java
(added)
+++
commons/sandbox/jndi/trunk/commons-jndi-browser/src/main/java/org/apache/commons/jndi/browser/JndiBrowserHelper.java
Fri Dec 7 14:05:13 2012
@@ -0,0 +1,188 @@
+package org.apache.commons.jndi.browser;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.util.Properties;
+
+import javax.naming.Binding;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.spi.NamingManager;
+import javax.servlet.http.HttpServletRequest;
+
+public class JndiBrowserHelper {
+ private String ctxFactory;
+ private String providerURL;
+ private String properties;
+ private String initialization;
+ private Properties env;
+ private Throwable th;
+ private Context javaEnvCtx;
+
+ public JndiBrowserHelper(HttpServletRequest pRequest) {
+ if (pRequest != null) {
+ ctxFactory =
Strings.notNull(pRequest.getParameter("context-factory"),
System.getProperty(Context.INITIAL_CONTEXT_FACTORY));
+ providerURL =
Strings.notNull(pRequest.getParameter("provider-url"),
System.getProperty(Context.PROVIDER_URL));
+ properties = pRequest.getParameter("properties");
+ initialization =
pRequest.getParameter("initialization");
+ if (Strings.isEmpty(initialization)) {
+ initialization = "NamingManager";
+ }
+ }
+ }
+
+ public Context getInitialContext() {
+ Context ctx = null;
+ try {
+ env = new Properties();
+ if (properties != null && properties.trim().length()
> 0) {
+ final byte[] propBytes =
properties.getBytes("ISO-8859-1");
+ ByteArrayInputStream bais = new
ByteArrayInputStream(propBytes);
+ env.load(bais);
+ bais.close();
+ }
+
svn commit: r1418314 - /commons/sandbox/jndi/trunk/commons-jndi/browser/
Author: jochen Date: Fri Dec 7 13:58:04 2012 New Revision: 1418314 URL: http://svn.apache.org/viewvc?rev=1418314&view=rev Log: Initial import. Added: commons/sandbox/jndi/trunk/commons-jndi/browser/
svn commit: r1418313 - /commons/sandbox/jndi/trunk/commons-jndi-browser/
Author: jochen Date: Fri Dec 7 13:56:28 2012 New Revision: 1418313 URL: http://svn.apache.org/viewvc?rev=1418313&view=rev Log: Initial import. Added: commons/sandbox/jndi/trunk/commons-jndi-browser/
svn commit: r1418284 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java
Author: sebb
Date: Fri Dec 7 11:39:20 2012
New Revision: 1418284
URL: http://svn.apache.org/viewvc?rev=1418284&view=rev
Log:
Avoid compiler warning
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java?rev=1418284&r1=1418283&r2=1418284&view=diff
==
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java
Fri Dec 7 11:39:20 2012
@@ -132,6 +132,7 @@ public abstract class Instruction implem
*
* @param bytes byte sequence to read from
* @param wide "wide" instruction flag
+ * @throws IOException may be thrown if the implementation needs to read
data from the file
*/
protected void initFromFile( ByteSequence bytes, boolean wide ) throws
IOException {
}
svn commit: r1418268 - /commons/proper/bcel/trunk/pom.xml
Author: sebb Date: Fri Dec 7 10:43:42 2012 New Revision: 1418268 URL: http://svn.apache.org/viewvc?rev=1418268&view=rev Log: Now using JIRA Modified: commons/proper/bcel/trunk/pom.xml Modified: commons/proper/bcel/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/pom.xml?rev=1418268&r1=1418267&r2=1418268&view=diff == --- commons/proper/bcel/trunk/pom.xml (original) +++ commons/proper/bcel/trunk/pom.xml Fri Dec 7 10:43:42 2012 @@ -53,6 +53,8 @@ * + BCEL + 12314220 @@ -162,8 +164,8 @@ -bugzilla -https://issues.apache.org/bugzilla +jira +http://issues.apache.org/jira/browse/BCEL
