Author: sagara
Date: Fri Mar 30 13:40:27 2012
New Revision: 1307411
URL: http://svn.apache.org/viewvc?rev=1307411&view=rev
Log:
Applied patch for AXIS2-4978.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/IoUtil.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarResourceLocation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/IOUtils.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/wizardframe/WizardFrame.java
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/RepoHelper.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java?rev=1307411&r1=1307410&r2=1307411&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java
Fri Mar 30 13:40:27 2012
@@ -471,6 +471,12 @@ public class Constants extends org.apach
*/
public static final String
ENABLE_CHILD_FIRST_CLASS_LOADING="EnableChildFirstClassLoading";
+
+ /**
+ * Specify buffer size to used in various data copy operations.
+ */
+ public static final String DATA_BUFFER_SIZE="DataBufferSize";
+ public static final int DEFAULT_DATA_BUFFER_SIZE=2048;
}
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/IoUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/IoUtil.java?rev=1307411&r1=1307410&r2=1307411&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/IoUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/IoUtil.java
Fri Mar 30 13:40:27 2012
@@ -24,6 +24,8 @@ import java.io.Reader;
import java.io.Writer;
import java.util.jar.JarFile;
+import org.apache.axis2.Constants;
+
/**
* @version $Rev$ $Date$
*/
@@ -33,7 +35,7 @@ public final class IoUtil {
public static byte[] getBytes(InputStream inputStream) throws IOException {
try {
- byte[] buffer = new byte[4096];
+ byte[] buffer = new
byte[2*Constants.Configuration.DEFAULT_DATA_BUFFER_SIZE];
ByteArrayOutputStream out = new ByteArrayOutputStream();
for (int count = inputStream.read(buffer); count >= 0; count =
inputStream.read(buffer)) {
out.write(buffer, 0, count);
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarResourceLocation.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarResourceLocation.java?rev=1307411&r1=1307410&r2=1307411&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarResourceLocation.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarResourceLocation.java
Fri Mar 30 13:40:27 2012
@@ -30,6 +30,8 @@ import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
import java.util.zip.ZipException;
+import org.apache.axis2.Constants;
+
/**
* @version $Rev$ $Date$
*/
@@ -48,7 +50,7 @@ public class JarResourceLocation extends
try {
is = new FileInputStream(cacheFile);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- byte[] buffer = new byte[2048];
+ byte[] buffer = new
byte[Constants.Configuration.DEFAULT_DATA_BUFFER_SIZE];
int bytesRead = -1;
while ((bytesRead = is.read(buffer)) != -1) {
baos.write(buffer, 0, bytesRead);
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/IOUtils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/IOUtils.java?rev=1307411&r1=1307410&r2=1307411&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/IOUtils.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/IOUtils.java
Fri Mar 30 13:40:27 2012
@@ -23,6 +23,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import org.apache.axis2.Constants;
+
public class IOUtils {
/**
@@ -33,7 +35,7 @@ public class IOUtils {
* @param close close input and output stream
*/
public static void copy(InputStream in, OutputStream out, boolean close)
throws IOException {
- byte[] buffer = new byte[4096];
+ byte[] buffer = new
byte[2*Constants.Configuration.DEFAULT_DATA_BUFFER_SIZE];
int count;
try {
while ((count = in.read(buffer)) > 0) {
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java?rev=1307411&r1=1307410&r2=1307411&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
Fri Mar 30 13:40:27 2012
@@ -19,6 +19,7 @@
package org.apache.axis2.tool.codegen.eclipse;
+import org.apache.axis2.Constants;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
import org.apache.axis2.tool.codegen.WSDL2JavaGenerator;
@@ -584,7 +585,7 @@ public class CodeGenWizard extends Wizar
out = new FileOutputStream(dst);
// Transfer bytes from in to out
- byte[] buf = new byte[1024];
+ byte[] buf = new
byte[Constants.Configuration.DEFAULT_DATA_BUFFER_SIZE];
int len;
while ((len = in.read(buf)) > 0) {
out.write(buf, 0, len);
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/wizardframe/WizardFrame.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/wizardframe/WizardFrame.java?rev=1307411&r1=1307410&r2=1307411&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/wizardframe/WizardFrame.java
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/wizardframe/WizardFrame.java
Fri Mar 30 13:40:27 2012
@@ -20,6 +20,8 @@
package org.apache.axis2.tools.wizardframe;
import com.intellij.openapi.project.Project;
+
+import org.apache.axis2.Constants;
import org.apache.axis2.tools.bean.CodegenBean;
import org.apache.axis2.tools.bean.SrcCompiler;
import org.apache.axis2.tools.bean.WsdlgenBean;
@@ -325,7 +327,7 @@ public class WizardFrame extends JFrame
OutputStream out = new FileOutputStream(dst);
// Transfer bytes from in to out
- byte[] buf = new byte[1024];
+ byte[] buf = new
byte[Constants.Configuration.DEFAULT_DATA_BUFFER_SIZE];
int len;
while ((len = in.read(buf)) > 0) {
out.write(buf, 0, len);
Modified:
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java?rev=1307411&r1=1307410&r2=1307411&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java
(original)
+++
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java
Fri Mar 30 13:40:27 2012
@@ -80,6 +80,11 @@ public class SimpleHttpServerMojo extend
* @parameter
*/
private String port;
+
+ /**
+ * @parameter default-value="1024"
+ */
+ private int dataBufferSize;
/*
* Maven project parameters
@@ -140,6 +145,11 @@ public class SimpleHttpServerMojo extend
+ ".jar";
repoHelper.setServiceJarLocation(serviceJarFile);
}
+ if(dataBufferSize > 0){
+ repoHelper.setDataBufferSize(dataBufferSize);
+ } else {
+
repoHelper.setDataBufferSize(org.apache.axis2.Constants.Configuration.DEFAULT_DATA_BUFFER_SIZE);
+ }
return repoHelper;
}
Modified:
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/RepoHelper.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/RepoHelper.java?rev=1307411&r1=1307410&r2=1307411&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/RepoHelper.java
(original)
+++
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/RepoHelper.java
Fri Mar 30 13:40:27 2012
@@ -56,8 +56,18 @@ public class RepoHelper {
/** The jaxws service. */
private boolean jaxwsService = false;
+
+ private int dataBufferSize;
- /**
+ public int getDataBufferSize() {
+ return dataBufferSize;
+ }
+
+ public void setDataBufferSize(int dataBufferSize) {
+ this.dataBufferSize = dataBufferSize;
+ }
+
+ /**
* Gets the module src dir.
*
* @return the module src dir
@@ -236,7 +246,7 @@ public class RepoHelper {
File modsrcFile = new File(moduleSrcDir);
File moddisFile = new File(moduleDir);
if (modsrcFile.exists()) {
- copyDirectory(modsrcFile, moddisFile);
+ copyDirectory(modsrcFile, moddisFile, getDataBufferSize());
}
}
@@ -265,7 +275,7 @@ public class RepoHelper {
}
if (srcFile.exists()) {
- copyDirectory(srcFile, disFile);
+ copyDirectory(srcFile, disFile, getDataBufferSize());
}
}
@@ -283,7 +293,7 @@ public class RepoHelper {
File srcFile = new File(stdServiceSrcDir);
File disFile = new File(stdServiceDir);
if (srcFile.exists()) {
- copyDirectory(srcFile, disFile);
+ copyDirectory(srcFile, disFile, getDataBufferSize());
}
}
@@ -310,10 +320,11 @@ public class RepoHelper {
* the source location
* @param targetLocation
* the target location
+ * @param bufferSize
* @throws IOException
* Signals that an I/O exception has occurred.
*/
- public static void copyDirectory(File sourceLocation, File targetLocation)
throws IOException {
+ public static void copyDirectory(File sourceLocation, File targetLocation,
int bufferSize) throws IOException {
if (sourceLocation.isDirectory()) {
if (!targetLocation.exists()) {
@@ -323,7 +334,7 @@ public class RepoHelper {
String[] children = sourceLocation.list();
for (int i = 0; i < children.length; i++) {
copyDirectory(new File(sourceLocation, children[i]), new
File(targetLocation,
- children[i]));
+ children[i]), bufferSize);
}
} else {
@@ -331,7 +342,7 @@ public class RepoHelper {
OutputStream out = new FileOutputStream(targetLocation);
// Copy the bits from instream to outstream
- byte[] buf = new byte[1024];
+ byte[] buf = new byte[bufferSize];
int len;
while ((len = in.read(buf)) > 0) {
out.write(buf, 0, len);
