You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/14 09:49:55 UTC
[50/51] [partial] cxf git commit: Remove all trailing whitespaces
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java
----------------------------------------------------------------------
diff --git a/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java b/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java
index ac8c17d..60922d8 100644
--- a/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java
+++ b/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java
@@ -49,7 +49,7 @@ public class BenchClient {
private final static QName SERVICE_NAME = new QName("http://www.extreme.indiana.edu/wsdl/Benchmark1", "Benchmark");
private final static boolean VERBOSE = true;
private final static String SMOKE_TEST = "smoke_test";
-
+
Benchmark_Service service;
Benchmark port;
@@ -64,12 +64,12 @@ public class BenchClient {
}
} catch (MalformedURLException e) {
e.printStackTrace();
- }
-
+ }
+
service = new Benchmark_Service(wsdlURL, SERVICE_NAME);
- port = service.getBenchmark();
-
-
+ port = service.getBenchmark();
+
+
/*options.setProperty(org.apache.axis2.transport.http.HTTPConstants.SO_TIMEOUT,new Integer(480000));
options.setProperty(org.apache.axis2.transport.http.HTTPConstants.CONNECTION_TIMEOUT,new Integer(480000));*/
}
@@ -87,12 +87,12 @@ public class BenchClient {
verbose("Starting " + ID + " at " + (new Date()));
// allow multiple URLs (each must start with http"
- List<String> locationList = new ArrayList<>();
+ List<String> locationList = new ArrayList<>();
int pos = 0;
while (pos < args.length) {
String s = args[pos];
if (s.startsWith("http") || s.startsWith("file")) {
- locationList.add(s);
+ locationList.add(s);
} else {
break;
}
@@ -115,13 +115,13 @@ public class BenchClient {
if (args.length > (pos + 2)) {
arrSizeToSend = args[(pos + 2)];
}
-
+
String[] locations = new String[locationList.size()];
locationList.toArray(locations);
for (int i = 0; i < locations.length; i++) {
String location = locations[i];
- verbose("connecting to " + location);
+ verbose("connecting to " + location);
runTestsForSize(location, elementsToSend, testType, arrSizeToSend);
}
long benchmarkEnd = System.currentTimeMillis();
@@ -172,12 +172,12 @@ public class BenchClient {
final char method = td.method;
if (method == 'a') {
if (direction == 'e') {
- //test for the void
+ //test for the void
td.setMethod('v');
runOneTest(td);
}
/*
- // test for Base64
+ // test for Base64
td.setMethod('b');
runOneTest(td);
// test for Doubles
@@ -200,7 +200,7 @@ public class BenchClient {
runOneTest(td);
}
}
-
+
public static void runOneTest(TestDescriptor td)
throws Exception {
@@ -227,32 +227,32 @@ public class BenchClient {
}
}
- Double[] darr = null;
- if (method == 'd') {
+ Double[] darr = null;
+ if (method == 'd') {
darr = new Double[totalInv];
for (int i = 0; i < darr.length; i++) {
darr[i] = new Double(i);
}
}
- Integer[] iarr = null;
- if (method == 'i') {
+ Integer[] iarr = null;
+ if (method == 'i') {
iarr = new Integer[totalInv];
for (int i = 0; i < iarr.length ; i++) {
iarr[i] = new Integer(i);
}
}
- String[] sarr = null;
- if (method == 's') {
+ String[] sarr = null;
+ if (method == 's') {
sarr = new String[totalInv];
for (int i = 0; i < sarr.length; i++) {
sarr[i] = "s" + i;
}
}
- MeshInterfaceObject[] marr = null;
- if (method == 'm') {
+ MeshInterfaceObject[] marr = null;
+ if (method == 'm') {
marr = new MeshInterfaceObject[totalInv];
for (int i = 0; i < totalInv; i++) {
marr[i] = new MeshInterfaceObject();
@@ -262,8 +262,8 @@ public class BenchClient {
}
}
- SimpleEvent[] earr = null;
- if (method == 'e') {
+ SimpleEvent[] earr = null;
+ if (method == 'e') {
earr = new SimpleEvent[totalInv];
for (int i = 0; i < earr.length; i++) {
earr[i] = new SimpleEvent();
@@ -320,8 +320,8 @@ public class BenchClient {
}
}
} else if (method == 'd') {
- ArrayList<Double> da = new ArrayList<>();
- new Util<Double>().copyList(darr, off, da, td.arrSizeToSend);
+ ArrayList<Double> da = new ArrayList<>();
+ new Util<Double>().copyList(darr, off, da, td.arrSizeToSend);
List<Double> uda = null;
int dlen = -1;
if (direction == 'e') {
@@ -516,7 +516,7 @@ public class BenchClient {
private static void verbose(String msg) {
if(VERBOSE) {
System.out.println("B1> " + msg);
- }
+ }
}
private static void fail(String msg) {
@@ -621,7 +621,7 @@ public class BenchClient {
}
- public void echoVoid() throws java.lang.Exception {
+ public void echoVoid() throws java.lang.Exception {
port.echoVoid();
}
@@ -629,25 +629,25 @@ public class BenchClient {
return port.echoStrings(input);
}
- public int receiveBase64(byte[] input) throws java.lang.Exception {
+ public int receiveBase64(byte[] input) throws java.lang.Exception {
return port.receiveBase64(input);
-
+
}
public int receiveDoubles(List<Double> input) throws java.lang.Exception {
-
+
return port.receiveDoubles(input);
}
- public List<Integer> sendInts(int input) throws java.lang.Exception {
+ public List<Integer> sendInts(int input) throws java.lang.Exception {
return port.sendInts(input);
}
public byte[] echoBase64(byte[] input) throws java.lang.Exception {
- return port.echoBase64(input);
+ return port.echoBase64(input);
}
- public int receiveStrings(List<String> input) throws java.lang.Exception {
+ public int receiveStrings(List<String> input) throws java.lang.Exception {
return port.receiveStrings(input);
}
@@ -664,15 +664,15 @@ public class BenchClient {
}
public byte[] sendBase64(int input) throws java.lang.Exception {
-
+
return port.sendBase64(input);
}
- public List<Double> echoDoubles(List<Double> input) throws java.lang.Exception {
+ public List<Double> echoDoubles(List<Double> input) throws java.lang.Exception {
return port.echoDoubles(input);
}
- public List<String> sendStrings(int input) throws java.lang.Exception {
+ public List<String> sendStrings(int input) throws java.lang.Exception {
return port.sendStrings(input);
}
@@ -716,13 +716,13 @@ public class BenchClient {
public List<MeshInterfaceObject> sendMeshInterfaceObjects(int size) throws java.lang.Exception {
SendMeshInterfaceObjectsRequest request = new SendMeshInterfaceObjectsRequest();
request.setSize(size);
- SendMeshInterfaceObjectsResponse response = port.sendMeshInterfaceObjects(request);
+ SendMeshInterfaceObjectsResponse response = port.sendMeshInterfaceObjects(request);
return response.getSendMeshInterfaceObjectsReturn().getItem();
}
-
+
static class Util<E> {
public Util() {
-
+
}
public void copyList(E[] src, int off, ArrayList<E>des, int size) {
des.clear();
@@ -730,7 +730,7 @@ public class BenchClient {
E o = src[i+off];
des.add(o);
}
- }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java
----------------------------------------------------------------------
diff --git a/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java b/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java
index d47a384..447be85 100644
--- a/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java
+++ b/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java
@@ -41,32 +41,32 @@ import edu.indiana.extreme.wsdl.benchmark1.SimpleEvent;
@javax.jws.WebService(name = "Benchmark", serviceName = "Benchmark",
portName = "Benchmark",
- targetNamespace = "http://www.extreme.indiana.edu/wsdl/Benchmark1",
+ targetNamespace = "http://www.extreme.indiana.edu/wsdl/Benchmark1",
endpointInterface = "edu.indiana.extreme.wsdl.benchmark1.Benchmark")
-
+
public class BenchmarkImpl implements Benchmark {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(BenchmarkImpl.class.getPackage().getName());
-
+
public BenchmarkImpl() {
LOG.setLevel(Level.INFO);
}
-
-
+
+
/* (non-Javadoc)
* @see edu.indiana.extreme.wsdl.benchmark1.Benchmark#echoVoid(*
*/
- public void echoVoid() {
+ public void echoVoid() {
LOG.info("Executing operation echoVoid");
}
/* (non-Javadoc)
* @see edu.indiana.extreme.wsdl.benchmark1.Benchmark#echoBase64(byte[] input )*
*/
- public byte[] echoBase64 (byte[] input) {
- LOG.info("Executing operation echoBase64");
+ public byte[] echoBase64 (byte[] input) {
+ LOG.info("Executing operation echoBase64");
return input;
}
@@ -76,7 +76,7 @@ public class BenchmarkImpl implements Benchmark {
public java.util.List<java.lang.String> echoStrings(
java.util.List<java.lang.String> input
)
- {
+ {
LOG.info("Executing operation echoStrings");
return input;
}
@@ -87,7 +87,7 @@ public class BenchmarkImpl implements Benchmark {
public java.util.List<java.lang.Integer> echoInts(
java.util.List<java.lang.Integer> input
)
- {
+ {
LOG.info("Executing operation echoInts");
return input;
}
@@ -98,7 +98,7 @@ public class BenchmarkImpl implements Benchmark {
public java.util.List<java.lang.Double> echoDoubles(
java.util.List<java.lang.Double> input
)
- {
+ {
LOG.info("Executing operation echoDoubles");
return input;
}
@@ -109,7 +109,7 @@ public class BenchmarkImpl implements Benchmark {
public edu.indiana.extreme.wsdl.benchmark1.EchoSimpleEventsResponse echoSimpleEvents(
edu.indiana.extreme.wsdl.benchmark1.EchoSimpleEventsRequest input
)
- {
+ {
LOG.info("Executing operation echoSimpleEvents");
EchoSimpleEventsResponse ret = new EchoSimpleEventsResponse();
ret.setEchoSimpleEventsReturn(input.getInput());
@@ -122,7 +122,7 @@ public class BenchmarkImpl implements Benchmark {
public edu.indiana.extreme.wsdl.benchmark1.EchoMeshInterfaceObjectsResponse echoMeshInterfaceObjects(
edu.indiana.extreme.wsdl.benchmark1.EchoMeshInterfaceObjectsRequest input
)
- {
+ {
LOG.info("Executing operation echoMeshInterfaceObjects");
EchoMeshInterfaceObjectsResponse ret = new EchoMeshInterfaceObjectsResponse();
List<MeshInterfaceObject> output = ret.getEchoMeshInterfaceObjectReturn();
@@ -138,10 +138,10 @@ public class BenchmarkImpl implements Benchmark {
public int receiveBase64(
byte[] input
)
- {
+ {
LOG.info("Executing operation receiveBase64");
System.out.println("Executing operation receiveBase64 " + input.length);
- return input.length;
+ return input.length;
}
/* (non-Javadoc)
@@ -150,9 +150,9 @@ public class BenchmarkImpl implements Benchmark {
public int receiveStrings(
java.util.List<java.lang.String> input
)
- {
+ {
LOG.info("Executing operation receiveStrings");
- return input.size();
+ return input.size();
}
/* (non-Javadoc)
@@ -161,7 +161,7 @@ public class BenchmarkImpl implements Benchmark {
public int receiveInts(
java.util.List<java.lang.Integer> input
)
- {
+ {
LOG.info("Executing operation receiveInts");
return input.size();
}
@@ -172,7 +172,7 @@ public class BenchmarkImpl implements Benchmark {
public int receiveDoubles(
java.util.List<java.lang.Double> input
)
- {
+ {
LOG.info("Executing operation receiveDoubles");
return input.size();
}
@@ -183,7 +183,7 @@ public class BenchmarkImpl implements Benchmark {
public edu.indiana.extreme.wsdl.benchmark1.ReceiveSimpleEventsResponse receiveSimpleEvents(
edu.indiana.extreme.wsdl.benchmark1.ReceiveSimpleEventsRequest input
)
- {
+ {
LOG.info("Executing operation receiveSimpleEvents");
ReceiveSimpleEventsResponse ret = new ReceiveSimpleEventsResponse();
ret.setReceiveSimpleEventsReturn(input.getInput().getItem().size());
@@ -196,7 +196,7 @@ public class BenchmarkImpl implements Benchmark {
public edu.indiana.extreme.wsdl.benchmark1.ReceiveMeshInterfaceObjectsResponse receiveMeshInterfaceObjects(
edu.indiana.extreme.wsdl.benchmark1.ReceiveMeshInterfaceObjectsRequest input
)
- {
+ {
LOG.info("Executing operation receiveMeshInterfaceObjects");
ReceiveMeshInterfaceObjectsResponse ret = new ReceiveMeshInterfaceObjectsResponse();
ret.setReceiveMeshInterfaceObjectsReturn(input.getInput().getItem().size());
@@ -209,8 +209,8 @@ public class BenchmarkImpl implements Benchmark {
public byte[] sendBase64(
int size
)
- {
- LOG.info("Executing operation sendBase64");
+ {
+ LOG.info("Executing operation sendBase64");
return new byte[size];
}
@@ -220,8 +220,8 @@ public class BenchmarkImpl implements Benchmark {
public java.util.List<java.lang.String> sendStrings(
int size
)
- {
- LOG.info("Executing operation sendStrings");
+ {
+ LOG.info("Executing operation sendStrings");
List<String> ret = new ArrayList<>(0);
for (int i = 0; i < size; i++) {
String temp = "s" + i;
@@ -236,7 +236,7 @@ public class BenchmarkImpl implements Benchmark {
public java.util.List<java.lang.Integer> sendInts(
int size
)
- {
+ {
LOG.info("Executing operation sendInts");
List<Integer> ret = new LinkedList<Integer>();
for (int i = 0; i < size; i++) {
@@ -252,7 +252,7 @@ public class BenchmarkImpl implements Benchmark {
public java.util.List<java.lang.Double> sendDoubles(
int size
)
- {
+ {
LOG.info("Executing operation sendDoubles");
List<Double> ret = new LinkedList<Double>();
for (int i = 0; i < size; i++) {
@@ -268,12 +268,12 @@ public class BenchmarkImpl implements Benchmark {
public edu.indiana.extreme.wsdl.benchmark1.SendSimpleEventsResponse sendSimpleEvents(
edu.indiana.extreme.wsdl.benchmark1.SendSimpleEventsRequest size
)
- {
+ {
LOG.info("Executing operation sendSimpleEvents");
SendSimpleEventsResponse ret = new SendSimpleEventsResponse();
ArrayOfSimpleEvent value = new ArrayOfSimpleEvent();
List<SimpleEvent> item = value.getItem();
- for(int i = 0 ; i < size.getSize() ; i++) {
+ for(int i = 0 ; i < size.getSize() ; i++) {
SimpleEvent object = new SimpleEvent();
object.setSequenceNumber(i);
object.setMessage("Message #" + i);
@@ -290,7 +290,7 @@ public class BenchmarkImpl implements Benchmark {
public edu.indiana.extreme.wsdl.benchmark1.SendMeshInterfaceObjectsResponse sendMeshInterfaceObjects(
edu.indiana.extreme.wsdl.benchmark1.SendMeshInterfaceObjectsRequest size
)
- {
+ {
LOG.info("Executing operation sendMeshInterfaceObjects");
SendMeshInterfaceObjectsResponse ret = new SendMeshInterfaceObjectsResponse();
ArrayOfMeshInterfaceObject value = new ArrayOfMeshInterfaceObject();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
----------------------------------------------------------------------
diff --git a/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java b/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
index d0e9709..00cd212 100644
--- a/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
+++ b/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
@@ -23,9 +23,9 @@ import javax.xml.ws.Endpoint;
/**
- *
+ *
*/
-
+
public class BenchmarkServer{
protected BenchmarkServer() throws Exception {
@@ -34,11 +34,11 @@ public class BenchmarkServer{
String address = "http://localhost:8080/cxf/services/Benchmark";
Endpoint.publish(address, implementor);
}
-
- public static void main(String args[]) throws Exception {
+
+ public static void main(String args[]) throws Exception {
new BenchmarkServer();
- System.out.println("Server ready...");
- Thread.sleep(Integer.MAX_VALUE);
+ System.out.println("Server ready...");
+ Thread.sleep(Integer.MAX_VALUE);
System.out.println("Server exitting");
System.exit(0);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java b/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java
index 2180469..b3dce75 100644
--- a/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java
+++ b/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java
@@ -27,7 +27,7 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
public abstract class TestCaseBase<T> {
private boolean initialized;
-
+
protected String wsdlPath;
protected String serviceName;
@@ -46,14 +46,14 @@ public abstract class TestCaseBase<T> {
protected int amount = 1;
- protected String wsdlNameSpace;
+ protected String wsdlNameSpace;
protected List<TestResult> results = new ArrayList<>();
protected int numberOfThreads;
-
+
protected String busCfg;
-
+
private String name;
private String[] args;
@@ -63,7 +63,7 @@ public abstract class TestCaseBase<T> {
private boolean timedTestDone = false;
private boolean doWarmup = true;
-
+
public TestCaseBase() {
this("DEFAULT TESTCASE", null);
}
@@ -91,7 +91,7 @@ public abstract class TestCaseBase<T> {
public void processArgs() {
int count = 0;
- int argc = args.length;
+ int argc = args.length;
while (count < argc) {
if ("-WSDL".equals(args[count])) {
wsdlPath = args[count + 1];
@@ -167,11 +167,11 @@ public abstract class TestCaseBase<T> {
}
}
- public void tearDown() {
+ public void tearDown() {
}
protected void setUp() throws Exception {
-
+
clearTestResults();
printTitle();
printSetting("Default Setting: ");
@@ -199,7 +199,7 @@ public abstract class TestCaseBase<T> {
final int threadCount = 4;
final long timeLimit = 30;
final int countLimit = 1200;
-
+
System.out.println("TestCase " + name + " is warming up the jit. (" + timeLimit + " sec/" + countLimit + " iterations, " + threadCount + " threads)");
final long startTime = System.currentTimeMillis();
final long endTime = startTime + (timeLimit * 1000l);
@@ -276,7 +276,7 @@ public abstract class TestCaseBase<T> {
public void testRun() throws Exception {
if (numberOfThreads == 0) {
- numberOfThreads = 1;
+ numberOfThreads = 1;
}
List<Thread> threadList = new ArrayList<>();
for (int i = 0; i < numberOfThreads; i++) {
@@ -316,7 +316,7 @@ public abstract class TestCaseBase<T> {
System.out.println("Overall AVG. response time: " + totalAvgResponseTime * 1000 + TestResult.AVG_UNIT);
System.out.println(totalInvocations + " (invocations), running " + totalDuration + " (sec) ");
System.out.println("============================================");
-
+
}
public void run() {
@@ -400,6 +400,6 @@ public abstract class TestCaseBase<T> {
public String getName() {
return this.name;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestResult.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestResult.java b/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestResult.java
index 61fec95..f0a2d0b 100644
--- a/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestResult.java
+++ b/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestResult.java
@@ -22,16 +22,16 @@ package org.apache.cxf.pat.internal;
public class TestResult {
public static final String AVG_UNIT = " (ms)";
public static final String THROUGHPUT_UNIT = " (invocations/sec)";
-
+
private String name;
private TestCaseBase testCase;
-
+
private double duration;
private double numOfInvocations;
-
+
private double avgResponseTime;
private double throughput;
-
+
public TestResult() {
this("Default Result");
}
@@ -48,7 +48,7 @@ public class TestResult {
public void compute(long startTime, long endTime, int numberOfInvocations) {
numOfInvocations = (double)numberOfInvocations;
duration = convertToSeconds(endTime - startTime);
-
+
throughput = numOfInvocations / duration;
avgResponseTime = duration / numOfInvocations;
System.out.println();
@@ -75,11 +75,11 @@ public class TestResult {
public double getThroughput() {
return throughput;
}
-
+
public double getDuration() {
return duration;
}
-
+
public double getNumOfInvocations() {
return numOfInvocations;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestRunner.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestRunner.java b/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestRunner.java
index d309ba3..bf24ac3 100644
--- a/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestRunner.java
+++ b/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestRunner.java
@@ -23,7 +23,7 @@ public class TestRunner<T> implements Runnable {
protected TestCaseBase<T> testCase;
private String name;
- private T port;
+ private T port;
public TestRunner() {
this("Default runner");
@@ -39,16 +39,16 @@ public class TestRunner<T> implements Runnable {
this.port = test.getPort();
}
- public void run() {
+ public void run() {
System.out.println("TestRunner " + name + " is running");
try {
testCase.internalTestRun(name, port);
} catch (Exception e) {
e.printStackTrace();
- }
+ }
System.out.println("TestRunner " + name + " is finished");
}
-
+
public void start() {
Thread thread = new Thread(this);
thread.start();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
index 4858d68..38860b3 100644
--- a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
+++ b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
@@ -31,19 +31,19 @@ import org.apache.cxf.pat.internal.TestResult;
import org.apache.cxf.performance.basic_type.BasicPortType;
import org.apache.cxf.performance.basic_type.BasicService;
import org.apache.cxf.performance.basic_type.server.Server;
-
+
public final class Client extends TestCaseBase<BasicPortType> {
-
- private static final QName SERVICE_NAME
+
+ private static final QName SERVICE_NAME
= new QName("http://cxf.apache.org/performance/basic_type", "BasicService");
private static int opid;
-
+
private byte[] inputBase64;
private String inputString = new String();
private final int asciiCount = 1 * 1024;
-
+
private BasicService ss;
public Client(String[] args) {
@@ -113,7 +113,7 @@ public final class Client extends TestCaseBase<BasicPortType> {
}
public BasicPortType getPort() {
-
+
try {
URL wsdl = null;
if ((wsdlPath.startsWith("file://")) || (wsdlPath.startsWith("http://"))) {
@@ -127,7 +127,7 @@ public final class Client extends TestCaseBase<BasicPortType> {
}
return ss.getSoapHttpPort();
}
-}
-
+}
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java
index de73adc..2c2cca3 100644
--- a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java
+++ b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java
@@ -23,7 +23,7 @@ import javax.xml.ws.Endpoint;
public class Server implements Runnable {
-
+
public Server(String address) throws Exception {
System.out.println("Starting Server");
Object implementor = new ServerImpl();
@@ -34,18 +34,18 @@ public class Server implements Runnable {
public Server(String[] args) throws Exception {
this("http://localhost:20000/performance/basic_type/SoapPort");
}
-
+
public static void main(String args[]) throws Exception {
Server server = new Server(args);
server.run();
}
-
+
public void run() {
System.out.println("running server");
System.out.println("READY");
-
+
}
-
+
void shutdown(boolean wait) {
System.out.println("shutting down server");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/ServerImpl.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/ServerImpl.java b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/ServerImpl.java
index 555a932..adb6b4e 100644
--- a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/ServerImpl.java
+++ b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/ServerImpl.java
@@ -21,24 +21,24 @@ package org.apache.cxf.performance.basic_type.server;
import java.util.logging.Logger;
import org.apache.cxf.performance.basic_type.BasicPortType;
-@javax.jws.WebService(portName = "SoapHttpPort", serviceName = "BasicService",
+@javax.jws.WebService(portName = "SoapHttpPort", serviceName = "BasicService",
targetNamespace = "http://cxf.apache.org/performance/basic_type",
endpointInterface = "org.apache.cxf.performance.basic_type.BasicPortType",
- wsdlLocation = "wsdl/basic_type.wsdl"
+ wsdlLocation = "wsdl/basic_type.wsdl"
)
public class ServerImpl implements BasicPortType {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(ServerImpl.class.getPackage().getName());
-
+
public byte[] echoBase64(byte[] inputBase64) {
//LOG.info("Executing operation echoBase64 ");
//System.out.println("Executing operation echoBase64");
//System.out.println("Message received: " + inputBase64 + "\n");
return inputBase64;
}
-
+
public String echoString(String inputString) {
//LOG.info("Executing operation echoString");
//System.out.println("Executing operation echoString\n");
@@ -46,4 +46,4 @@ public class ServerImpl implements BasicPortType {
return inputString;
}
}
-
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/client/Client.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/client/Client.java b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/client/Client.java
index 360adb4..ebeffb9 100644
--- a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/client/Client.java
+++ b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/client/Client.java
@@ -42,13 +42,13 @@ import org.apache.cxf.performance.complex_type.types.SimpleStruct;
public final class Client extends TestCaseBase<ComplexPortType> {
private static final QName SERVICE_NAME = new QName(
"http://cxf.apache.org/performance/complex_type",
- "ComplexService");
+ "ComplexService");
private static final QName PORT_NAME = new QName(
"http://cxf.apache.org/performance/complex_type",
"ComplexPortType");
private ComplexService cs;
private final NestedComplexTypeSeq complexTypeSeq = new NestedComplexTypeSeq();
-
+
public Client(String[] args) {
super("Complex Type TestCase", args);
serviceName = "ComplexService";
@@ -60,13 +60,13 @@ public final class Client extends TestCaseBase<ComplexPortType> {
}
public static void main(String args[]) throws Exception {
-
+
Client client = new Client(args);
-
- client.initialize();
-
+
+ client.initialize();
+
client.run();
-
+
List results = client.getTestResults();
TestResult testResult = null;
for (Iterator iter = results.iterator(); iter.hasNext();) {
@@ -77,7 +77,7 @@ public final class Client extends TestCaseBase<ComplexPortType> {
System.out.println("cxf client is going to shutdown!");
System.exit(0);
}
-
+
private SimpleStruct getSimpleStruct() throws DatatypeConfigurationException {
SimpleStruct ss = new SimpleStruct();
ss.setVarFloat(Float.MAX_VALUE);
@@ -91,7 +91,7 @@ public final class Client extends TestCaseBase<ComplexPortType> {
return ss;
}
-
+
public void initTestData() {
NestedComplexType complexType = new NestedComplexType();
complexType.setVarString("#12345ABc");
@@ -104,7 +104,7 @@ public final class Client extends TestCaseBase<ComplexPortType> {
} catch (DatatypeConfigurationException e) {
e.printStackTrace();
}
-
+
complexType.setVarEnum(ColourEnum.RED);
byte[] binary = new byte[1024];
for (int idx = 0; idx < 4; idx++) {
@@ -117,15 +117,15 @@ public final class Client extends TestCaseBase<ComplexPortType> {
for (int i = 0; i < packetSize; i++) {
complexTypeSeq.getItem().add(complexType);
- }
+ }
}
-
+
public void doJob(ComplexPortType port) {
port.sendReceiveData(complexTypeSeq);
}
- public ComplexPortType getPort() {
- try{
+ public ComplexPortType getPort() {
+ try{
URL wsdl = null;
if ((wsdlPath.startsWith("file://")) || (wsdlPath.startsWith("http://"))) {
wsdl = new URL(wsdlPath);
@@ -136,7 +136,7 @@ public final class Client extends TestCaseBase<ComplexPortType> {
} catch (MalformedURLException e) {
e.printStackTrace();
}
- return cs.getSoapPort();
+ return cs.getSoapPort();
}
public void printUsage() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/Server.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/Server.java b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/Server.java
index 6367590..9c1d07c 100644
--- a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/Server.java
+++ b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/Server.java
@@ -24,7 +24,7 @@ import javax.xml.ws.Endpoint;
public class Server implements Runnable {
-
+
public Server(String address) throws Exception {
System.out.println("Starting Server");
Object implementor = new ServerImpl();
@@ -35,20 +35,20 @@ public class Server implements Runnable {
public Server(String[] args) throws Exception {
this("http://localhost:20003/performance/complex_type/SoapPort");
}
-
+
public static void main(String args[]) throws Exception {
Server server = new Server(args);
server.run();
}
-
+
public void run() {
System.out.println("running server");
System.out.println("READY");
}
-
+
void shutdown(boolean wait) {
System.out.println("shutting down server");
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/ServerImpl.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/ServerImpl.java b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/ServerImpl.java
index bda1e76..6d41577 100644
--- a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/ServerImpl.java
+++ b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/ServerImpl.java
@@ -23,15 +23,15 @@ import java.util.logging.Logger;
import org.apache.cxf.performance.complex_type.ComplexPortType;
import org.apache.cxf.performance.complex_type.types.NestedComplexTypeSeq;
-@javax.jws.WebService(portName = "SoapPort", serviceName = "ComplexService",
+@javax.jws.WebService(portName = "SoapPort", serviceName = "ComplexService",
targetNamespace = "http://cxf.apache.org/performance/complex_type",
endpointInterface = "org.apache.cxf.performance.complex_type.ComplexPortType")
public class ServerImpl implements ComplexPortType {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(ServerImpl.class.getPackage().getName());
-
+
public NestedComplexTypeSeq sendReceiveData(NestedComplexTypeSeq request) {
//LOG.info("Executing operation sendReceiveData opt");
//System.out.println("Executing operation sendReceiveData\n");
@@ -39,4 +39,4 @@ public class ServerImpl implements ComplexPortType {
return request;
}
}
-
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
index acdef44..39921b8 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
+++ b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
@@ -38,7 +38,7 @@ import javax.xml.ws.Holder;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-
+
import org.apache.cxf.pat.internal.TestCaseBase;
import org.apache.cxf.pat.internal.TestResult;
import org.apache.cxf.cxf.performance.DocPortType;
@@ -56,7 +56,7 @@ import org.apache.cxf.performance.complex_type.server.Server;
public final class Client extends TestCaseBase<DocPortType> {
private static final QName SERVICE_NAME = new QName(
"http://cxf.apache.org/cxf/performance",
- "PerfService");
+ "PerfService");
private static final QName PORT_NAME = new QName(
"http://cxf.apache.org/cxf/performance",
"DocPortType");
@@ -99,7 +99,7 @@ public final class Client extends TestCaseBase<DocPortType> {
public static void main(String args[]) throws Exception {
//workaround issue of xmlsec logging too much
Logger.getLogger("org.apache.xml.security.signature.Reference").setLevel(Level.WARNING);
-
+
int threadIdx = -1;
int servIdx = -1;
for (int x = 0; x < args.length; x++) {
@@ -114,7 +114,7 @@ public final class Client extends TestCaseBase<DocPortType> {
String tmp[] = new String[args.length - servIdx];
System.arraycopy(args, servIdx, tmp, 0, args.length - servIdx);
Server.main(tmp);
-
+
tmp = new String[servIdx];
System.arraycopy(args, 0, tmp, 0, servIdx);
args = tmp;
@@ -130,10 +130,10 @@ public final class Client extends TestCaseBase<DocPortType> {
int i2 = Integer.parseInt(s2);
for (int x = i1; x <= i2; x++) {
threadList.add(Integer.toString(x));
- }
+ }
} else {
threadList.add(s);
- }
+ }
}
} else {
threadList.add("1");
@@ -147,7 +147,7 @@ public final class Client extends TestCaseBase<DocPortType> {
System.out.println(Arrays.asList(args));
Client client = new Client(args, first);
first = false;
- client.initialize();
+ client.initialize();
client.run();
@@ -218,7 +218,7 @@ public final class Client extends TestCaseBase<DocPortType> {
NestedComplexType ct = createComplexType();
for (int i = 0; i < packetSize; i++) {
complexTypeSeq.getItem().add(ct);
- }
+ }
// init String and Binary
String temp = "abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+?><[]/0123456789";
inputBase64 = new byte[1024];
@@ -264,7 +264,7 @@ public final class Client extends TestCaseBase<DocPortType> {
public synchronized DocPortType getPort() {
try {
URL wsdl = null;
- if (wsdlPath.startsWith("file:")
+ if (wsdlPath.startsWith("file:")
|| wsdlPath.startsWith("http://")
|| wsdlPath.startsWith("https://")) {
wsdl = new URL(wsdlPath);
@@ -282,7 +282,7 @@ public final class Client extends TestCaseBase<DocPortType> {
HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy();
//httpClientPolicy.setAllowChunking(false);
-
+
http.setClient(httpClientPolicy);
*/
return port;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java
index 9ddfe41..1d6cc83 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java
+++ b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java
@@ -32,17 +32,17 @@ import org.apache.ws.security.WSPasswordCallback;
*/
public class KeystorePasswordCallback implements CallbackHandler {
-
- private Map<String, String> passwords =
+
+ private Map<String, String> passwords =
new HashMap<String, String>();
-
+
public KeystorePasswordCallback() {
passwords.put("myclientkey", "ckpass");
passwords.put("myservicekey", "skpass");
}
/**
- * It attempts to get the password from the private
+ * It attempts to get the password from the private
* alias/passwords map.
*/
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java
index e2d4d7c..66f8675 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java
+++ b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java
@@ -27,14 +27,14 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
public class Server implements Runnable {
-
+
public Server(String address) throws Exception {
System.out.println("Starting Server");
Object implementor = new ServerImpl();
Endpoint.publish(address, implementor);
System.out.println("Server published " + address);
}
-
+
public static void main(String args[]) throws Exception {
String host = "localhost";
String protocol = "http";
@@ -59,23 +59,23 @@ public class Server implements Runnable {
} else {
BusFactory.setDefaultBus(new SpringBusFactory().createBus(cfg));
}
-
- Server server = new Server(protocol + "://" + host
+
+ Server server = new Server(protocol + "://" + host
+ ":8080/cxf-benchmark-soapdoclit/services/SoapHttpDocLitPort");
server.run();
if (wait) {
Thread.sleep(10000000);
}
}
-
+
public void run() {
System.out.println("running server");
System.out.println("READY");
}
-
+
void shutdown(boolean wait) {
System.out.println("shutting down server");
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java
index 8c31e22..5785925 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java
+++ b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java
@@ -29,7 +29,7 @@ import org.apache.cxf.cxf.performance.types.NestedComplexType;
import org.apache.cxf.cxf.performance.types.NestedComplexTypeSeq;
-@javax.jws.WebService(portName = "SoapHttpDocLitPort", serviceName = "PerfService",
+@javax.jws.WebService(portName = "SoapHttpDocLitPort", serviceName = "PerfService",
targetNamespace = "http://cxf.apache.org/cxf/performance",
endpointInterface = "org.apache.cxf.cxf.performance.DocPortType",
wsdlLocation="/wsdl/perf.wsdl")
@@ -38,24 +38,24 @@ public class ServerImpl implements DocPortType {
//workaround issue of xmlsec logging too much
Logger.getLogger("org.apache.xml.security.signature.Reference").setLevel(Level.WARNING);
}
-
+
public NestedComplexTypeSeq echoComplexTypeDoc(NestedComplexTypeSeq request, int id, javax.xml.ws.Holder<Integer> i) {
//System.out.println("Executing operation echoComplexTypeDoc\n");
//System.out.println("Message received: " + request + "\n");
i.value = id;
return request;
}
-
+
public String echoStringDoc(String request) {
//System.out.println("Executing operation echoStringDoc\n");
//System.out.println("Message received: " + request + "\n");
return request;
}
-
+
public byte[] echoBase64Doc(byte[] request) {
//System.out.println("Executing operation echoBase64Doc\n");
//System.out.println("Message received: " + request + "\n");
return request;
}
}
-
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/profiling/src/main/java/org/apache/cxf/profile/ClientEndpointCreationLoop.java
----------------------------------------------------------------------
diff --git a/benchmark/profiling/src/main/java/org/apache/cxf/profile/ClientEndpointCreationLoop.java b/benchmark/profiling/src/main/java/org/apache/cxf/profile/ClientEndpointCreationLoop.java
index 15b142f..84c786d 100644
--- a/benchmark/profiling/src/main/java/org/apache/cxf/profile/ClientEndpointCreationLoop.java
+++ b/benchmark/profiling/src/main/java/org/apache/cxf/profile/ClientEndpointCreationLoop.java
@@ -30,23 +30,23 @@ import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.SOAPService;
/**
- *
+ *
*/
public final class ClientEndpointCreationLoop {
-
+
private final QName portName = new QName("http://apache.org/hello_world_soap_http",
"SoapPort");
private ClientEndpointCreationLoop() {
}
-
- private void iteration() throws URISyntaxException {
+
+ private void iteration() throws URISyntaxException {
SOAPService service = new SOAPService();
service.getPort(portName, Greeter.class);
}
/**
* @param args
- * @throws URISyntaxException
+ * @throws URISyntaxException
*/
public static void main(String[] args) throws URISyntaxException {
Controller.stopAllocRecording();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/profiling/src/main/java/org/apache/cxf/profile/DefaultBusInitialization.java
----------------------------------------------------------------------
diff --git a/benchmark/profiling/src/main/java/org/apache/cxf/profile/DefaultBusInitialization.java b/benchmark/profiling/src/main/java/org/apache/cxf/profile/DefaultBusInitialization.java
index bda6142..8f62a6c 100644
--- a/benchmark/profiling/src/main/java/org/apache/cxf/profile/DefaultBusInitialization.java
+++ b/benchmark/profiling/src/main/java/org/apache/cxf/profile/DefaultBusInitialization.java
@@ -26,10 +26,10 @@ import java.io.File;
import org.apache.cxf.BusFactory;
/**
- *
+ *
*/
public class DefaultBusInitialization {
-
+
public static void main(String[] args) {
Controller.stopAllocRecording();
Controller.stopCPURecording();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/profiling/src/main/java/org/apache/cxf/profile/DynamicClientEndpointCreationLoop.java
----------------------------------------------------------------------
diff --git a/benchmark/profiling/src/main/java/org/apache/cxf/profile/DynamicClientEndpointCreationLoop.java b/benchmark/profiling/src/main/java/org/apache/cxf/profile/DynamicClientEndpointCreationLoop.java
index b66b166..e62af58 100644
--- a/benchmark/profiling/src/main/java/org/apache/cxf/profile/DynamicClientEndpointCreationLoop.java
+++ b/benchmark/profiling/src/main/java/org/apache/cxf/profile/DynamicClientEndpointCreationLoop.java
@@ -28,18 +28,18 @@ import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.dynamic.DynamicClientFactory;
/**
- *
+ *
*/
public final class DynamicClientEndpointCreationLoop {
-
+
private Bus bus;
-
+
private DynamicClientEndpointCreationLoop() {
- CXFBusFactory busFactory = new CXFBusFactory();
+ CXFBusFactory busFactory = new CXFBusFactory();
bus = busFactory.createBus();
}
-
- private void iteration() throws URISyntaxException {
+
+ private void iteration() throws URISyntaxException {
URL wsdl = getClass().getResource("/wsdl/others/dynamic_client_base64.wsdl");
String wsdlUrl = null;
wsdlUrl = wsdl.toURI().toString();
@@ -49,7 +49,7 @@ public final class DynamicClientEndpointCreationLoop {
}
/**
* @param args
- * @throws URISyntaxException
+ * @throws URISyntaxException
*/
public static void main(String[] args) throws URISyntaxException {
DynamicClientEndpointCreationLoop ecl = new DynamicClientEndpointCreationLoop();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop.java
----------------------------------------------------------------------
diff --git a/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop.java b/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop.java
index d6efa50..e36a9ab 100644
--- a/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop.java
+++ b/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop.java
@@ -25,21 +25,21 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
/**
- *
+ *
*/
public final class EndpointCreationLoop {
-
+
private GenericApplicationContext applicationContext;
-
+
private EndpointCreationLoop() {
}
-
+
private void readBeans(Resource beanResource) {
XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(
applicationContext);
reader.loadBeanDefinitions(beanResource);
}
-
+
private void iteration() {
applicationContext = new GenericApplicationContext();
readBeans(new ClassPathResource("extrajaxbclass.xml"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop2.java
----------------------------------------------------------------------
diff --git a/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop2.java b/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop2.java
index 97bbf6d..6b6a95d 100644
--- a/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop2.java
+++ b/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop2.java
@@ -25,31 +25,31 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
/**
- *
+ *
*/
public final class EndpointCreationLoop2 {
-
+
private GenericApplicationContext applicationContext;
-
+
private EndpointCreationLoop2() {
}
-
+
private void readBeans(Resource beanResource) {
XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(
applicationContext);
reader.loadBeanDefinitions(beanResource);
}
-
+
private void init() {
applicationContext = new GenericApplicationContext();
readBeans(new ClassPathResource("extrajaxbclass.xml"));
applicationContext.refresh();
}
-
+
private void close() {
applicationContext.close();
}
-
+
private void iteration() {
applicationContext.stop();
applicationContext.start();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop3.java
----------------------------------------------------------------------
diff --git a/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop3.java b/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop3.java
index 4ba42f5..1013089 100644
--- a/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop3.java
+++ b/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop3.java
@@ -26,20 +26,20 @@ import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
/**
- *
+ *
*/
public final class EndpointCreationLoop3 {
-
-
+
+
private EndpointCreationLoop3() {
}
-
+
private void iteration() {
JaxWsServerFactoryBean sf = new JaxWsServerFactoryBean();
sf.setAddress("http://localhost:9000/test");
sf.setServiceClass(org.apache.cxf.systest.jaxb.service.TestServiceImpl.class);
sf.setStart(false);
-
+
Server server = sf.create();
server.start();
server.stop();
@@ -53,7 +53,7 @@ public final class EndpointCreationLoop3 {
EndpointCreationLoop3 ecl = new EndpointCreationLoop3();
int count = Integer.parseInt(args[0]);
ecl.iteration();
-
+
Controller.startCPURecording(true);
Controller.startAllocRecording(true);
for (int x = 0; x < count; x++) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java
----------------------------------------------------------------------
diff --git a/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java b/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java
index 4c35e21..f3e4f9b 100644
--- a/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java
+++ b/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java
@@ -55,19 +55,19 @@ import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.XMLReader;
public class FastInfosetExperiment {
-
+
private DocumentBuilder documentBuilder;
TransformerFactory transformerFactory;
private File fiFile;
private final static int iterCount = 10000;
-
+
private FastInfosetExperiment() throws ParserConfigurationException {
documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
transformerFactory = TransformerFactory.newInstance();
transformerFactory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true);
fiFile = new File("fiTest.fixml");
}
-
+
private void dehydrate(InputStream input, OutputStream output) throws ParserConfigurationException, SAXException, IOException {
// Create Fast Infoset SAX serializer
SAXDocumentSerializer saxDocumentSerializer = new SAXDocumentSerializer();
@@ -88,12 +88,12 @@ public class FastInfosetExperiment {
// Parse the XML document and convert to a fast infoset document
saxParser.parse(input, saxDocumentSerializer);
}
-
+
private void readWithWoodstox() throws SAXException, TransformerConfigurationException, TransformerException, IOException {
InputStream is = getClass().getResourceAsStream("/META-INF/cxf/cxf.xml");
WstxSAXParserFactory woodstoxParserFactory;
woodstoxParserFactory = new WstxSAXParserFactory();
- woodstoxParserFactory.setFeature("http://xml.org/sax/features/namespace-prefixes",
+ woodstoxParserFactory.setFeature("http://xml.org/sax/features/namespace-prefixes",
true);
SAXParser parser = woodstoxParserFactory.newSAXParser();
XMLReader reader = parser.getXMLReader();
@@ -104,7 +104,7 @@ public class FastInfosetExperiment {
transformerFactory.newTransformer().transform(saxSource, domResult);
is.close();
}
-
+
private void readWithFI() throws TransformerConfigurationException, TransformerException, IOException {
InputStream is = new FileInputStream(fiFile);
XMLReader saxReader = new SAXDocumentParser();
@@ -116,7 +116,7 @@ public class FastInfosetExperiment {
transformerFactory.newTransformer().transform(saxSource, domResult);
is.close();
}
-
+
private void readWithFIDom() throws FastInfosetException, IOException {
InputStream is = new FileInputStream(fiFile);
DOMDocumentParser ddp = new DOMDocumentParser();
@@ -125,38 +125,38 @@ public class FastInfosetExperiment {
ddp.parse(document, is);
is.close();
}
-
+
private void benchmark() throws ParserConfigurationException, SAXException, IOException, TransformerConfigurationException, TransformerException, FastInfosetException {
InputStream is = getClass().getResourceAsStream("/META-INF/cxf/cxf.xml");
OutputStream os = new FileOutputStream(fiFile);
dehydrate(is, os);
is.close();
os.close();
-
+
long totalTime = 0;
-
+
for(int x = 0; x < iterCount; x ++) {
long startTime = System.nanoTime();
readWithWoodstox();
long endTime = System.nanoTime();
totalTime += endTime - startTime;
}
-
+
double averageNanos = totalTime / iterCount;
System.out.println("Woodstox average us: " + averageNanos / 1000);
totalTime = 0;
-
+
for(int x = 0; x < iterCount; x ++) {
long startTime = System.nanoTime();
readWithFI();
long endTime = System.nanoTime();
totalTime += endTime - startTime;
}
-
+
averageNanos = totalTime / iterCount;
System.out.println("FastInfoset average us: " + averageNanos / 1000);
-
+
totalTime = 0;
for(int x = 0; x < iterCount; x ++) {
@@ -165,11 +165,11 @@ public class FastInfosetExperiment {
long endTime = System.nanoTime();
totalTime += endTime - startTime;
}
-
+
averageNanos = totalTime / iterCount;
System.out.println("FastInfoset DOM average us: " + averageNanos / 1000);
}
-
+
public static void main(String[] args) throws Exception {
FastInfosetExperiment that = new FastInfosetExperiment();
that.benchmark();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/bin/DoMerges.java
----------------------------------------------------------------------
diff --git a/bin/DoMerges.java b/bin/DoMerges.java
index 35f3c97..28d22ea 100644
--- a/bin/DoMerges.java
+++ b/bin/DoMerges.java
@@ -22,62 +22,62 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
-/* dkulp - Stupid little program I use to help merge changes from
- trunk to the fixes branches. It requires the command line version of
+/* dkulp - Stupid little program I use to help merge changes from
+ trunk to the fixes branches. It requires the command line version of
svn to be available on the path. If using a git checkout, it also requires
the command line version of git on the path.
- Basically, git does all the work, but this little wrapper
+ Basically, git does all the work, but this little wrapper
thing will display the commit logs, prompt if you want to merge/block/ignore
- each commit, prompt for commit (so you can resolve any conflicts first),
+ each commit, prompt for commit (so you can resolve any conflicts first),
etc....
- Yes - doing this in python itself (or perl or even bash itself or ruby or ...)
- would probably be better. However, I'd then need to spend time
+ Yes - doing this in python itself (or perl or even bash itself or ruby or ...)
+ would probably be better. However, I'd then need to spend time
learning python/ruby/etc... that I just don't have time to do right now.
What is more productive: Taking 30 minutes to bang this out in Java or
spending a couple days learning another language that would allow me to
bang it out in 15 minutes?
- Explanation of commands:
+ Explanation of commands:
- [B]lock will permanently block the particular commit from being merged.
+ [B]lock will permanently block the particular commit from being merged.
It won't ask again on subsequent runs of DoMerge.
- [I]gnore ignores the commit for the current DoMerges run, but will ask
+ [I]gnore ignores the commit for the current DoMerges run, but will ask
again the next time you DoMerges. If you're not certain for a particular
commit use this option for someone else to determine on a later run.
- [R]ecord formally records that a merge occurred, but it does *not*
+ [R]ecord formally records that a merge occurred, but it does *not*
actually merge the commit. This is useful if you another tool to do
the merging but still wish to record a merge did occur.
- [F]lush will permanently save all the [B]'s and [R]'s you've earlier made,
- useful when you need to stop DoMerges (due to a missed commit or other
- problem) before it's complete. That way subsequent runs of DoMerges
+ [F]lush will permanently save all the [B]'s and [R]'s you've earlier made,
+ useful when you need to stop DoMerges (due to a missed commit or other
+ problem) before it's complete. That way subsequent runs of DoMerges
won't go through the blocked/recorded items again. (Flushes occur
automatically when DoMerges is finished running.)
- [C]hanges will display the changes in the commit to help you decide the
+ [C]hanges will display the changes in the commit to help you decide the
appropriate action to take.
*/
public class DoMerges {
public static final String MERGEINFOFILE = ".gitmergeinfo";
-
+
public static boolean auto = false;
public static Pattern jiraPattern = Pattern.compile("([A-Z]{2,10}+-\\d+)");
public static String username;
public static String fromBranch;
-
+
public static Set<String> records = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
public static Set<String> patchIds = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
-
+
static class ToFrom {
final String from;
final String to;
-
+
public ToFrom(String t, String f) {
to = t;
from = f;
@@ -116,7 +116,7 @@ public class DoMerges {
}
return waitFor(p, exit);
}
-
+
static boolean doCommit() throws Exception {
while (System.in.available() > 0) {
@@ -134,17 +134,17 @@ public class DoMerges {
runProcess(p);
return false;
}
-
+
Process p = Runtime.getRuntime().exec(new String[] {"git", "commit", "--no-edit", "-a"});
runProcess(p);
return true;
- }
+ }
public static void changes(String ver) throws Exception {
Process p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "show", ver}));
runProcess(p);
}
-
+
public static void flush() throws Exception {
BufferedWriter writer = new BufferedWriter(new FileWriter(MERGEINFOFILE));
writer.write(fromBranch);
@@ -162,7 +162,7 @@ public class DoMerges {
}
writer.flush();
writer.close();
-
+
Process p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "commit", "-m",
"Recording .gitmergeinfo Changes",
MERGEINFOFILE}));
@@ -171,7 +171,7 @@ public class DoMerges {
public static void doUpdate() throws Exception {
Process p = Runtime.getRuntime().exec(new String[] {"git", "pull", "--rebase"});
runProcess(p);
-
+
File file = new File(MERGEINFOFILE);
records.clear();
if (file.exists()) {
@@ -209,15 +209,15 @@ public class DoMerges {
Process p;
BufferedReader reader;
String line;
-
+
p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "cherry",
- "HEAD", fromBranch}));
-
+ "HEAD", fromBranch}));
+
reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
line = reader.readLine();
while (line != null) {
if (line.charAt(0) == '+') {
- String ver = line.substring(2).trim();
+ String ver = line.substring(2).trim();
if (!records.contains("B " + ver) && !records.contains("M " + ver)) {
verList.add(ver);
}
@@ -257,7 +257,7 @@ public class DoMerges {
}
return map;
}
-
+
public static String[] getLog(String ver, Set<String> jiras) throws Exception {
Process p;
BufferedReader reader;
@@ -280,13 +280,13 @@ public class DoMerges {
p.waitFor();
return lines.toArray(new String[lines.size()]);
}
-
+
private static void doMerge(String ver) throws Exception {
Process p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "cherry-pick", ver}));
if (runProcess(p, false) != 0) {
p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "status"}));
runProcess(p);
-
+
if (doCommit()) {
records.add("M " + ver);
}
@@ -301,11 +301,11 @@ public class DoMerges {
private static void doMappedMerge(String ver) throws Exception {
Process p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "format-patch", "--stdout", "-1", "-k", ver}));
BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
-
+
File outputFile = File.createTempFile("merge", ".patch");
outputFile.deleteOnExit();
BufferedWriter writer = new BufferedWriter(new FileWriter(outputFile));
-
+
String line = reader.readLine();
while (line != null) {
if ((line.startsWith("--- ")
@@ -314,7 +314,7 @@ public class DoMerges {
for (ToFrom ent : pathMaps) {
if (file.contains(ent.from)) {
String newf = file.replace(ent.from, ent.to);
- File fo = new File(newf);
+ File fo = new File(newf);
if (fo.exists() && fo.isFile()) {
line = line.substring(0, 6) + newf;
break;
@@ -330,13 +330,13 @@ public class DoMerges {
waitFor(p, false);
writer.flush();
writer.close();
-
+
p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "am", "-k", outputFile.getCanonicalPath()}));
-
+
if (waitFor(p, false) != 0) {
p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "status"}));
runProcess(p);
-
+
if (doCommit()) {
records.add("M " + ver);
}
@@ -346,11 +346,11 @@ public class DoMerges {
outputFile.delete();
}
private static String getPatchId(String id) throws Exception {
-
+
String commands[] = new String[] { "git", "show", id};
Process p = Runtime.getRuntime().exec(commands);
InputStream in = p.getInputStream();
-
+
commands = new String[] { "git", "patch-id"};
Process p2 = Runtime.getRuntime().exec(commands);
OutputStream out = p2.getOutputStream();
@@ -363,14 +363,14 @@ public class DoMerges {
}
p.waitFor();
out.close();
-
+
id = r2.readLine();
p2.waitFor();
-
+
id = id.substring(0, id.indexOf(" "));
return id;
}
-
+
private static String getUserName() throws Exception {
BufferedReader reader;
String line;
@@ -381,24 +381,24 @@ public class DoMerges {
p.waitFor();
return line;
}
-
+
public static void main(String a[]) throws Exception {
File file = new File(".git-commit-message.txt");
if (file.exists()) {
//make sure we delete this to not cause confusion
file.delete();
}
-
+
System.out.println("Updating directory");
doUpdate();
-
+
List<String> args = new LinkedList<String>(Arrays.asList(a));
List<String> check = new LinkedList<String>();
while (!args.isEmpty()) {
String get = args.remove(0);
-
- if ("-auto".equals(get)) {
+
+ if ("-auto".equals(get)) {
auto = true;
} else if ("-me".equals(get)) {
username = getUserName();
@@ -409,7 +409,7 @@ public class DoMerges {
}
}
-
+
List<String> verList = getAvailableUpdates();
if (!check.isEmpty()) {
List<String> newList = new LinkedList<String>();
@@ -428,10 +428,10 @@ public class DoMerges {
System.out.println("Merging versions (" + verList.size() + "): " + verList);
List<String[]> gitLogs = null;
- //with GIT, we can relatively quickly check the logs on the current branch
+ //with GIT, we can relatively quickly check the logs on the current branch
//and compare with what should be merged and check if things are already merged
gitLogs = getGitLogs();
-
+
Set<String> jiras = new TreeSet<String>();
for (int cur = 0; cur < verList.size(); cur++) {
@@ -446,7 +446,7 @@ public class DoMerges {
System.out.println();
System.out.println("Merging: " + ver + " (" + (cur + 1) + "/" + verList.size() + ")");
//System.out.println("http://svn.apache.org/viewvc?view=revision&revision=" + ver);
-
+
for (String s : jiras) {
System.out.println("https://issues.apache.org/jira/browse/" + s);
}
@@ -459,7 +459,7 @@ public class DoMerges {
System.out.println(s);
log.append(s).append("\n");
}
-
+
char c = auto ? 'M' : 0;
if (checkPatchId(ver)) {
continue;
@@ -553,7 +553,7 @@ public class DoMerges {
matchingLogs.add(ll);
}
}
-
+
if (!matchingLogs.isEmpty()) {
//everything in the source log is in a log on this branch, let's prompt to record the merge
System.out.println("Found possible commit(s) already on branch:");
@@ -563,7 +563,7 @@ public class DoMerges {
}
System.out.println("------------------------");
}
-
+
while (System.in.available() > 0) {
System.in.read();
}
@@ -579,33 +579,33 @@ public class DoMerges {
}
}
return false;
- }
+ }
private static List<String> compareLogs(String[] f, String[] logLines) throws IOException {
ArrayList<String> onBranch = new ArrayList<>(f.length);
for (String s : f) {
if (s.trim().startsWith("Conflicts:")) {
break;
}
- if (s.trim().length() > 0
+ if (s.trim().length() > 0
&& s.charAt(0) == ' '
&& !s.contains("git-svn-id")) {
onBranch.add(s.trim());
}
}
-
+
List<String> ll = new ArrayList<>();
for (String s : logLines) {
- if (s.trim().length() > 0
+ if (s.trim().length() > 0
&& onBranch.remove(s.trim())
&& !s.startsWith("Author: ")
&& !s.startsWith("Date: ")
- && !s.contains("git-svn-id")) {
+ && !s.contains("git-svn-id")) {
ll.add(s);
- }
+ }
}
return ll;
}
-
+
private static String[] getCommandLine(String[] args) {
List<String> argLine = new ArrayList<>();
@@ -632,8 +632,8 @@ public class DoMerges {
private static boolean isWindows() {
return System.getProperty("os.name").toLowerCase().indexOf("windows") != -1;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/Bus.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/Bus.java b/core/src/main/java/org/apache/cxf/Bus.java
index b06f0a7..436a33f 100644
--- a/core/src/main/java/org/apache/cxf/Bus.java
+++ b/core/src/main/java/org/apache/cxf/Bus.java
@@ -35,28 +35,28 @@ public interface Bus extends InterceptorProvider {
enum BusState {
INITIAL, INITIALIZING, RUNNING, SHUTTING_DOWN, SHUTDOWN;
}
-
+
String DEFAULT_BUS_ID = "cxf";
-
+
<T> T getExtension(Class<T> extensionType);
-
+
<T> void setExtension(T extension, Class<T> extensionType);
-
+
boolean hasExtensionByName(String name);
-
+
String getId();
void setId(String i);
-
+
void shutdown(boolean wait);
-
+
void setProperty(String s, Object o);
Object getProperty(String s);
void setProperties(Map<String, Object> properties);
- Map<String, Object> getProperties();
-
+ Map<String, Object> getProperties();
+
Collection<Feature> getFeatures();
void setFeatures(Collection<? extends Feature> features);
-
+
BusState getState();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/BusFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/BusFactory.java b/core/src/main/java/org/apache/cxf/BusFactory.java
index 7f1dd01..ad50d27 100644
--- a/core/src/main/java/org/apache/cxf/BusFactory.java
+++ b/core/src/main/java/org/apache/cxf/BusFactory.java
@@ -68,12 +68,12 @@ public abstract class BusFactory {
public static final String DEFAULT_BUS_FACTORY = "org.apache.cxf.bus.CXFBusFactory";
protected static Bus defaultBus;
-
+
static class BusHolder {
Bus bus;
volatile boolean stale;
}
-
+
protected static final Map<Thread, BusHolder> THREAD_BUSSES = new WeakHashMap<Thread, BusHolder>();
protected static final ThreadLocal<BusHolder> THREAD_BUS = new ThreadLocal<BusHolder>();
@@ -113,7 +113,7 @@ public abstract class BusFactory {
return defaultBus;
}
}
-
+
private static BusHolder getThreadBusHolder(boolean set) {
BusHolder h = THREAD_BUS.get();
if (h == null || h.stale) {
@@ -123,7 +123,7 @@ public abstract class BusFactory {
}
if (h == null || h.stale) {
h = new BusHolder();
-
+
synchronized (THREAD_BUSSES) {
THREAD_BUSSES.put(cur, h);
}
@@ -134,7 +134,7 @@ public abstract class BusFactory {
}
return h;
}
-
+
/**
* Sets the default bus.
@@ -175,7 +175,7 @@ public abstract class BusFactory {
b.bus = bus;
}
}
-
+
/**
* Sets the default bus for the thread.
*
@@ -265,7 +265,7 @@ public abstract class BusFactory {
if (itBus != null) {
itBus.bus = null;
//mark as stale so if a thread asks again, it will create a new one
- itBus.stale = true;
+ itBus.stale = true;
}
//This will remove the BusHolder from the only place that should
//strongly reference it
@@ -327,7 +327,7 @@ public abstract class BusFactory {
try {
busFactoryClass = ClassLoaderUtils.loadClass(className, BusFactory.class)
.asSubclass(BusFactory.class);
-
+
instance = busFactoryClass.newInstance();
} catch (Exception ex) {
LogUtils.log(LOG, Level.SEVERE, "BUS_FACTORY_INSTANTIATION_EXC", ex);
@@ -384,7 +384,7 @@ public abstract class BusFactory {
busFactoryCondition = rd.readLine();
}
}
- if (isValidBusFactoryClass(busFactoryClass)
+ if (isValidBusFactoryClass(busFactoryClass)
&& busFactoryCondition != null) {
try {
Class<?> cls = ClassLoaderUtils.loadClass(busFactoryClass, BusFactory.class)
@@ -404,7 +404,7 @@ public abstract class BusFactory {
} catch (NoClassDefFoundError e) {
busFactoryClass = DEFAULT_BUS_FACTORY;
}
-
+
}
return busFactoryClass;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/DataBinding.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/DataBinding.java b/core/src/main/java/org/apache/cxf/annotations/DataBinding.java
index 4fdf090..2dd2bca 100644
--- a/core/src/main/java/org/apache/cxf/annotations/DataBinding.java
+++ b/core/src/main/java/org/apache/cxf/annotations/DataBinding.java
@@ -35,9 +35,9 @@ import java.lang.annotation.Target;
@Inherited
public @interface DataBinding {
Class<? extends org.apache.cxf.databinding.DataBinding> value();
-
+
/**
- * Bean reference to lookup in configuration. Bean must be castable
+ * Bean reference to lookup in configuration. Bean must be castable
* to the Class set above
* @return The id of the bean reference
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/EndpointProperties.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/EndpointProperties.java b/core/src/main/java/org/apache/cxf/annotations/EndpointProperties.java
index c223741..5630890 100644
--- a/core/src/main/java/org/apache/cxf/annotations/EndpointProperties.java
+++ b/core/src/main/java/org/apache/cxf/annotations/EndpointProperties.java
@@ -34,12 +34,12 @@ import java.lang.annotation.Target;
@Target({ ElementType.TYPE })
@Inherited
public @interface EndpointProperties {
-
+
/**
* The properties
* @return the list of properties to set
*/
EndpointProperty[] value();
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/EndpointProperty.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/EndpointProperty.java b/core/src/main/java/org/apache/cxf/annotations/EndpointProperty.java
index 0893697..ba90083 100644
--- a/core/src/main/java/org/apache/cxf/annotations/EndpointProperty.java
+++ b/core/src/main/java/org/apache/cxf/annotations/EndpointProperty.java
@@ -34,35 +34,35 @@ import java.lang.annotation.Target;
@Target({ ElementType.TYPE })
@Inherited
public @interface EndpointProperty {
-
+
/**
* The value(s) of the property
* @return the value of the property
*/
String[] value() default { };
-
+
/**
* The key to record the property
* @return the key for the property
*/
String key();
-
+
/**
* Reference to a named bean that is looked up from the
- * configuration associated with the application.
+ * configuration associated with the application.
*/
String ref() default "";
-
+
/**
* The class for the property. If "ref" is specified,
* this class is used to cast the looked up reference
- * to make sure the Object is of the correct type.
- *
+ * to make sure the Object is of the correct type.
+ *
* If ref is not set and value is not set, this class
- * is used to create a bean. The class must have either
+ * is used to create a bean. The class must have either
* a default constructor, a constructor that takes an
* org.apache.cxf.endpoint.Endpoint, or a constructor
- * that takes a org.apache.cxf.endpoint.Endpoint and
+ * that takes a org.apache.cxf.endpoint.Endpoint and
* an org.apache.cxf.Bus.
*/
Class<?> beanClass() default Object.class;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/FactoryType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/FactoryType.java b/core/src/main/java/org/apache/cxf/annotations/FactoryType.java
index 954c106..b25fbfc 100644
--- a/core/src/main/java/org/apache/cxf/annotations/FactoryType.java
+++ b/core/src/main/java/org/apache/cxf/annotations/FactoryType.java
@@ -30,8 +30,8 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.service.invoker.Factory;
/**
* Defines the factory used for the service.
- *
- * Either use the factoryClass attribute to define your own
+ *
+ * Either use the factoryClass attribute to define your own
* factory or use one of the "value" convenience enums.
*/
@Documented
@@ -41,24 +41,24 @@ import org.apache.cxf.service.invoker.Factory;
public @interface FactoryType {
Type value() default Type.Singleton;
-
+
String[] args() default { };
-
+
/**
* The class for the factory. It MUST have a constructor that takes
* two arguments:
* 1) The Class for the service
- * 2) String[] of the args from above
+ * 2) String[] of the args from above
*/
Class<? extends Factory> factoryClass() default DEFAULT.class;
-
+
enum Type {
Singleton,
Session,
Pooled, //args[0] is the size of the pool
PerRequest
};
-
+
final class DEFAULT implements Factory {
public Object create(Exchange e) throws Throwable {
return null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/FastInfoset.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/FastInfoset.java b/core/src/main/java/org/apache/cxf/annotations/FastInfoset.java
index 1082d8c..d3df141 100644
--- a/core/src/main/java/org/apache/cxf/annotations/FastInfoset.java
+++ b/core/src/main/java/org/apache/cxf/annotations/FastInfoset.java
@@ -79,6 +79,6 @@ public @interface FastInfoset {
* Fast Infoset data.
*/
int serializerMaxCharacterContentChunkSize() default -1;
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/Logging.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/Logging.java b/core/src/main/java/org/apache/cxf/annotations/Logging.java
index 120e5b9..3300f16 100644
--- a/core/src/main/java/org/apache/cxf/annotations/Logging.java
+++ b/core/src/main/java/org/apache/cxf/annotations/Logging.java
@@ -37,26 +37,26 @@ import org.apache.cxf.interceptor.AbstractLoggingInterceptor;
@Inherited
public @interface Logging {
/**
- * The size limit at which messages are truncated in the log
+ * The size limit at which messages are truncated in the log
*/
int limit() default AbstractLoggingInterceptor.DEFAULT_LIMIT;
-
+
/**
* the locations where the messages are logged. The default is
- * <logger> which means to log to the java.util.logging.Logger,
- * but <stdout>, <stderr>, and a "file:/.." URI are acceptable.
+ * <logger> which means to log to the java.util.logging.Logger,
+ * but <stdout>, <stderr>, and a "file:/.." URI are acceptable.
*/
String inLocation() default "<logger>";
String outLocation() default "<logger>";
-
-
+
+
/**
* For XML content, turn on pretty printing in the logs
*/
boolean pretty() default false;
-
+
/**
- * Ignore binary payloads by default
+ * Ignore binary payloads by default
*/
boolean showBinary() default false;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/Policies.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/Policies.java b/core/src/main/java/org/apache/cxf/annotations/Policies.java
index 1313b5d..88cf885 100644
--- a/core/src/main/java/org/apache/cxf/annotations/Policies.java
+++ b/core/src/main/java/org/apache/cxf/annotations/Policies.java
@@ -29,9 +29,9 @@ import java.lang.annotation.Target;
/**
- * Used to attach multiple Policy annotations
+ * Used to attach multiple Policy annotations
* to a method or type if policies need to be added
- * to more than one place in the wsdl.
+ * to more than one place in the wsdl.
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)