You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/07/14 18:11:40 UTC
svn commit: r1610454 [5/6] - in /tomee/tomee/trunk/server: ./
openejb-activemq/ openejb-axis/
openejb-axis/src/main/java/org/apache/openejb/server/axis/
openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/
openejb-axis/src/main/java/org...
Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpResponseImpl.java Mon Jul 14 16:11:36 2014
@@ -38,33 +38,54 @@ import java.util.Locale;
import java.util.Map;
import java.util.StringTokenizer;
-/** This class takes care of HTTP Responses. It sends data back to the browser.
+/**
+ * This class takes care of HTTP Responses. It sends data back to the browser.
*/
public class HttpResponseImpl implements HttpResponse {
- /** Response string */
+ /**
+ * Response string
+ */
private String responseString = "OK";
- /** Code */
+ /**
+ * Code
+ */
private int code = HttpServletResponse.SC_OK;
- /** Response headers */
- private final Map<String,String> headers = new HashMap<String,String>();
+ /**
+ * Response headers
+ */
+ private final Map<String, String> headers = new HashMap<String, String>();
- /** the writer for the response */
+ /**
+ * the writer for the response
+ */
private transient PrintWriter writer;
- /** the raw body */
+ /**
+ * the raw body
+ */
private transient ServletByteArrayOutputStream sosi;
- /** the HTTP version */
+ /**
+ * the HTTP version
+ */
public static final String HTTP_VERSION = "HTTP/1.1";
- /** a line feed character */
+ /**
+ * a line feed character
+ */
public static final String CRLF = "\r\n";
- /** a space character */
+ /**
+ * a space character
+ */
public static final String SP = " ";
- /** a colon and space */
+ /**
+ * a colon and space
+ */
public static final String CSP = ": ";
- /** the server to send data from */
+ /**
+ * the server to send data from
+ */
public static String server;
private HttpRequestImpl request;
@@ -74,15 +95,17 @@ public class HttpResponseImpl implements
private String encoding = "UTF-8";
private Locale locale = Locale.getDefault();
- protected void setRequest(HttpRequestImpl request){
+ protected void setRequest(HttpRequestImpl request) {
this.request = request;
}
- /** sets a header to be sent back to the browser
- * @param name the name of the header
+ /**
+ * sets a header to be sent back to the browser
+ *
+ * @param name the name of the header
* @param value the value of the header
*/
- public void setHeader(String name, String value){
+ public void setHeader(String name, String value) {
headers.put(name, value);
}
@@ -151,11 +174,13 @@ public class HttpResponseImpl implements
return encodeRedirectURL(s);
}
- /** Gets a header based on the name passed in
+ /**
+ * Gets a header based on the name passed in
+ *
* @param name The name of the header
* @return the value of the header
*/
- public String getHeader(String name){
+ public String getHeader(String name) {
return headers.get(name);
}
@@ -195,10 +220,12 @@ public class HttpResponseImpl implements
addDateHeader(s, l);
}
- /** gets the OutputStream to send data to the browser
+ /**
+ * gets the OutputStream to send data to the browser
+ *
* @return the OutputStream to send data to the browser
*/
- public ServletOutputStream getOutputStream(){
+ public ServletOutputStream getOutputStream() {
return sosi;
}
@@ -226,8 +253,9 @@ public class HttpResponseImpl implements
return encoding;
}
- /** sets the HTTP response code to be sent to the browser. These codes are:
- *
+ /**
+ * sets the HTTP response code to be sent to the browser. These codes are:
+ * <p/>
* OPTIONS = 0
* GET = 1
* HEAD = 2
@@ -237,24 +265,29 @@ public class HttpResponseImpl implements
* TRACE = 6
* CONNECT = 7
* UNSUPPORTED = 8
+ *
* @param code the code to be sent to the browser
*/
- public void setCode(int code){
+ public void setCode(int code) {
this.code = code;
commited = true;
}
- /** gets the HTTP response code
+ /**
+ * gets the HTTP response code
+ *
* @return the HTTP response code
*/
- public int getCode(){
+ public int getCode() {
return code;
}
- /** sets the content type to be sent back to the browser
+ /**
+ * sets the content type to be sent back to the browser
+ *
* @param type the type to be sent to the browser (i.e. "text/html")
*/
- public void setContentType(String type){
+ public void setContentType(String type) {
setHeader("Content-Type", type);
}
@@ -263,10 +296,12 @@ public class HttpResponseImpl implements
locale = loc;
}
- /** gets the content type that will be sent to the browser
+ /**
+ * gets the content type that will be sent to the browser
+ *
* @return the content type (i.e. "text/html")
*/
- public String getContentType(){
+ public String getContentType() {
return getHeader("Content-Type");
}
@@ -275,15 +310,19 @@ public class HttpResponseImpl implements
return locale;
}
- /** Sets the response string to be sent to the browser
+ /**
+ * Sets the response string to be sent to the browser
+ *
* @param responseString the response string
*/
- public void setResponseString(String responseString){
- this.responseString = responseString;
+ public void setResponseString(String responseString) {
+ this.responseString = responseString;
}
- /** resets the data to be sent to the browser */
- public void reset(){
+ /**
+ * resets the data to be sent to the browser
+ */
+ public void reset() {
initBody();
}
@@ -307,12 +346,14 @@ public class HttpResponseImpl implements
// no-op
}
- /** resets the data to be sent to the browser with the response code and response
+ /**
+ * resets the data to be sent to the browser with the response code and response
* string
- * @param code the code to be sent to the browser
+ *
+ * @param code the code to be sent to the browser
* @param responseString the response string to be sent to the browser
*/
- public void reset(int code, String responseString){
+ public void reset(int code, String responseString) {
setCode(code);
setResponseString(responseString);
initBody();
@@ -321,43 +362,50 @@ public class HttpResponseImpl implements
/*------------------------------------------------------------*/
/* Methods for writing out a response */
/*------------------------------------------------------------*/
- /** creates a new instance of HttpResponseImpl with default values */
- protected HttpResponseImpl(){
+
+ /**
+ * creates a new instance of HttpResponseImpl with default values
+ */
+ protected HttpResponseImpl() {
this(200, "OK", "text/html");
}
- /** Creates a new HttpResponseImpl with user provided parameters
- * @param code the HTTP Response code, see <a href="http://www.ietf.org/rfc/rfc2616.txt">http://www.ietf.org/rfc/rfc2616.txt</a>
- * for these codes
+ /**
+ * Creates a new HttpResponseImpl with user provided parameters
+ *
+ * @param code the HTTP Response code, see <a href="http://www.ietf.org/rfc/rfc2616.txt">http://www.ietf.org/rfc/rfc2616.txt</a>
+ * for these codes
* @param responseString the response string to be sent back
- * @param contentType the content type to be sent back
+ * @param contentType the content type to be sent back
*/
- protected HttpResponseImpl(int code, String responseString, String contentType){
+ protected HttpResponseImpl(int code, String responseString, String contentType) {
this.responseString = responseString;
this.code = code;
// Default headers
setHeader("Server", getServerName());
- setHeader("Connection","close");
- setHeader("Content-Type",contentType);
+ setHeader("Connection", "close");
+ setHeader("Content-Type", contentType);
// create the body.
initBody();
}
- /** Takes care of sending the response line, headers and body
- *
+ /**
+ * Takes care of sending the response line, headers and body
+ * <p/>
* HTTP/1.1 200 OK
* Server: Netscape-Enterprise/3.6 SP3
* Date: Thu, 07 Jun 2001 17:30:42 GMT
* Content-Type: text/html
* Connection: close
+ *
* @param output the output to send the response to
* @throws java.io.IOException if an exception is thrown
*/
- protected void writeMessage(OutputStream output, boolean indent) throws IOException{
+ protected void writeMessage(OutputStream output, boolean indent) throws IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- DataOutputStream out = new DataOutputStream(baos);
+ DataOutputStream out = new DataOutputStream(baos);
//DataOutput log = new DataOutputStream(System.out);
//System.out.println("\nRESPONSE");
closeMessage();
@@ -372,22 +420,27 @@ public class HttpResponseImpl implements
output.flush();
}
- /** initalizes the body */
- private void initBody(){
+ /**
+ * initalizes the body
+ */
+ private void initBody() {
sosi = new ServletByteArrayOutputStream();
writer = new PrintWriter(sosi);
}
- /** Creates a string version of the response similar to:
- *
+ /**
+ * Creates a string version of the response similar to:
+ * <p/>
* HTTP/1.1 200 OK
+ *
* @return the string value of this HttpResponseImpl
*/
public String toString() {
return HTTP_VERSION + SP + code + SP + responseString;
}
- /** closes the message sent to the browser
+ /**
+ * closes the message sent to the browser
*/
private void closeMessage() {
setContentLengthHeader();
@@ -396,13 +449,13 @@ public class HttpResponseImpl implements
private void setContentLengthHeader() {
- if (content == null){
+ if (content == null) {
writer.flush();
writer.close();
int length = sosi.getOutputStream().toByteArray().length;
setHeader("Content-Length", length + "");
} else {
- setHeader("Content-Length", content.getContentLength()+"");
+ setHeader("Content-Length", content.getContentLength() + "");
}
}
@@ -419,44 +472,50 @@ public class HttpResponseImpl implements
headers.put(HttpRequest.HEADER_SET_COOKIE, HttpRequestImpl.EJBSESSIONID + '=' + session.getId() + "; Path=/");
}
- /** Writes a response line similar to this:
- *
+ /**
+ * Writes a response line similar to this:
+ * <p/>
* HTTP/1.1 200 OK
- *
+ * <p/>
* to the browser
+ *
* @param out the output stream to write the response line to
* @throws java.io.IOException if an exception is thrown
*/
- private void writeResponseLine(DataOutput out) throws IOException{
+ private void writeResponseLine(DataOutput out) throws IOException {
out.writeBytes(HTTP_VERSION);
out.writeBytes(SP);
- out.writeBytes(code+"");
+ out.writeBytes(code + "");
out.writeBytes(SP);
out.writeBytes(responseString);
out.writeBytes(CRLF);
}
- /** writes the headers out to the browser
+ /**
+ * writes the headers out to the browser
+ *
* @param out the output stream to be sent to the browser
* @throws java.io.IOException if an exception is thrown
*/
- private void writeHeaders(DataOutput out) throws IOException{
+ private void writeHeaders(DataOutput out) throws IOException {
for (final Map.Entry<String, String> entry : headers.entrySet()) {
- out.writeBytes(""+entry.getKey());
+ out.writeBytes("" + entry.getKey());
out.writeBytes(CSP);
- out.writeBytes(""+entry.getValue());
+ out.writeBytes("" + entry.getValue());
out.writeBytes(CRLF);
}
}
- /** writes the body out to the browser
- * @param out the output stream that writes to the browser
+ /**
+ * writes the body out to the browser
+ *
+ * @param out the output stream that writes to the browser
* @param indent format xml
* @throws java.io.IOException if an exception is thrown
*/
- private void writeBody(DataOutput out, boolean indent) throws IOException{
+ private void writeBody(DataOutput out, boolean indent) throws IOException {
out.writeBytes(CRLF);
- if (content == null){
+ if (content == null) {
if (indent && OpenEJBHttpServer.isTextXml(headers)) {
final String xml = new String(sosi.getOutputStream().toByteArray());
out.write(OpenEJBHttpServer.reformat(xml).getBytes());
@@ -469,39 +528,45 @@ public class HttpResponseImpl implements
int i;
while ((i = in.read(buf)) != -1) {
- out.write(buf, 0, i);
+ out.write(buf, 0, i);
}
}
}
- /** gets the name of the server being used
+ /**
+ * gets the name of the server being used
+ *
* @return the name of the server
*/
- public String getServerName(){
+ public String getServerName() {
if (server == null) {
final String version = OpenEjbVersion.get().getVersion();
- final String os = System.getProperty("os.name")+"/"+System.getProperty("os.version")+" ("+System.getProperty("os.arch")+")";
+ final String os = System.getProperty("os.name") + "/" + System.getProperty("os.version") + " (" + System.getProperty("os.arch") + ")";
server = "OpenEJB/" + version + " " + os;
}
return server;
}
- /** This could be improved at some day in the future
+ /**
+ * This could be improved at some day in the future
* to also include a stack trace of the exceptions
+ *
* @param message the error message to be sent
* @return the HttpResponseImpl that this error belongs to
*/
- protected static HttpResponseImpl createError(String message){
+ protected static HttpResponseImpl createError(String message) {
return createError(message, null);
}
- /** creates an error with user defined variables
+ /**
+ * creates an error with user defined variables
+ *
* @param message the message of the error
- * @param t a Throwable to print a stack trace to
+ * @param t a Throwable to print a stack trace to
* @return the HttpResponseImpl that this error belongs to
*/
- protected static HttpResponseImpl createError(String message, Throwable t){
+ protected static HttpResponseImpl createError(String message, Throwable t) {
HttpResponseImpl res = new HttpResponseImpl(500, "Internal Server Error", "text/html");
PrintWriter body = null;
try {
@@ -519,17 +584,17 @@ public class HttpResponseImpl implements
StringTokenizer msg = new StringTokenizer(message, "\n\r");
while (msg.hasMoreTokens()) {
- body.print( msg.nextToken() );
+ body.print(msg.nextToken());
body.println("<br>");
}
}
if (t != null) {
- try{
+ try {
body.println("<br><br>");
body.println("Stack Trace:<br>");
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- PrintWriter writer = new PrintWriter( baos );
+ PrintWriter writer = new PrintWriter(baos);
t.printStackTrace(writer);
writer.flush();
writer.close();
@@ -537,10 +602,10 @@ public class HttpResponseImpl implements
StringTokenizer msg = new StringTokenizer(message, "\n\r");
while (msg.hasMoreTokens()) {
- body.print( msg.nextToken() );
+ body.print(msg.nextToken());
body.println("<br>");
}
- } catch (Exception e){
+ } catch (Exception e) {
}
}
@@ -550,11 +615,13 @@ public class HttpResponseImpl implements
return res;
}
- /** Creates a forbidden response to be sent to the browser using IP authentication
+ /**
+ * Creates a forbidden response to be sent to the browser using IP authentication
+ *
* @param ip the ip that is forbidden
* @return the HttpResponseImpl that this error belongs to
*/
- protected static HttpResponseImpl createForbidden(String ip){
+ protected static HttpResponseImpl createForbidden(String ip) {
HttpResponseImpl res = new HttpResponseImpl(403, "Forbidden", "text/html");
PrintWriter body = null;
try {
@@ -576,36 +643,40 @@ public class HttpResponseImpl implements
return res;
}
- /** writes this object out to a file
+ /**
+ * writes this object out to a file
+ *
* @param out the ObjectOutputStream to write to
* @throws java.io.IOException if an exception is thrown
*/
- private void writeObject(java.io.ObjectOutputStream out) throws IOException{
+ private void writeObject(java.io.ObjectOutputStream out) throws IOException {
/** Response string */
- out.writeObject( responseString );
+ out.writeObject(responseString);
/** Code */
- out.writeInt( code );
+ out.writeInt(code);
/** Response headers */
- out.writeObject( headers );
+ out.writeObject(headers);
/** Response body */
writer.flush();
byte[] body = sosi.getOutputStream().toByteArray();
//System.out.println("[] body "+body.length );
- out.writeObject( body );
+ out.writeObject(body);
}
- /** Reads in a serilized HttpResponseImpl object from a file
+ /**
+ * Reads in a serilized HttpResponseImpl object from a file
+ *
* @param in the input to read the object from
- * @throws java.io.IOException if an exception is thrown
+ * @throws java.io.IOException if an exception is thrown
* @throws ClassNotFoundException if an exception is thrown
*/
@SuppressWarnings({"unchecked"})
- private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException{
+ private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
/** Response string */
- this.responseString = (String)in.readObject();
+ this.responseString = (String) in.readObject();
/** Code */
this.code = in.readInt();
@@ -623,6 +694,7 @@ public class HttpResponseImpl implements
writer = new PrintWriter(sosi);
}
+
/**
* @param content The content to set.
*/
Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpServerFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpServerFactory.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpServerFactory.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpServerFactory.java Mon Jul 14 16:11:36 2014
@@ -28,7 +28,7 @@ public class HttpServerFactory {
} catch (Throwable e) {
// We don't have jetty
}
-
+
return new OpenEJBHttpEjbServer();
}
}
Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpSession.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpSession.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpSession.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpSession.java Mon Jul 14 16:11:36 2014
@@ -25,7 +25,6 @@ public interface HttpSession extends jav
* <code>null</code> if no object is bound under the name.
*
* @param name a string specifying the name of the object
- *
* @return the object with the specified name
*/
public Object getAttribute(String name);
@@ -35,7 +34,7 @@ public interface HttpSession extends jav
* of the same name is already bound to the session, the object is
* replaced.
*
- * @param name the name to which the object is bound; cannot be null
+ * @param name the name to which the object is bound; cannot be null
* @param value the object to be bound
*/
public void setAttribute(String name, Object value);
Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpSessionImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpSessionImpl.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpSessionImpl.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpSessionImpl.java Mon Jul 14 16:11:36 2014
@@ -18,6 +18,7 @@ package org.apache.openejb.server.httpd;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpSessionContext;
+
import org.apache.openejb.client.ArrayEnumeration;
import java.util.*;
Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/JettyHttpEjbServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/JettyHttpEjbServer.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/JettyHttpEjbServer.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/JettyHttpEjbServer.java Mon Jul 14 16:11:36 2014
@@ -23,9 +23,9 @@ import org.apache.openejb.server.SelfMan
*/
public class JettyHttpEjbServer extends HttpEjbServer implements SelfManaging {
- public JettyHttpEjbServer() {
- super();
- httpServer = new JettyHttpServer();
- }
+ public JettyHttpEjbServer() {
+ super();
+ httpServer = new JettyHttpServer();
+ }
}
\ No newline at end of file
Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpEjbServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpEjbServer.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpEjbServer.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpEjbServer.java Mon Jul 14 16:11:36 2014
@@ -21,9 +21,9 @@ package org.apache.openejb.server.httpd;
*/
public class OpenEJBHttpEjbServer extends HttpEjbServer {
- public OpenEJBHttpEjbServer() {
- super();
- httpServer = new OpenEJBHttpServer();
- }
+ public OpenEJBHttpEjbServer() {
+ super();
+ httpServer = new OpenEJBHttpServer();
+ }
}
Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpRegistry.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpRegistry.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpRegistry.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpRegistry.java Mon Jul 14 16:11:36 2014
@@ -87,7 +87,7 @@ public class OpenEJBHttpRegistry {
final URI address = uri.resolve(suffix);
addresses.add(address.toString());
}
- return addresses;
+ return addresses;
}
protected static class ClassLoaderHttpListener implements HttpListener {
Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/util/HttpUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/util/HttpUtil.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/util/HttpUtil.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/util/HttpUtil.java Mon Jul 14 16:11:36 2014
@@ -31,7 +31,7 @@ import java.util.Collection;
import java.util.List;
public final class HttpUtil {
- private static final String WILDCARD = SystemInstance.get().getProperty("openejb.http.wildcard", ".*");
+ private static final String WILDCARD = SystemInstance.get().getProperty("openejb.http.wildcard", ".*");
private HttpUtil() {
// no-op
Modified: tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/CustomHttpMethodTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/CustomHttpMethodTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/CustomHttpMethodTest.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/CustomHttpMethodTest.java Mon Jul 14 16:11:36 2014
@@ -38,7 +38,7 @@ import java.util.concurrent.atomic.Atomi
import static org.junit.Assert.assertEquals;
-@EnableServices({ "httpejbd" })
+@EnableServices({"httpejbd"})
@RunWith(ApplicationComposer.class)
public class CustomHttpMethodTest {
private int nextAvailablePort = -1;
Modified: tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/FilterRegistrationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/FilterRegistrationTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/FilterRegistrationTest.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/FilterRegistrationTest.java Mon Jul 14 16:11:36 2014
@@ -42,16 +42,16 @@ import java.net.URL;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-@EnableServices({ "httpejbd" })
+@EnableServices({"httpejbd"})
@RunWith(ApplicationComposer.class)
public class FilterRegistrationTest {
@Module
public WebApp app() {
return new WebApp()
- .contextRoot("filter")
- .addServlet("test", TestServlet.class.getName(), "/touch")
- .addFilter("filter", TestFilter.class.getName(), "/touch")
- .addFilter("filter2", TestFilter2.class.getName(), "/touch");
+ .contextRoot("filter")
+ .addServlet("test", TestServlet.class.getName(), "/touch")
+ .addFilter("filter", TestFilter.class.getName(), "/touch")
+ .addFilter("filter2", TestFilter2.class.getName(), "/touch");
}
@Test
Modified: tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpEjbServerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpEjbServerTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpEjbServerTest.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpEjbServerTest.java Mon Jul 14 16:11:36 2014
@@ -36,7 +36,7 @@ import org.apache.openejb.test.stateless
/**
* To run from intellij or another IDE add
- *
+ * <p/>
* -Dopenejb.home=/Users/dblevins/work/openejb3/server/openejb-httpd/target/test-classes
*
* @version $Revision$ $Date$
@@ -47,7 +47,7 @@ public class HttpEjbServerTest extends o
System.setProperty("openejb.test.server", HttpEjbTestServer.class.getName());
// System.setProperty("openejb.test.database", org.apache.openejb.test.DerbyTestDatabase.class.getName());
System.setProperty("openejb.test.database", org.apache.openejb.test.HsqldbTestDatabase.class.getName());
-
+
// Copied from org.apache.openejb.server.httpd.SomeoneBrokeSurefireAndThisIsADirtyHackForItTest which is now gone
System.setProperty("openejb.assembler", org.apache.openejb.assembler.classic.Assembler.class.getName());
System.setProperty("openejb.deployments.classpath.include", ".*openejb-itests-beans.*");
@@ -74,7 +74,7 @@ public class HttpEjbServerTest extends o
public static class HttpEjbTestServer implements org.apache.openejb.test.TestServer {
private ServiceDaemon serviceDaemon;
- HttpServer httpServer;
+ HttpServer httpServer;
private int port;
public void init(Properties props) {
@@ -86,7 +86,7 @@ public class HttpEjbServerTest extends o
props.put("openejb.deployments.classpath", "true");
OpenEJB.init(props, new ServerFederation());
ejbServer.init(props);
-
+
httpServer.init(props);
// Binding to port 0 means that the OS will
@@ -114,7 +114,7 @@ public class HttpEjbServerTest extends o
public void stop() {
try {
serviceDaemon.stop();
- httpServer.stop();
+ httpServer.stop();
} catch (ServiceException e) {
throw new RuntimeException("Unable to stop Test Server.", e);
}
@@ -123,7 +123,7 @@ public class HttpEjbServerTest extends o
public Properties getContextEnvironment() {
Properties props = new Properties();
props.put("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
- props.put("java.naming.provider.url", "http://127.0.0.1:"+port+"/rjp");
+ props.put("java.naming.provider.url", "http://127.0.0.1:" + port + "/rjp");
return props;
}
}
Modified: tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/JettyTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/JettyTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/JettyTest.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/JettyTest.java Mon Jul 14 16:11:36 2014
@@ -20,11 +20,11 @@ package org.apache.openejb.server.httpd;
import junit.framework.TestCase;
public class JettyTest extends TestCase {
-
- public void testDummy() {
- assertTrue(true);
- }
-
+
+ public void testDummy() {
+ assertTrue(true);
+ }
+
// public void testJettyImpl() throws Exception {
// SystemInstance.get().setComponent(ContainerSystem.class, new CoreContainerSystem());
//
Modified: tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletContextListenerRegistrationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletContextListenerRegistrationTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletContextListenerRegistrationTest.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletContextListenerRegistrationTest.java Mon Jul 14 16:11:36 2014
@@ -29,14 +29,14 @@ import java.io.IOException;
import static org.junit.Assert.assertTrue;
-@EnableServices({ "httpejbd" })
+@EnableServices({"httpejbd"})
@RunWith(ApplicationComposer.class)
public class ServletContextListenerRegistrationTest {
@Module
public WebApp app() {
return new WebApp()
- .contextRoot("init")
- .addListener(Initializer.class.getName());
+ .contextRoot("init")
+ .addListener(Initializer.class.getName());
}
@Test
Modified: tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletRegistrationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletRegistrationTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletRegistrationTest.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletRegistrationTest.java Mon Jul 14 16:11:36 2014
@@ -41,11 +41,11 @@ import static org.junit.Assert.assertEqu
@RunWith(ApplicationComposer.class)
public class ServletRegistrationTest {
@Module
- @Classes({ TestServlet.class, TestServlet2.class, TestServlet3.class, TestServlet4.class, SomeEjb.class })
+ @Classes({TestServlet.class, TestServlet2.class, TestServlet3.class, TestServlet4.class, SomeEjb.class})
public WebApp app() {
return new WebApp()
- .contextRoot("servlet")
- .addServlet("test", TestServlet.class.getName(), "/touch");
+ .contextRoot("servlet")
+ .addServlet("test", TestServlet.class.getName(), "/touch");
}
@Test
Modified: tomee/tomee/trunk/server/openejb-multicast/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-multicast/pom.xml?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-multicast/pom.xml (original)
+++ tomee/tomee/trunk/server/openejb-multicast/pom.xml Mon Jul 14 16:11:36 2014
@@ -19,7 +19,8 @@
<!-- $Rev$ $Date$ -->
-<project xmlns="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">
+<project xmlns="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">
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
Modified: tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/EchoNet.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/EchoNet.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/EchoNet.java (original)
+++ tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/EchoNet.java Mon Jul 14 16:11:36 2014
@@ -57,7 +57,7 @@ public class EchoNet {
// get out of the 1000 port range
servers += base;
-
+
MultipointServer lastServer = null;
for (int i = base; i < servers; i++) {
MultipointServer newServer = new MultipointServer(multiple * i, new Tracker.Builder().build()).start();
@@ -80,7 +80,7 @@ public class EchoNet {
for (int i = 1; i <= x; i++) {
for (int j = 1; j <= x; j++) {
- if (i==j) continue;
+ if (i == j) continue;
Item item = new Item(i, j);
boolean b = set.add(item);
Modified: tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastDiscoveryAgent.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastDiscoveryAgent.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastDiscoveryAgent.java (original)
+++ tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastDiscoveryAgent.java Mon Jul 14 16:11:36 2014
@@ -252,7 +252,7 @@ public class MulticastDiscoveryAgent imp
final String message = e.getMessage();
if (null != message && message.toLowerCase().contains("operation not permitted")) {
log.error("The 'Operation not permitted' error has been know to be caused by improper firewall/network setup. "
- + "Please make sure that the OS is properly configured to allow multicast traffic over: " + multicast.getLocalAddress());
+ + "Please make sure that the OS is properly configured to allow multicast traffic over: " + multicast.getLocalAddress());
}
}
}
Modified: tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastPulseAgent.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastPulseAgent.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastPulseAgent.java (original)
+++ tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastPulseAgent.java Mon Jul 14 16:11:36 2014
@@ -198,7 +198,7 @@ public class MulticastPulseAgent impleme
if (bytes.length > 2048) {
log.warning("MultiPulse packet is larger than 2048 bytes, clients will not be able to read the packet" +
- "\n - You should define the 'ignore' property to filter out unreachable addresses: " + sb);
+ "\n - You should define the 'ignore' property to filter out unreachable addresses: " + sb);
}
} finally {
l.unlock();
@@ -350,7 +350,7 @@ public class MulticastPulseAgent impleme
MulticastPulseAgent.this.fireEvent(URI.create("OpenEJB" + BADURI + badUri), false);
log.warning("This server has removed the unreachable host '" + badUri + "' from discovery, you should consider adding" +
- " this to the 'ignore' property in the multipulse.properties file");
+ " this to the 'ignore' property in the multipulse.properties file");
}
} finally {
@@ -365,8 +365,8 @@ public class MulticastPulseAgent impleme
//We only have local services, so make sure the request is from a local source else ignore it
if (log.isDebugEnabled()) {
log.debug(String.format("Ignoring remote client %1$s pulse request for group: %2$s - No remote services available",
- client,
- req));
+ client,
+ req));
}
} else {
Modified: tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java (original)
+++ tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java Mon Jul 14 16:11:36 2014
@@ -137,13 +137,13 @@ public class MultipointServer {
this.reconnectDelay = reconnectDelay.getTime(TimeUnit.NANOSECONDS);
final String format = String.format("MultipointServer(bindHost=%s, discoveryHost=%s, port=%s, name=%s, debug=%s, roots=%s, reconnectDelay='%s')",
- bindHost,
- broadcastHost,
- port,
- name,
- debug,
- this.roots.size(),
- reconnectDelay.toString());
+ bindHost,
+ broadcastHost,
+ port,
+ name,
+ debug,
+ this.roots.size(),
+ reconnectDelay.toString());
log.debug(format);
@@ -464,14 +464,14 @@ public class MultipointServer {
@Override
public String toString() {
return "Session{" +
- "uri=" + uri +
- ", created=" + created +
- ", state=" + state +
- ", owner=" + port +
- ", s=" + (client ? channel.socket().getPort() : channel.socket().getLocalPort()) +
- ", c=" + (!client ? channel.socket().getPort() : channel.socket().getLocalPort()) +
- ", " + (client ? "client" : "server") +
- '}';
+ "uri=" + uri +
+ ", created=" + created +
+ ", state=" + state +
+ ", owner=" + port +
+ ", s=" + (client ? channel.socket().getPort() : channel.socket().getLocalPort()) +
+ ", c=" + (!client ? channel.socket().getPort() : channel.socket().getLocalPort()) +
+ ", " + (client ? "client" : "server") +
+ '}';
}
private long last = 0;
@@ -1086,121 +1086,121 @@ public class MultipointServer {
@Override
public String toString() {
return "MultipointServer{" +
- "name='" + name + '\'' +
- ", me=" + me +
- '}';
+ "name='" + name + '\'' +
+ ", me=" + me +
+ '}';
}
public static String randomColor() {
final String[] colors = {
- "almond",
- "amber",
- "amethyst",
- "apple",
- "apricot",
- "aqua",
- "aquamarine",
- "ash",
- "azure",
- "banana",
- "beige",
- "black",
- "blue",
- "brick",
- "bronze",
- "brown",
- "burgundy",
- "carrot",
- "charcoal",
- "cherry",
- "chestnut",
- "chocolate",
- "chrome",
- "cinnamon",
- "citrine",
- "cobalt",
- "copper",
- "coral",
- "cornflower",
- "cotton",
- "cream",
- "crimson",
- "cyan",
- "ebony",
- "emerald",
- "forest",
- "fuchsia",
- "ginger",
- "gold",
- "goldenrod",
- "gray",
- "green",
- "grey",
- "indigo",
- "ivory",
- "jade",
- "jasmine",
- "khaki",
- "lava",
- "lavender",
- "lemon",
- "lilac",
- "lime",
- "macaroni",
- "magenta",
- "magnolia",
- "mahogany",
- "malachite",
- "mango",
- "maroon",
- "mauve",
- "mint",
- "moonstone",
- "navy",
- "ocean",
- "olive",
- "onyx",
- "orange",
- "orchid",
- "papaya",
- "peach",
- "pear",
- "pearl",
- "periwinkle",
- "pine",
- "pink",
- "pistachio",
- "platinum",
- "plum",
- "prune",
- "pumpkin",
- "purple",
- "quartz",
- "raspberry",
- "red",
- "rose",
- "rosewood",
- "ruby",
- "salmon",
- "sapphire",
- "scarlet",
- "sienna",
- "silver",
- "slate",
- "strawberry",
- "tan",
- "tangerine",
- "taupe",
- "teal",
- "titanium",
- "topaz",
- "turquoise",
- "umber",
- "vanilla",
- "violet",
- "watermelon",
- "white",
- "yellow"
+ "almond",
+ "amber",
+ "amethyst",
+ "apple",
+ "apricot",
+ "aqua",
+ "aquamarine",
+ "ash",
+ "azure",
+ "banana",
+ "beige",
+ "black",
+ "blue",
+ "brick",
+ "bronze",
+ "brown",
+ "burgundy",
+ "carrot",
+ "charcoal",
+ "cherry",
+ "chestnut",
+ "chocolate",
+ "chrome",
+ "cinnamon",
+ "citrine",
+ "cobalt",
+ "copper",
+ "coral",
+ "cornflower",
+ "cotton",
+ "cream",
+ "crimson",
+ "cyan",
+ "ebony",
+ "emerald",
+ "forest",
+ "fuchsia",
+ "ginger",
+ "gold",
+ "goldenrod",
+ "gray",
+ "green",
+ "grey",
+ "indigo",
+ "ivory",
+ "jade",
+ "jasmine",
+ "khaki",
+ "lava",
+ "lavender",
+ "lemon",
+ "lilac",
+ "lime",
+ "macaroni",
+ "magenta",
+ "magnolia",
+ "mahogany",
+ "malachite",
+ "mango",
+ "maroon",
+ "mauve",
+ "mint",
+ "moonstone",
+ "navy",
+ "ocean",
+ "olive",
+ "onyx",
+ "orange",
+ "orchid",
+ "papaya",
+ "peach",
+ "pear",
+ "pearl",
+ "periwinkle",
+ "pine",
+ "pink",
+ "pistachio",
+ "platinum",
+ "plum",
+ "prune",
+ "pumpkin",
+ "purple",
+ "quartz",
+ "raspberry",
+ "red",
+ "rose",
+ "rosewood",
+ "ruby",
+ "salmon",
+ "sapphire",
+ "scarlet",
+ "sienna",
+ "silver",
+ "slate",
+ "strawberry",
+ "tan",
+ "tangerine",
+ "taupe",
+ "teal",
+ "titanium",
+ "topaz",
+ "turquoise",
+ "umber",
+ "vanilla",
+ "violet",
+ "watermelon",
+ "white",
+ "yellow"
};
final Random random = new Random();
Modified: tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/Tracker.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/Tracker.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/Tracker.java (original)
+++ tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/Tracker.java Mon Jul 14 16:11:36 2014
@@ -267,9 +267,9 @@ public class Tracker {
@Override
public String toString() {
return "Service{" +
- "uri=" + uri +
- ", broadcastString='" + broadcastString + '\'' +
- '}';
+ "uri=" + uri +
+ ", broadcastString='" + broadcastString + '\'' +
+ '}';
}
}
@@ -327,8 +327,8 @@ public class Tracker {
if (debug()) {
log.debug("Remote failure of " + service + " while still receiving multicast advertisements. " +
- "Advertising events will be suppressed for " + delay
- + " ms, the current failure count is: " + failureCount);
+ "Advertising events will be suppressed for " + delay
+ + " ms, the current failure count is: " + failureCount);
}
recoveryTime = System.currentTimeMillis() + delay;
@@ -339,7 +339,7 @@ public class Tracker {
/**
* @return true if this broker is marked failed and it is now the right
- * time to start recovery.
+ * time to start recovery.
*/
public synchronized boolean doRecovery() {
if (!dead) {
@@ -373,11 +373,11 @@ public class Tracker {
@Override
public String toString() {
return service + "Vitals{" +
- ", lastHeartBeat=" + lastHeartBeat +
- ", recoveryTime=" + recoveryTime +
- ", failureCount=" + failureCount +
- ", dead=" + dead +
- '}';
+ ", lastHeartBeat=" + lastHeartBeat +
+ ", recoveryTime=" + recoveryTime +
+ ", failureCount=" + failureCount +
+ ", dead=" + dead +
+ '}';
}
}
@@ -477,17 +477,17 @@ public class Tracker {
@Override
public String toString() {
return "Tracker{" +
- "group='" + group + '\'' +
- ", groupPrefix='" + groupPrefix + '\'' +
- ", heartRate=" + heartRate +
- ", maxMissedHeartbeats=" + maxMissedHeartbeats +
- ", reconnectDelay=" + reconnectDelay +
- ", maxReconnectDelay=" + maxReconnectDelay +
- ", maxReconnectAttempts=" + maxReconnectAttempts +
- ", exponentialBackoff=" + exponentialBackoff +
- ", useExponentialBackOff=" + useExponentialBackOff +
- ", registeredServices=" + registeredServices.size() +
- ", discoveredServices=" + discoveredServices.size() +
- '}';
+ "group='" + group + '\'' +
+ ", groupPrefix='" + groupPrefix + '\'' +
+ ", heartRate=" + heartRate +
+ ", maxMissedHeartbeats=" + maxMissedHeartbeats +
+ ", reconnectDelay=" + reconnectDelay +
+ ", maxReconnectDelay=" + maxReconnectDelay +
+ ", maxReconnectAttempts=" + maxReconnectAttempts +
+ ", exponentialBackoff=" + exponentialBackoff +
+ ", useExponentialBackOff=" + useExponentialBackOff +
+ ", registeredServices=" + registeredServices.size() +
+ ", discoveredServices=" + discoveredServices.size() +
+ '}';
}
}
Modified: tomee/tomee/trunk/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java (original)
+++ tomee/tomee/trunk/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java Mon Jul 14 16:11:36 2014
@@ -225,9 +225,9 @@ public class MulticastPulseAgentTest {
final String[] hosts = s.split(",");
System.out.println(String.format("\n" + name + " received Server pulse:\n\tGroup: %1$s\n\tServices: %2$s\n\tServer: %3$s\n",
- group,
- services,
- s));
+ group,
+ services,
+ s));
for (final String svc : serviceList) {
Modified: tomee/tomee/trunk/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgentTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgentTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgentTest.java (original)
+++ tomee/tomee/trunk/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgentTest.java Mon Jul 14 16:11:36 2014
@@ -72,8 +72,8 @@ public class MultipointDiscoveryAgentTes
final int PEERS = names.length;
final CountDownLatch[] latches = {
- new CountDownLatch(PEERS + 1),
- new CountDownLatch(PEERS + 1)
+ new CountDownLatch(PEERS + 1),
+ new CountDownLatch(PEERS + 1)
};
final DiscoveryListener listener = new DiscoveryListener() {
@@ -152,7 +152,7 @@ public class MultipointDiscoveryAgentTes
}
private Node launch(final Node green, final String color, final int port) throws Exception {
- final URI orangeService = new URI(color + "://localhost:"+ port);
+ final URI orangeService = new URI(color + "://localhost:" + port);
final Node orange = new Node(port, new Listener(color), color, green.getURI());
orange.getRegistry().registerService(orangeService);
Thread.sleep(100);
@@ -172,7 +172,7 @@ public class MultipointDiscoveryAgentTes
this.agent = new MultipointDiscoveryAgent(debug, name);
this.name = name;
final Properties props = new Properties();
- props.put("port", p+"");
+ props.put("port", p + "");
props.put("initialServers", Join.join(",", uris));
props.put("max_missed_heartbeats", "1");
Modified: tomee/tomee/trunk/server/openejb-rest/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-rest/pom.xml?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-rest/pom.xml (original)
+++ tomee/tomee/trunk/server/openejb-rest/pom.xml Mon Jul 14 16:11:36 2014
@@ -16,7 +16,8 @@
limitations under the License.
-->
-<project xmlns="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/xsd/maven-4.0.0.xsd">
+<project xmlns="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/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
Modified: tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/OpenEJBRestServlet.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/OpenEJBRestServlet.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/OpenEJBRestServlet.java (original)
+++ tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/OpenEJBRestServlet.java Mon Jul 14 16:11:36 2014
@@ -20,7 +20,6 @@ import javax.servlet.http.HttpServlet;
/**
* Nothing to do, cf AnnotationDeployer.deploy().
- *
*/
public class OpenEJBRestServlet extends HttpServlet {
}
Modified: tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java (original)
+++ tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java Mon Jul 14 16:11:36 2014
@@ -374,7 +374,7 @@ public abstract class RESTService implem
} else {
pojoConfigurations = PojoUtil.findPojoConfig(pojoConfigurations, appInfo, webApp);
deploySingleton(webApp.contextRoot, appPrefix, o, appInstance, classLoader, additionalProviders,
- new ServiceConfiguration(PojoUtil.findConfiguration(pojoConfigurations, o.getClass().getName()), appInfo.services));
+ new ServiceConfiguration(PojoUtil.findConfiguration(pojoConfigurations, o.getClass().getName()), appInfo.services));
}
}
@@ -388,7 +388,7 @@ public abstract class RESTService implem
} else {
pojoConfigurations = PojoUtil.findPojoConfig(pojoConfigurations, appInfo, webApp);
deployPojo(webApp.contextRoot, appPrefix, clazz, appInstance, classLoader, injections, context, owbCtx, additionalProviders,
- new ServiceConfiguration(PojoUtil.findConfiguration(pojoConfigurations, clazz.getName()), appInfo.services));
+ new ServiceConfiguration(PojoUtil.findConfiguration(pojoConfigurations, clazz.getName()), appInfo.services));
}
}
@@ -411,15 +411,15 @@ public abstract class RESTService implem
deployEJB(webApp.contextRoot, appPrefix, restEjbs.get(clazz).context, additionalProviders, appInfo.services);
} else {
deployPojo(webApp.contextRoot, appPrefix, ctx.getBeanClass(), null, ctx.getClassLoader(), ctx.getInjections(), context,
- owbCtx, additionalProviders, new ServiceConfiguration(ctx.getProperties(), appInfo.services));
+ owbCtx, additionalProviders, new ServiceConfiguration(ctx.getProperties(), appInfo.services));
}
} else {
try {
final Class<?> loadedClazz = classLoader.loadClass(clazz);
pojoConfigurations = PojoUtil.findPojoConfig(pojoConfigurations, appInfo, webApp);
deployPojo(webApp.contextRoot, appPrefix, loadedClazz, null, classLoader, injections, context, owbCtx,
- additionalProviders,
- new ServiceConfiguration(PojoUtil.findConfiguration(pojoConfigurations, loadedClazz.getName()), appInfo.services));
+ additionalProviders,
+ new ServiceConfiguration(PojoUtil.findConfiguration(pojoConfigurations, loadedClazz.getName()), appInfo.services));
} catch (final ClassNotFoundException e) {
throw new OpenEJBRestRuntimeException("can't find class " + clazz, e);
}
@@ -462,8 +462,8 @@ public abstract class RESTService implem
services.add(new DeployedService(address.complete, contextRoot, application.getClass().getName()));
listener.deployApplication(application, address.complete.substring(0, address.complete.length() - wildcard.length()), nopath.substring(NOPATH_PREFIX.length(), nopath.length() - wildcard.length()), additionalProviders, restEjbs, // app config
- classLoader, injections, context, owbCtx, // injection/webapp context
- new ServiceConfiguration(configuration, appInfo.services)); // deployment config
+ classLoader, injections, context, owbCtx, // injection/webapp context
+ new ServiceConfiguration(configuration, appInfo.services)); // deployment config
}
private static String appPrefix(final WebAppInfo info, final Class<?> appClazz) {
@@ -620,16 +620,16 @@ public abstract class RESTService implem
}
deployApplication(appInfo, next.getValue().path, restEjbs, comp.getClassLoader(), comp.getInjections(),
- containerSystem.getAppContext(appInfo.appId).getWebBeansContext(), comp.getJndiContext(),
- providers, pojoConfigurations, application, wildcard);
+ containerSystem.getAppContext(appInfo.appId).getWebBeansContext(), comp.getJndiContext(),
+ providers, pojoConfigurations, application, wildcard);
} else {
for (final Map.Entry<String, EJBRestServiceInfo> ejb : restEjbs.entrySet()) {
final BeanContext ctx = ejb.getValue().context;
if (BeanType.MANAGED.equals(ctx.getComponentType())) {
deployPojo("", ejb.getValue().path, ctx.getBeanClass(), null, ctx.getClassLoader(), ctx.getInjections(),
- ctx.getJndiContext(),
- containerSystem.getAppContext(appInfo.appId).getWebBeansContext(),
- providers, new ServiceConfiguration(ctx.getProperties(), appInfo.services));
+ ctx.getJndiContext(),
+ containerSystem.getAppContext(appInfo.appId).getWebBeansContext(),
+ providers, new ServiceConfiguration(ctx.getProperties(), appInfo.services));
} else {
deployEJB("", ejb.getValue().path, ctx, providers, appInfo.services);
}
@@ -743,7 +743,7 @@ public abstract class RESTService implem
services.add(new DeployedService(address.complete, contextRoot, loadedClazz.getName()));
listener.deployPojo(classLoader, contextRoot, getFullContext(address.base, contextRoot), loadedClazz, app, injections, context, owbCtx,
- additionalProviders, config);
+ additionalProviders, config);
LOGGER.info("REST Service: " + address.complete + " -> Pojo " + loadedClazz.getName());
}
@@ -755,7 +755,7 @@ public abstract class RESTService implem
services.add(new DeployedService(address.complete, context, beanContext.getBeanClass().getName()));
listener.deployEJB(context, getFullContext(address.base, context), beanContext,
- additionalProviders, new ServiceConfiguration(beanContext.getProperties(), serviceInfos));
+ additionalProviders, new ServiceConfiguration(beanContext.getProperties(), serviceInfos));
LOGGER.info("REST Service: " + address.complete + " -> EJB " + beanContext.getEjbName());
}
Modified: tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsRegistry.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsRegistry.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsRegistry.java (original)
+++ tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsRegistry.java Mon Jul 14 16:11:36 2014
@@ -23,6 +23,7 @@ import java.util.List;
public interface RsRegistry {
AddressInfo createRsHttpListener(String webContext, HttpListener listener, ClassLoader classLoader, String path, String virtualHost, String auth, String realm);
+
HttpListener removeListener(String context);
public static class AddressInfo {
Modified: tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryAgent.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryAgent.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryAgent.java (original)
+++ tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryAgent.java Mon Jul 14 16:11:36 2014
@@ -25,12 +25,14 @@ import java.io.IOException;
public interface DiscoveryAgent {
/**
* Sets the discovery listener
+ *
* @param listener
*/
void setDiscoveryListener(DiscoveryListener listener);
/**
* register a service
+ *
* @param serviceUri
* @param details
*/
@@ -38,6 +40,7 @@ public interface DiscoveryAgent {
/**
* register a service
+ *
* @param serviceUri
* @param details
*/
Modified: tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryListener.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryListener.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryListener.java (original)
+++ tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryListener.java Mon Jul 14 16:11:36 2014
@@ -23,8 +23,9 @@ import java.io.IOException;
/**
* @version $Rev$ $Date$
*/
-public interface DiscoveryListener {
+public interface DiscoveryListener {
public void serviceAdded(URI service);
+
public void serviceRemoved(URI service);
}
Modified: tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java (original)
+++ tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java Mon Jul 14 16:11:36 2014
@@ -39,7 +39,7 @@ import org.apache.xbean.finder.ResourceF
/**
* Assemble OpenEJB instance and boot it up
- *
+ *
* @version $Rev$ $Date$
*/
public class Main {
Modified: tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/SelfManaging.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/SelfManaging.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/SelfManaging.java (original)
+++ tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/SelfManaging.java Mon Jul 14 16:11:36 2014
@@ -20,9 +20,9 @@ package org.apache.openejb.server;
* Marker interface to announce that a service class (i.e. instance of
* {@see ServerService}) should not be wrapped by other services (that
* eventually create a chain of services around the main service to be wrapped)
- *
- * @see ServiceManager#init()
- *
+ *
* @version $Rev$ $Date$
+ * @see ServiceManager#init()
*/
-public interface SelfManaging {}
+public interface SelfManaging {
+}
Modified: tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServerServiceFilter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServerServiceFilter.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServerServiceFilter.java (original)
+++ tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServerServiceFilter.java Mon Jul 14 16:11:36 2014
@@ -28,6 +28,7 @@ import java.util.Properties;
/**
* TODO: Make this the superclass of the appropriate ServerService implementations
+ *
* @version $Rev$ $Date$
*/
public class ServerServiceFilter implements ServerService {
Modified: tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceAccessController.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceAccessController.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceAccessController.java (original)
+++ tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceAccessController.java Mon Jul 14 16:11:36 2014
@@ -106,8 +106,8 @@ public class ServiceAccessController ext
}
private void addIPAddressPermissions(
- final LinkedList<IPAddressPermission> permissions, final String hostname)
- throws ServiceException {
+ final LinkedList<IPAddressPermission> permissions, final String hostname)
+ throws ServiceException {
try {
final InetAddress[] localIps = InetAddress.getAllByName(hostname);
for (final InetAddress localIp : localIps) {
Modified: tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceLogger.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceLogger.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceLogger.java (original)
+++ tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceLogger.java Mon Jul 14 16:11:36 2014
@@ -64,7 +64,7 @@ public class ServiceLogger extends Serve
MDBput = MDC.getMethod("put", String.class, String.class);
} catch (Exception e) { // no need to log it with a higher level
Logger.getInstance(LogCategory.OPENEJB, ServiceLogger.class.getName())
- .debug("can't find log4j MDC class");
+ .debug("can't find log4j MDC class");
}
}
Modified: tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java (original)
+++ tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java Mon Jul 14 16:11:36 2014
@@ -226,9 +226,9 @@ public abstract class ServiceManager {
public boolean accept(final File dir, String name) {
name = name.toLowerCase();
return name.equals("ejbd.properties")
- || name.equals("ejbds.properties")
- || name.equals("admin.properties")
- || name.equals("httpejbd.properties");
+ || name.equals("ejbds.properties")
+ || name.equals("admin.properties")
+ || name.equals("httpejbd.properties");
}
});
Modified: tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServicePool.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServicePool.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServicePool.java (original)
+++ tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/ServicePool.java Mon Jul 14 16:11:36 2014
@@ -97,64 +97,64 @@ public class ServicePool extends ServerS
final int q = queue;
threadPool = new ThreadPoolExecutor(threadCore, threads, keepAliveTime, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(queue),
- new ThreadFactory() {
- private final AtomicInteger i = new AtomicInteger(0);
+ new ThreadFactory() {
+ private final AtomicInteger i = new AtomicInteger(0);
- @Override
- public Thread newThread(final Runnable r) {
- final Thread t = new Thread(r, "OpenEJB." + ServicePool.this.getName() + "." + i.incrementAndGet());
- t.setDaemon(true);
- t.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
- @Override
- public void uncaughtException(final Thread t, final Throwable e) {
- log.error("ServicePool '" + ServicePool.this.getName() + "': Uncaught error in: " + t.getName(), e);
- }
- });
+ @Override
+ public Thread newThread(final Runnable r) {
+ final Thread t = new Thread(r, "OpenEJB." + ServicePool.this.getName() + "." + i.incrementAndGet());
+ t.setDaemon(true);
+ t.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
+ @Override
+ public void uncaughtException(final Thread t, final Throwable e) {
+ log.error("ServicePool '" + ServicePool.this.getName() + "': Uncaught error in: " + t.getName(), e);
+ }
+ });
+
+ return t;
+ }
- return t;
+ },
+ new RejectedExecutionHandler() {
+ @Override
+ public void rejectedExecution(final Runnable r, final ThreadPoolExecutor tpe) {
+
+ if (null == r || null == tpe || tpe.isShutdown() || tpe.isTerminated() || tpe.isTerminating()) {
+ return;
}
- },
- new RejectedExecutionHandler() {
- @Override
- public void rejectedExecution(final Runnable r, final ThreadPoolExecutor tpe) {
+ if (log.isWarningEnabled()) {
+ log.warning(String.format("ServicePool '" + ServicePool.this.getName() + "' with (%1$s) threads is at capicity (%2$s) for queue (%3$s) on process: %4$s"
+ + "\nConsider increasing the 'threadCore','threads' and 'queue' size properties.", c, t, q, r));
+ }
- if (null == r || null == tpe || tpe.isShutdown() || tpe.isTerminated() || tpe.isTerminating()) {
- return;
- }
+ boolean offer = false;
+ try {
+ offer = tpe.getQueue().offer(r, 10, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ //Ignore
+ }
- if (log.isWarningEnabled()) {
- log.warning(String.format("ServicePool '" + ServicePool.this.getName() + "' with (%1$s) threads is at capicity (%2$s) for queue (%3$s) on process: %4$s"
- + "\nConsider increasing the 'threadCore','threads' and 'queue' size properties.", c, t, q, r));
- }
+ if (!offer) {
- boolean offer = false;
- try {
- offer = tpe.getQueue().offer(r, 10, TimeUnit.SECONDS);
- } catch (InterruptedException e) {
- //Ignore
- }
+ if (block) {
+ try {
+ //Last ditch effort to run the process in the current thread
+ r.run();
- if (!offer) {
+ log.warning("ServicePool '" + ServicePool.this.getName() + "' forced execution on the current server thread: " + r
+ + "\nIt is highly recommended that the service 'threadCore','threads' and 'queue' size properties are increased!");
- if (block) {
- try {
- //Last ditch effort to run the process in the current thread
- r.run();
-
- log.warning("ServicePool '" + ServicePool.this.getName() + "' forced execution on the current server thread: " + r
- + "\nIt is highly recommended that the service 'threadCore','threads' and 'queue' size properties are increased!");
-
- } catch (Throwable e) {
- log.error("ServicePool '" + ServicePool.this.getName() + "' failed to run a process in the current server thread: " + r);
- }
- } else {
- log.error("ServicePool '" + ServicePool.this.getName() + "' rejected asynchronous process: " + r
- + "\nIt is strongly advised that the 'threadCore', 'threads', 'queue' size and 'block' properties are modified to prevent data loss!");
+ } catch (Throwable e) {
+ log.error("ServicePool '" + ServicePool.this.getName() + "' failed to run a process in the current server thread: " + r);
}
+ } else {
+ log.error("ServicePool '" + ServicePool.this.getName() + "' rejected asynchronous process: " + r
+ + "\nIt is strongly advised that the 'threadCore', 'threads', 'queue' size and 'block' properties are modified to prevent data loss!");
}
}
- });
+ }
+ });
SystemInstance.get().setComponent(ServicePool.class, this);
Modified: tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/context/RequestInfos.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/context/RequestInfos.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/context/RequestInfos.java (original)
+++ tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/context/RequestInfos.java Mon Jul 14 16:11:36 2014
@@ -105,10 +105,10 @@ public final class RequestInfos {
@Override
public String toString() {
return "RequestInfo{"
- + "ip='" + ip + '\''
- + ", request-size=" + (inputStream != null ? inputStream.getCount() : "unknown")
- + ", response-size=" + (outputStream != null ? outputStream.getCount() : "unknown")
- + '}';
+ + "ip='" + ip + '\''
+ + ", request-size=" + (inputStream != null ? inputStream.getCount() : "unknown")
+ + ", response-size=" + (outputStream != null ? outputStream.getCount() : "unknown")
+ + '}';
}
}
}
Modified: tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java (original)
+++ tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java Mon Jul 14 16:11:36 2014
@@ -28,7 +28,7 @@ public class Activator implements Bundle
private ServiceManagerExtender manager;
private ServiceRegistration registration;
-
+
public void start(BundleContext bundleContext) throws Exception {
manager = new ServiceManagerExtender(bundleContext);
registration = bundleContext.registerService(ServiceManager.class.getName(), manager, null);
@@ -42,5 +42,5 @@ public class Activator implements Bundle
registration.unregister();
}
}
-
+
}