Skip to content

Commit d608999

Browse files
merge from ropalka branch
1 parent f2c71f8 commit d608999

11 files changed

+629
-237
lines changed

eclipse/JBossWSCodeStyle.xml eclipse/jboss-format.xml

+30-94
Large diffs are not rendered by default.

eclipse/JBossWSCheckStyle.xml eclipse/jboss-style.xml

+14-20
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
This configuration file was written by the eclipse-cs plugin configuration editor
44
-->
55
<!--
6-
Checkstyle-Configuration: JBossWS Checks
7-
Description: JBossWS Java Coding Convention Checks
6+
Checkstyle-Configuration: jboss-checkstyle
7+
Description: none
88
-->
99
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
1010
<module name="Checker">
@@ -17,12 +17,9 @@
1717
<property name="max" value="60"/>
1818
<property name="tokens" value="INSTANCE_INIT,STATIC_INIT,METHOD_DEF,CTOR_DEF"/>
1919
</module>
20-
<module name="FileLength">
21-
<property name="max" value="1000"/>
22-
</module>
2320
<module name="LineLength">
24-
<property name="max" value="120"/>
25-
<property name="tabWidth" value="4"/>
21+
<property name="max" value="168"/>
22+
<property name="tabWidth" value="3"/>
2623
</module>
2724
<module name="MethodLength"/>
2825
<module name="ParameterNumber"/>
@@ -49,14 +46,11 @@
4946
<module name="ExplicitInitialization"/>
5047
<module name="FallThrough"/>
5148
<module name="FinalLocalVariable"/>
52-
<module name="HiddenField"/>
5349
<module name="IllegalInstantiation"/>
54-
<module name="IllegalThrows"/>
5550
<module name="IllegalType">
5651
<property name="tokens" value="METHOD_DEF,PARAMETER_DEF"/>
5752
</module>
5853
<module name="InnerAssignment"/>
59-
<module name="JUnitTestCase"/>
6054
<module name="MagicNumber">
6155
<property name="ignoreNumbers" value="-1, 0, 1"/>
6256
</module>
@@ -84,7 +78,6 @@
8478
<module name="SuperFinalize"/>
8579
<module name="ArrayTrailingComma"/>
8680
<module name="UnnecessaryParentheses"/>
87-
<module name="JUnitTestCase"/>
8881
<module name="DesignForExtension"/>
8982
<module name="FinalClass"/>
9083
<module name="HideUtilityClassConstructor"/>
@@ -110,24 +103,22 @@
110103
<module name="NoWhitespaceBefore"/>
111104
<module name="OperatorWrap">
112105
<property name="option" value="eol"/>
113-
<property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_INSTANCEOF,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN"/>
106+
<property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_INSTANCEOF,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,SL,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN"/>
114107
</module>
115108
<module name="MethodParamPad">
116109
<property name="allowLineBreaks" value="true"/>
117110
</module>
118-
<module name="ParenPad">
119-
<property name="option" value="space"/>
120-
</module>
121111
<module name="TabCharacter"/>
122112
<module name="TypecastParenPad">
123-
<property name="option" value="space"/>
124113
<property name="tokens" value="RPAREN,TYPECAST"/>
125114
</module>
126115
<module name="WhitespaceAround">
127-
<property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,GENERIC_START,GENERIC_END,TYPE_EXTENSION_AND,WILDCARD_TYPE"/>
116+
<property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND"/>
128117
</module>
129118
<module name="NeedBraces"/>
130-
<module name="WhitespaceAfter"/>
119+
<module name="WhitespaceAfter">
120+
<property name="tokens" value="COMMA,SEMI"/>
121+
</module>
131122
<module name="BooleanExpressionComplexity"/>
132123
<module name="ClassDataAbstractionCoupling"/>
133124
<module name="ClassFanOutComplexity"/>
@@ -137,7 +128,10 @@
137128
<module name="UncommentedMain"/>
138129
<module name="TodoComment"/>
139130
<module name="TrailingComment"/>
140-
<module name="Indentation"/>
131+
<module name="Indentation">
132+
<property name="basicOffset" value="3"/>
133+
<property name="caseIndent" value="3"/>
134+
</module>
141135
<module name="FinalParameters"/>
142136
<module name="ArrayTypeStyle"/>
143137
<module name="JavadocMethod">
@@ -148,7 +142,7 @@
148142
<module name="JavadocType"/>
149143
<module name="JavadocVariable"/>
150144
<module name="WriteTag"/>
145+
<module name="SuperFinalize"/>
151146
</module>
152147
<module name="NewlineAtEndOfFile"/>
153-
<module name="PackageHtml"/>
154148
</module>

