[jbossws-commits] JBossWS SVN: r8216 - in stack/native/trunk: eclipse and 1 other directories.

Author: richard.opalka(a)jboss.com Date: 2008-09-24 13:06:26 -0400 (Wed, 24 Sep 2008) New Revision: 8216 Added: stack/native/trunk/README-COMMITTERS stack/native/trunk/eclipse/JBossWSCheckStyle.xml Removed: stack/native/trunk/eclipse/readme-commiters.txt Modified: stack/native/trunk/build.xml stack/native/trunk/src/main/scripts/assembly-src-dist.xml Log: [JBWS-2320] adding windows support Added: stack/native/trunk/README-COMMITTERS =================================================================== --- stack/native/trunk/README-COMMITTERS (rev 0) +++ stack/native/trunk/README-COMMITTERS 2008-09-24 17:06:26 UTC (rev 8216) @@ -0,0 +1,26 @@ + * If you are using Eclipse then set your code style to JBossWSCodeStyle.xml. + * If you are using Eclipse then set your check style to JBossWSCheckStyle.xml. + * Insert the following header to every java source file (i.e. update your IDE templates) : + +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-09-23 19:00:14 UTC (rev 8215) +++ stack/native/trunk/build.xml 2008-09-24 17:06:26 UTC (rev 8216) @@ -32,10 +32,20 @@ <!-- Initialization --> <!-- ================================================================== --> - <target name="mvn-settings"> + <target name="os-init"> + <condition property="ext" value=".bat"> + <not> + <os family="unix"/> + </not> + </condition> + <property name="ext" value=""/> + <property name="mvn" value="mvn${ext}"/> + </target> + + <target name="mvn-settings" depends="os-init"> <!-- Loads the properties from the effective maven settings --> <mkdir dir="${stack.output.dir}"/> - <exec dir="${basedir}" executable="mvn" failonerror="true"> + <exec dir="${basedir}" executable="${mvn}" failonerror="true"> <arg value="-Doutput=${stack.output.dir}/effective-settings.xml"/> <arg value="help:effective-settings"/> </exec> @@ -72,7 +82,7 @@ <echo message="jboss501.home=${jboss501.home}"/> </target> - <target name="init" depends="mvn-settings,prepare"> + <target name="init" depends="mvn-settings,prepare,os-init"> <xmlproperty file="${stack.dir}/pom.xml"/> <property name="version.id" value="${project.version}"/> @@ -89,28 +99,28 @@ <!-- Distribution --> <!-- ================================================================== --> - <target name="prepare-deploy" depends="prepare"> + <target name="prepare-deploy" depends="prepare,os-init"> <!-- Use a system property to overwrite the empty default value --> <property name="maven.opts" value=""/> <echo/> - <echo message="mvn ${maven.opts} package assembly:directory"/> + <echo message="${mvn} ${maven.opts} package assembly:directory"/> <echo/> <delete dir="${deploy.artifacts.dir}"/> - <exec dir="${basedir}" executable="mvn" failonerror="true"> + <exec dir="${basedir}" executable="${mvn}" failonerror="true"> <arg line="${maven.opts} package assembly:directory"/> </exec> </target> - <target name="build-bin-dist" depends="prepare-deploy" description="Build the binary distribution"> + <target name="build-bin-dist" depends="prepare-deploy,os-init" description="Build the binary distribution"> <echo/> - <echo message="mvn ${maven.opts} -Pbindist package assembly:directory"/> + <echo message="${mvn} ${maven.opts} -Pbindist package assembly:directory"/> <echo/> <delete dir="${stack.output.dir}/jbossws-native-bin-dist"/> - <exec dir="${basedir}" executable="mvn" failonerror="true"> + <exec dir="${basedir}" executable="${mvn}" failonerror="true"> <arg line="${maven.opts} -Pbindist package assembly:directory"/> </exec> @@ -122,22 +132,22 @@ </zip> </target> - <target name="build-src-dist" depends="prepare-deploy" description="Build the source distribution"> + <target name="build-src-dist" depends="prepare-deploy,os-init" description="Build the source distribution"> <echo/> - <echo message="mvn ${maven.opts} -Psrcdist package assembly:directory"/> + <echo message="${mvn} ${maven.opts} -Psrcdist package assembly:directory"/> <echo/> <delete dir="${stack.output.dir}/jbossws-native-src-dist"/> - <exec dir="${basedir}" executable="mvn" failonerror="true"> + <exec dir="${basedir}" executable="${mvn}" failonerror="true"> <arg line="${maven.opts} -Psrcdist package assembly:directory"/> </exec> <zip destfile="${stack.output.dir}/jbossws-native-src-dist.zip"> <zipfileset dir="${stack.output.dir}/jbossws-native-src-dist" - includes="modules/ src/ build.xml pom.xml profiles.xml.example" + includes="modules/ src/ eclipse/ build.xml pom.xml profiles.xml.example .classpath .project " prefix="jbossws-native-src-dist"/> </zip> </target> -</project> +</project> \ No newline at end of file Added: stack/native/trunk/eclipse/JBossWSCheckStyle.xml =================================================================== --- stack/native/trunk/eclipse/JBossWSCheckStyle.xml (rev 0) +++ stack/native/trunk/eclipse/JBossWSCheckStyle.xml 2008-09-24 17:06:26 UTC (rev 8216) @@ -0,0 +1,154 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + This configuration file was written by the eclipse-cs plugin configuration editor +--> +<!-- + Checkstyle-Configuration: JBossWS Checks + Description: JBossWS Java Coding Convention Checks +--> +<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"> +<module name="Checker"> + <property name="severity" value="warning"/> + <module name="TreeWalker"> + <module name="ModifierOrder"/> + <module name="RedundantModifier"/> + <module name="AnonInnerLength"/> + <module name="ExecutableStatementCount"> + <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="tabWidth" value="4"/> + </module> + <module name="MethodLength"/> + <module name="ParameterNumber"/> + <module name="AvoidStarImport"/> + <module name="IllegalImport"/> + <module name="ImportOrder"/> + <module name="RedundantImport"/> + <module name="UnusedImports"/> + <module name="AbstractClassName"/> + <module name="ConstantName"/> + <module name="LocalFinalVariableName"/> + <module name="LocalVariableName"/> + <module name="MemberName"/> + <module name="MethodName"/> + <module name="PackageName"/> + <module name="ParameterName"/> + <module name="StaticVariableName"/> + <module name="TypeName"/> + <module name="CovariantEquals"/> + <module name="DefaultComesLast"/> + <module name="DeclarationOrder"/> + <module name="DoubleCheckedLocking"/> + <module name="EqualsHashCode"/> + <module name="ExplicitInitialization"/> + <module name="FallThrough"/> + <module name="FinalLocalVariable"/> + <module name="HiddenField"/> + <module name="IllegalInstantiation"/> + <module name="IllegalThrows"/> + <module name="IllegalType"> + <property name="tokens" value="METHOD_DEF,PARAMETER_DEF"/> + </module> + <module name="InnerAssignment"/> + <module name="JUnitTestCase"/> + <module name="MagicNumber"> + <property name="ignoreNumbers" value="-1, 0, 1"/> + </module> + <module name="MissingCtor"/> + <module name="MissingSwitchDefault"/> + <module name="ModifiedControlVariable"/> + <module name="MultipleStringLiterals"/> + <module name="MultipleVariableDeclarations"/> + <module name="NestedIfDepth"/> + <module name="NestedTryDepth"/> + <module name="PackageDeclaration"/> + <module name="ParameterAssignment"/> + <module name="RedundantThrows"> + <property name="logLoadErrors" value="true"/> + <property name="suppressLoadErrors" value="true"/> + </module> + <module name="RequireThis"/> + <module name="ReturnCount"> + <property name="max" value="5"/> + </module> + <module name="SimplifyBooleanExpression"/> + <module name="SimplifyBooleanReturn"/> + <module name="StringLiteralEquality"/> + <module name="SuperClone"/> + <module name="SuperFinalize"/> + <module name="ArrayTrailingComma"/> + <module name="UnnecessaryParentheses"/> + <module name="JUnitTestCase"/> + <module name="DesignForExtension"/> + <module name="FinalClass"/> + <module name="HideUtilityClassConstructor"/> + <module name="InterfaceIsType"/> + <module name="ThrowsCount"/> + <module name="VisibilityModifier"/> + <module name="MutableException"/> + <module name="EmptyBlock"/> + <module name="LeftCurly"> + <property name="option" value="nl"/> + <property name="maxLineLength" value="120"/> + </module> + <module name="RightCurly"> + <property name="option" value="alone"/> + </module> + <module name="EmptyForInitializerPad"> + <property name="option" value="space"/> + </module> + <module name="EmptyForIteratorPad"> + <property name="option" value="space"/> + </module> + <module name="NoWhitespaceAfter"/> + <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"/> + </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,GENERIC_START,GENERIC_END,TYPE_EXTENSION_AND,WILDCARD_TYPE"/> + </module> + <module name="NeedBraces"/> + <module name="WhitespaceAfter"/> + <module name="BooleanExpressionComplexity"/> + <module name="ClassDataAbstractionCoupling"/> + <module name="ClassFanOutComplexity"/> + <module name="CyclomaticComplexity"/> + <module name="JavaNCSS"/> + <module name="NPathComplexity"/> + <module name="UncommentedMain"/> + <module name="TodoComment"/> + <module name="TrailingComment"/> + <module name="Indentation"/> + <module name="FinalParameters"/> + <module name="ArrayTypeStyle"/> + <module name="JavadocMethod"> + <property name="allowUndeclaredRTE" value="true"/> + <property name="logLoadErrors" value="true"/> + </module> + <module name="JavadocStyle"/> + <module name="JavadocType"/> + <module name="JavadocVariable"/> + <module name="WriteTag"/> + </module> + <module name="NewlineAtEndOfFile"/> + <module name="PackageHtml"/> +</module> Deleted: stack/native/trunk/eclipse/readme-commiters.txt =================================================================== --- stack/native/trunk/eclipse/readme-commiters.txt 2008-09-23 19:00:14 UTC (rev 8215) +++ stack/native/trunk/eclipse/readme-commiters.txt 2008-09-24 17:06:26 UTC (rev 8216) @@ -1,21 +0,0 @@ -1. Edit your subversion config ~/.subversion/config and set the following in each section: - -[miscellany] -enable-auto-props = yes - -[auto-props] -*.bat = svn:keywords=Id Revision;svn:eol-style=LF -*.java = svn:keywords=Id Revision;svn:eol-style=LF -*.sh = svn:keywords=Id Revision;svn:eol-style=LF -*.txt = svn:keywords=Id Revision;svn:eol-style=LF -*.wsdl = svn:keywords=Id Revision;svn:eol-style=LF -*.xml = svn:keywords=Id Revision;svn:eol-style=LF -*.xsd = svn:keywords=Id Revision;svn:eol-style=LF - -2. If you are using an IDE, make sure that it refers to the same config. So, -for example, if you are using Eclipse with Subclipse on windows, you need to -set Team->SVN->Configuration Location to: - -/home/<your user name>/.subversion - -3. If you are using Eclipse, set your code style to jBPMCodeStyle.xml Modified: stack/native/trunk/src/main/scripts/assembly-src-dist.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-src-dist.xml 2008-09-23 19:00:14 UTC (rev 8215) +++ stack/native/trunk/src/main/scripts/assembly-src-dist.xml 2008-09-24 17:06:26 UTC (rev 8216) @@ -9,6 +9,10 @@ <fileSets> <fileSet> + <directory>eclipse/</directory> + <outputDirectory>eclipse/</outputDirectory> + </fileSet> + <fileSet> <directory>src/</directory> <outputDirectory>src/</outputDirectory> </fileSet> @@ -33,6 +37,8 @@ <directory></directory> <outputDirectory>/</outputDirectory> <includes> + <include>.classpath</include> + <include>.project</include> <include>build.xml</include> <include>pom.xml</include> <include>profiles.xml.example</include>