[jbossws-commits] JBossWS SVN: r10491 - in container/jboss50/branches/ropalka-jboss510: eclipse and 2 other directories.

Author: richard.opalka(a)jboss.com Date: 2009-08-05 07:05:50 -0400 (Wed, 05 Aug 2009) New Revision: 10491 Modified: container/jboss50/branches/ropalka-jboss510/.project container/jboss50/branches/ropalka-jboss510/eclipse/JBossWSCheckStyle.xml container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java Log: [JBWS-2332] fixing check style configuration Modified: container/jboss50/branches/ropalka-jboss510/.project =================================================================== --- container/jboss50/branches/ropalka-jboss510/.project 2009-08-05 10:10:36 UTC (rev 10490) +++ container/jboss50/branches/ropalka-jboss510/.project 2009-08-05 11:05:50 UTC (rev 10491) @@ -15,15 +15,9 @@ <arguments> </arguments> </buildCommand> - <buildCommand> - <name>net.sf.eclipsecs.core.CheckstyleBuilder</name> - <arguments> - </arguments> - </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.maven.ide.eclipse.maven2Nature</nature> - <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> </natures> </projectDescription> Modified: container/jboss50/branches/ropalka-jboss510/eclipse/JBossWSCheckStyle.xml =================================================================== --- container/jboss50/branches/ropalka-jboss510/eclipse/JBossWSCheckStyle.xml 2009-08-05 10:10:36 UTC (rev 10490) +++ container/jboss50/branches/ropalka-jboss510/eclipse/JBossWSCheckStyle.xml 2009-08-05 11:05:50 UTC (rev 10491) @@ -17,11 +17,8 @@ <property name="max" value="60"/> <property name="tokens" value="INSTANCE_INIT,STATIC_INIT,METHOD_DEF,CTOR_DEF"/> </module> - <module name="FileLength"> - <property name="max" value="1000"/> - </module> <module name="LineLength"> - <property name="max" value="120"/> + <property name="max" value="168"/> <property name="tabWidth" value="3"/> </module> <module name="MethodLength"/> @@ -106,24 +103,22 @@ <module name="NoWhitespaceBefore"/> <module name="OperatorWrap"> <property name="option" value="eol"/> - <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"/> + <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"/> </module> <module name="MethodParamPad"> <property name="allowLineBreaks" value="true"/> </module> - <module name="ParenPad"> - <property name="option" value="space"/> - </module> <module name="TabCharacter"/> <module name="TypecastParenPad"> - <property name="option" value="space"/> <property name="tokens" value="RPAREN,TYPECAST"/> </module> <module name="WhitespaceAround"> - <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,TYPE_EXTENSION_AND,WILDCARD_TYPE"/> + <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"/> </module> <module name="NeedBraces"/> - <module name="WhitespaceAfter"/> + <module name="WhitespaceAfter"> + <property name="tokens" value="COMMA,SEMI"/> + </module> <module name="BooleanExpressionComplexity"/> <module name="ClassDataAbstractionCoupling"/> <module name="ClassFanOutComplexity"/> @@ -148,21 +143,6 @@ <module name="JavadocVariable"/> <module name="WriteTag"/> <module name="SuperFinalize"/> - <module name="GenericIllegalRegexp"> - <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="System.out regexp"/> - <metadata name="com.atlassw.tools.eclipse.checkstyle.customMessage" value="Use logging instead"/> - <property name="format" value="System\.out"/> - </module> - <module name="GenericIllegalRegexp"> - <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="System.err regexp"/> - <metadata name="com.atlassw.tools.eclipse.checkstyle.customMessage" value="Use logging instead"/> - <property name="format" value="System\.err"/> - </module> - <module name="GenericIllegalRegexp"> - <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="printStackTrace regexp"/> - <metadata name="com.atlassw.tools.eclipse.checkstyle.customMessage" value="Use logging instead"/> - <property name="format" value="\.printStackTrace"/> - </module> </module> <module name="NewlineAtEndOfFile"/> </module> Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java =================================================================== --- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java 2009-08-05 10:10:36 UTC (rev 10490) +++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java 2009-08-05 11:05:50 UTC (rev 10491) @@ -226,7 +226,7 @@ */ private ArchiveDeployment newDeployment(final DeploymentUnit unit) { - final ArchiveDeployment dep = (ArchiveDeployment)this.deploymentModelFactory.newDeployment(unit.getSimpleName(), unit.getClassLoader()); + final ArchiveDeployment dep = this.newDeployment(unit.getSimpleName(), unit.getClassLoader()); if (unit instanceof VFSDeploymentUnit) { @@ -250,8 +250,10 @@ if (unit.getParent() != null) { - final DeploymentUnit parentUnit = unit.getParent(); - final ArchiveDeployment parentDep = (ArchiveDeployment)this.deploymentModelFactory.newDeployment(parentUnit.getSimpleName(), parentUnit.getClassLoader()); + final String parentDeploymentName = unit.getParent().getSimpleName(); + final ClassLoader parentClassLoader = unit.getParent().getClassLoader(); + + final ArchiveDeployment parentDep = this.newDeployment(parentDeploymentName, parentClassLoader); dep.setParent(parentDep); } @@ -262,6 +264,18 @@ return dep; } + + /** + * Creates new archive deployment. + * + * @param name deployment name + * @param loader deployment loader + * @return new archive deployment + */ + private ArchiveDeployment newDeployment(final String name, final ClassLoader loader) + { + return (ArchiveDeployment)this.deploymentModelFactory.newDeployment(name, loader); + } /** * Creates new Web Service endpoint. Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java =================================================================== --- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java 2009-08-05 10:10:36 UTC (rev 10490) +++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java 2009-08-05 11:05:50 UTC (rev 10491) @@ -85,6 +85,7 @@ { final WebServiceDeploymentAdapter wsDeploymentAdapter = new WebServiceDeploymentAdapter(); final Iterator<JBossEnterpriseBeanMetaData> ejbIterator = mergedMD.getEnterpriseBeans().iterator(); + final List<WebServiceDeclaration> endpoints = wsDeploymentAdapter.getServiceEndpoints(); while (ejbIterator.hasNext()) { @@ -93,7 +94,7 @@ if (ejbMD.getEjbClass() != null) { - wsDeploymentAdapter.getServiceEndpoints().add(new WebServiceDeclarationAdapter(ejbMD, ejbContainer, unit.getClassLoader())); + endpoints.add(new WebServiceDeclarationAdapter(ejbMD, ejbContainer, unit.getClassLoader())); } else { Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java =================================================================== --- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java 2009-08-05 10:10:36 UTC (rev 10490) +++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java 2009-08-05 11:05:50 UTC (rev 10491) @@ -144,8 +144,11 @@ if (domainsDiffer) { - throw new IllegalStateException("Multiple security domains not supported. " + "First domain: '" + oldSecurityDomain + "' " + "second domain: '" - + newSecurityDomain + "'"); + final String errorMessage = "Multiple security domains not supported. "; + final String firstDomain = "First domain: '" + oldSecurityDomain + "' "; + final String secondDomain = "second domain: '" + newSecurityDomain + "'"; + + throw new IllegalStateException(errorMessage + firstDomain + secondDomain); } }