src/main/java/org/jboss/ws/Constants.java

+3
Original file line numberDiff line numberDiff line change
@@ -322,4 +322,7 @@ public interface Constants
322322
static final String HTTP_KEEP_ALIVE = "org.jboss.ws.http.keepAlive";
323323

324324
static final String HTTP_MAX_CONNECTIONS = "org.jboss.ws.http.maxConnections";
325+
326+
static final String NETTY_MESSAGE = "org.jboss.ws.http.netty.Message";
327+
325328
}

src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java

-42
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
/*
2+
* JBoss, Home of Professional Open Source.
3+
* Copyright 2009, Red Hat Middleware LLC, and individual contributors
4+
* as indicated by the @author tags. See the copyright.txt file in the
5+
* distribution for a full listing of individual contributors.
6+
*
7+
* This is free software; you can redistribute it and/or modify it
8+
* under the terms of the GNU Lesser General Public License as
9+
* published by the Free Software Foundation; either version 2.1 of
10+
* the License, or (at your option) any later version.
11+
*
12+
* This software is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
* Lesser General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU Lesser General Public
18+
* License along with this software; if not, write to the Free
19+
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
20+
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
21+
*/
22+
package org.jboss.wsf.common.invocation;
23+
24+
import java.lang.reflect.Method;
25+
26+
import org.jboss.logging.Logger;
27+
import org.jboss.wsf.spi.deployment.Endpoint;
28+
import org.jboss.wsf.spi.invocation.Invocation;
29+
import org.jboss.wsf.spi.invocation.InvocationHandler;
30+
31+
/**
32+
* Base class for all Web Service invocation handlers inside AS.
33+
*
34+
* @author <a href="mailto:[email protected]">Richard Opalka</a>
35+
* @author <a href="mailto:[email protected]">Thomas Diesler</a>
36+
*/
37+
public abstract class AbstractInvocationHandler extends InvocationHandler
38+
{
39+
40+
/** Logger. */
41+
protected final Logger log = Logger.getLogger(this.getClass());
42+
43+
/**
44+
* Constructor.
45+
*/
46+
protected AbstractInvocationHandler()
47+
{
48+
super();
49+
}
50+
51+
/**
52+
* Creates invocation.
53+
*
54+
* @return invocation instance
55+
*/
56+
public final Invocation createInvocation()
57+
{
58+
return new Invocation();
59+
}
60+
61+
/**
62+
* Initialization method.
63+
*
64+
* @param endpoint endpoint
65+
*/
66+
public void init(final Endpoint endpoint)
67+
{
68+
// does nothing
69+
}
70+
71+
/**
72+
* Returns implementation method that will be used for invocation.
73+
*
74+
* @param implClass implementation endpoint class
75+
* @param seiMethod SEI interface method used for method finding algorithm
76+
* @return implementation method
77+
* @throws NoSuchMethodException if implementation method wasn't found
78+
*/
79+
protected final Method getImplMethod(final Class<?> implClass, final Method seiMethod) throws NoSuchMethodException
80+
{
81+
final String methodName = seiMethod.getName();
82+
final Class<?>[] paramTypes = seiMethod.getParameterTypes();
83+
84+
return implClass.getMethod(methodName, paramTypes);
85+
}
86+
87+
}

0 commit comments

Comments
 (0)