incubator-yoko-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r413080 - in /incubator/yoko/trunk: maven-plugins/ maven-plugins/src/ maven-plugins/src/main/ maven-plugins/src/main/java/ maven-plugins/src/main/java/org/ maven-plugins/src/main/java/org/apache/ maven-plugins/src/main/java/org/apache/yoko/...
Date Fri, 09 Jun 2006 16:00:08 GMT
Author: bravi
Date: Fri Jun  9 09:00:07 2006
New Revision: 413080

URL: http://svn.apache.org/viewvc?rev=413080&view=rev
Log:
Adding the maven plugins for the wsdltoidl and idltowsdl tools. Jira: http://issues.apache.org/jira/browse/YOKO-56

Added:
    incubator/yoko/trunk/maven-plugins/
    incubator/yoko/trunk/maven-plugins/.checkstyle
    incubator/yoko/trunk/maven-plugins/.pmd
    incubator/yoko/trunk/maven-plugins/.ruleset
    incubator/yoko/trunk/maven-plugins/checkstyle.xml   (with props)
    incubator/yoko/trunk/maven-plugins/pom.xml   (with props)
    incubator/yoko/trunk/maven-plugins/src/
    incubator/yoko/trunk/maven-plugins/src/main/
    incubator/yoko/trunk/maven-plugins/src/main/java/
    incubator/yoko/trunk/maven-plugins/src/main/java/org/
    incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/
    incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/
    incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/
    incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/
    incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/IDLToWSDLOption.java
  (with props)
    incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/IDLToWSDLPlugin.java
  (with props)
    incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/WSDLToIDLOption.java
  (with props)
    incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/WSDLToIDLPlugin.java
  (with props)
Modified:
    incubator/yoko/trunk/tools/pom.xml
    incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java
    incubator/yoko/trunk/tools/src/test/resources/toolspecs/wsdl2idl.xml

Added: incubator/yoko/trunk/maven-plugins/.checkstyle
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/maven-plugins/.checkstyle?rev=413080&view=auto
==============================================================================
--- incubator/yoko/trunk/maven-plugins/.checkstyle (added)
+++ incubator/yoko/trunk/maven-plugins/.checkstyle Fri Jun  9 09:00:07 2006
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?><fileset-config file-format-version="1.1.0"
simple-config="false">
+<fileset name="all" enabled="true" check-config-name="Yoko Checks" type="external" description=""><file-match-pattern
match-pattern="^src[/\\]." include-pattern="true"/>
+</fileset>
+</fileset-config>

Added: incubator/yoko/trunk/maven-plugins/.pmd
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/maven-plugins/.pmd?rev=413080&view=auto
==============================================================================
--- incubator/yoko/trunk/maven-plugins/.pmd (added)
+++ incubator/yoko/trunk/maven-plugins/.pmd Fri Jun  9 09:00:07 2006
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pmd><useProjectRuleSet>true</useProjectRuleSet><rules/></pmd>
\ No newline at end of file

Added: incubator/yoko/trunk/maven-plugins/.ruleset
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/maven-plugins/.ruleset?rev=413080&view=auto
==============================================================================
--- incubator/yoko/trunk/maven-plugins/.ruleset (added)
+++ incubator/yoko/trunk/maven-plugins/.ruleset Fri Jun  9 09:00:07 2006
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="pmd-eclipse">
+  <description>PMD Plugin preferences rule set</description>
+  
+  
+  <rule ref="rulesets/basic.xml/BooleanInstantiation"/>
+  <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
+  <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>
+<!--<rule ref="rulesets/basic.xml/EmptyCatchBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyIfStmt"/>-->
+  <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
+<!--<rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptySwitchStatements"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyTryBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyWhileStmt"/>-->
+  <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/>
+  <rule ref="rulesets/basic.xml/JumbledIncrementer"/>
+<!--<rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>-->
+  <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/>
+  <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
+  <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>
+  <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>
+  <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>
+  <rule ref="rulesets/basic.xml/UselessOverridingMethod"/>
+  
+<!--<rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"/>-->
+
+<!--<rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/>-->
+<!--<rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/>-->
+<!--<rule ref="rulesets/clone.xml/ProperCloneImplementation"/>-->
+  
+<!--<rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>-->
+<!--<rule ref="rulesets/codesize.xml/TooManyFields"/>-->
+
+<rule ref="rulesets/controversial.xml/AssignmentInOperand"/>
+<!--<rule ref="rulesets/controversial.xml/AtLeastOneConstructor"/>-->
+<!--<rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>-->
+<!--<rule ref="rulesets/controversial.xml/DontImportSun"/>-->
+<!--<rule ref="rulesets/controversial.xml/NullAssignment"/>-->
+<!--<rule ref="rulesets/controversial.xml/OnlyOneReturn"/>-->
+<!--<rule ref="rulesets/controversial.xml/SingularField"/>-->
+<!--<rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>-->
+<!--<rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/>-->
+<rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>
+<!--<rule ref="rulesets/controversial.xml/UnusedModifier"/>-->
+
+<!--<rule ref="rulesets/coupling.xml/CouplingBetweenObjects"/>-->
+<!--<rule ref="rulesets/coupling.xml/ExcessiveImports"/>-->
+<!--<rule ref="rulesets/coupling.xml/LooseCoupling"/>-->
+
+<!--<rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/>-->
+<!--<rule ref="rulesets/design.xml/AccessorClassGeneration"/>-->
+<!--<rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"/>-->
+<rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/>
+<!--<rule ref="rulesets/design.xml/AvoidReassigningParameters"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/>-->
+<!--<rule ref="rulesets/design.xml/BadComparison"/>-->
+<!--<rule ref="rulesets/design.xml/CloseConnection"/>-->
+<!--<rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>-->
+<!--<rule ref="rulesets/design.xml/ConfusingTernary"/>-->
+<rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>
+<!--<rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>-->
+<!--<rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>-->
+<rule ref="rulesets/design.xml/IdempotentOperations"/>
+<!--<rule ref="rulesets/design.xml/ImmutableField"/>-->
+<!--<rule ref="rulesets/design.xml/InstantiationToGetClass"/>-->
+<!--<rule ref="rulesets/design.xml/MissingBreakInSwitch"/>-->
+<!--<rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>-->
+<!--<rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>-->
+<!--<rule ref="rulesets/design.xml/NonStaticInitializer"/>-->
+<rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
+<rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/>
+<rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
+<rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
+<rule ref="rulesets/design.xml/SimplifyConditional"/>
+<!--<rule ref="rulesets/design.xml/SwitchDensity"/>-->
+<!--<rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault"/>-->
+<rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>
+<!--<rule ref="rulesets/design.xml/UseLocaleWithCaseConversions"/>-->
+<!--<rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>-->
+<!--<rule ref="rulesets/design.xml/UseSingleton"/>-->
+
+<!--<rule ref="rulesets/finalizers.xml/EmptyFinalizer"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeOverloaded"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"/>-->
+<!--<rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"/>-->
+
+<!--<rule ref="rulesets/imports.xml/DuplicateImports"/>-->
+<!--<rule ref="rulesets/imports.xml/DontImportJavaLang"/>-->
+<!--<rule ref="rulesets/imports.xml/UnusedImports"/>-->
+<!--<rule ref="rulesets/imports.xml/ImportFromSamePackage"/>-->
+
+<!--<rule ref="rulesets/javabeans.xml/BeanMembersShouldSerialize"/>-->
+<!--<rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"/>-->
+
+<!--<rule ref="rulesets/junit.xml/JUnitStaticSuite"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitSpelling"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitAssertionsShouldIncludeMessage"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitTestsShouldIncludeAssert"/>-->
+<!--<rule ref="rulesets/junit.xml/TestClassWithoutTestCases"/>-->
+<!--<rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion"/>-->
+<!--<rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>-->
+<!--<rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>-->
+
+  <!--<rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>-->
+  <rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>
+  <!--<rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>-->
+  <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->
+  <!--<rule ref="rulesets/logging-java.xml/LogBlockWithoutIf"/>-->
+  <!--<rule ref="rulesets/logging-java.xml/SystemPrintln"/>-->
+  <!--<rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>-->
+  <!--<rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger"/>-->
+  
+  <!--<rule ref="rulesets/naming.xml/ShortVariable"/>-->
+  <!--<rule ref="rulesets/naming.xml/LongVariable"/>-->
+  <!--<rule ref="rulesets/naming.xml/ShortMethodName"/>-->
+  <!--<rule ref="rulesets/naming.xml/VariableNamingConventions"/>-->
+  <!--<rule ref="rulesets/naming.xml/MethodNamingConventions"/>-->
+  <!--<rule ref="rulesets/naming.xml/ClassNamingConventions"/>-->
+  <!--<rule ref="rulesets/naming.xml/AbstractNaming"/>-->
+  <!--<rule ref="rulesets/naming.xml/AvoidDollarSigns"/>-->
+  <!--<rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"/>-->
+  <!--<rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>-->
+  <!--<rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>-->
+  <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>-->
+  <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>-->
+  <!--<rule ref="rulesets/naming.xml/AvoidNonConstructorMethodsWithClassName"/>-->
+  <!--<rule ref="rulesets/naming.xml/NoPackage"/>-->
+  <!--<rule ref="rulesets/naming.xml/PackageCase"/>-->
+
+  <!--<rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>-->
+  <!--<rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>-->
+  <!--<rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"/>-->
+  <!--<rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>-->
+  <!--<rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>-->
+  <!--<rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"/>-->
+
+  <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"/>-->
+  <!--<rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"/>-->
+  <!--<rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"/>-->
+  <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"/>-->
+  <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"/>-->
+  <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"/>-->
+ 
+  <!--<rule ref="rulesets/strings.xml/AvoidDuplicateLiterals"/>-->
+  <!--<rule ref="rulesets/strings.xml/StringInstantiation"/>-->
+  <!--<rule ref="rulesets/strings.xml/StringToString"/>-->
+  <!--<rule ref="rulesets/strings.xml/AvoidConcatenatingNonLiteralsInStringBuffer"/>-->
+  <!--<rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>-->
+  
+  <!--<rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"/>-->
+  <!--<rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly"/>-->
+  
+  <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>
+  <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
+  <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>
+  <!--<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>-->
+  
+</ruleset>

Added: incubator/yoko/trunk/maven-plugins/checkstyle.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/maven-plugins/checkstyle.xml?rev=413080&view=auto
==============================================================================
--- incubator/yoko/trunk/maven-plugins/checkstyle.xml (added)
+++ incubator/yoko/trunk/maven-plugins/checkstyle.xml Fri Jun  9 09:00:07 2006
@@ -0,0 +1,261 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<!--
+Checks to make sure the code meets the Yoko coding guidelines
+http://java.sun.com/docs/codeconv/index.html
+
+It also enforces aa bunch of other "BestPractices like method
+lengths, if/try depths, etc...
+                        
+-->
+
+<module name="Checker">
+    <!-- Checks whether files end with a new line.                        -->
+    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+    <!--
+    <module name="NewlineAtEndOfFile"/>
+    -->
+
+    <!-- Checks that property files contain the same keys.         -->
+    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+    <module name="Translation"/>
+
+    <!--<module name="StrictDuplicateCode"/>-->
+
+    <module name="TreeWalker">
+
+        <!-- Checks for Javadoc comments.                     -->
+        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+        <!--
+        <module name="PackageHtml"/>
+        <module name="JavadocMethod"/>
+        <module name="JavadocType"/>
+        <module name="JavadocVariable"/>
+        <module name="JavadocStyle"/>
+        -->
+
+
+        <!-- Checks for Naming Conventions.                  -->
+        <!-- See http://checkstyle.sf.net/config_naming.html -->
+        <module name="AbstractClassName">
+        	<property name="format" value="^Abstract.*$|^.*Factory$|^.*Bus$|^.*ConfigurationRepository$|^.*Base$|^Exception$|^.*Builder$"/>
+        </module>        
+        <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"/>
+        
+        <!-- Header checks -->
+        <!-- <module name="Header"/> -->
+        <!-- <module name="RegexpHeader"/> -->
+
+
+        <!-- Checks for imports                              -->
+        <!-- See http://checkstyle.sf.net/config_import.html -->
+        <module name="AvoidStarImport">
+            <property name="excludes" value="java.io,java.util,java.net,java.nio,java.nio.channels,java.lang.reflect,org.w3c.dom,org.xml.sax,java.awt,javax.swing,junit.framework"/>
+        </module>
+        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
+        <module name="ImportOrder">
+            <property name="groups" value="java,javax,org.w3c,org.xml,w3c"/>
+            <property name="ordered" value="true"/>
+        </module>
+        <!--
+        <module name="ImportControl">
+            <property name="file" value="etc/import-control.xml"/>
+        </module>
+        -->
+        
+
+        <!-- Checks for Size Violations.                    -->
+        <!-- See http://checkstyle.sf.net/config_sizes.html -->
+        <module name="AnonInnerLength">
+            <property name="max" value="40"/>
+        </module>
+        <module name="ExecutableStatementCount">
+            <property name="max" value="50"/>
+        </module>
+        <module name="FileLength"/>
+        <module name="LineLength">
+            <property name="max" value="110"/>
+        </module>
+        <module name="MethodLength">
+            <property name="max" value="150"/>
+            <property name="countEmpty" value="false"/>
+        </module>
+        <module name="ParameterNumber">
+            <property name="max" value="7"/>
+        </module>
+
+        <!-- Checks for whitespace                               -->
+        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+        <module name="EmptyForIteratorPad"/>
+        <module name="EmptyForInitializerPad"/>
+        <module name="MethodParamPad"/>
+        <module name="NoWhitespaceAfter"/>
+        <module name="NoWhitespaceBefore"/>
+        <module name="OperatorWrap"/>
+        <module name="ParenPad"/>
+        <module name="TypecastParenPad"/>
+        <module name="TabCharacter"/>
+        <module name="WhitespaceAfter">
+            <property name="tokens" value="COMMA, SEMI"/>
+        </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, LCURLY, 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, RCURLY, SL, SLIST, SL_ASSIGN, SR,
SR_ASSIGN, STAR, STAR_ASSIGN,TYPE_EXTENSION_AND"/>
+        </module>
+      
+
+        <!-- Modifier Checks                                    -->
+        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+        <module name="ModifierOrder"/>
+        <module name="RedundantModifier"/>
+
+
+        <!-- Checks for blocks. You know, those {}'s         -->
+        <!-- See http://checkstyle.sf.net/config_blocks.html -->
+        <module name="AvoidNestedBlocks">
+            <property name="allowInSwitchCase" value="true"/>
+        </module>
+        <module name="EmptyBlock">
+            <property name="option" value="text"/>
+        </module>
+        <module name="LeftCurly"/>
+        <module name="NeedBraces"/>
+        <module name="RightCurly"/>
+
+
+        <!-- Checks for common coding problems               -->
+        <!-- See http://checkstyle.sf.net/config_coding.html -->
+        <!--<module name="ArrayTrailingComma"/>-->
+        <!--<module name="AvoidInlineConditionals"/>-->
+        <module name="CovariantEquals"/>
+        <module name="DoubleCheckedLocking"/>
+        <module name="EmptyStatement"/>
+        <module name="EqualsHashCode"/>
+        <!--<module name="FinalLocalVariable"/>-->
+        <module name="HiddenField"/>
+        <module name="IllegalInstantiation"/>
+        <!--<module name="IllegalToken"/>-->
+        <!--<module name="IllegalTokenText"/>-->
+        <!--<module name="InnerAssignment"/>-->
+        <!--<module name="MagicNumber"/>-->
+        <module name="MissingSwitchDefault"/>
+        <module name="ModifiedControlVariable"/>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+        <module name="StringLiteralEquality"/>
+        <module name="NestedIfDepth">
+            <property name="max" value="3"/>
+        </module>
+        <module name="NestedTryDepth">
+            <property name="max" value="3"/>
+        </module>
+        <module name="SuperClone"/>
+        <module name="SuperFinalize"/>
+        <!--<module name="IllegalCatch"/>-->
+	<module name="IllegalThrows">
+	  <property name="illegalClassNames" value="java.lang.Error,java.lang.RuntimeException"/>
+	</module>
+        <!--<module name="RedundantThrows"/>-->
+        <module name="PackageDeclaration"/>
+        <module name="JUnitTestCase"/>
+        <module name="ReturnCount">
+            <property name="max" value="6"/>
+        </module>
+        
+        <module name="IllegalType">
+            <property name="format" value="^xxx$"/>
+        </module>
+        <module name="DeclarationOrder"/>
+        <!--<module name="ParameterAssignment"/>-->
+        <module name="ExplicitInitialization"/>
+        <module name="DefaultComesLast"/>
+        <!--<module name="MissingCtor"/>-->
+        <module name="FallThrough"/>
+        <!--<module name="MultipleStringLiterals"/>-->
+        <module name="MultipleVariableDeclarations"/>
+        <!--<module name="RequireThis"/>-->
+        <module name="UnnecessaryParentheses"/>
+        
+        
+
+        <!-- Checks for class design                         -->
+        <!-- See http://checkstyle.sf.net/config_design.html -->
+        <!--<module name="DesignForExtension"/>-->
+        <module name="FinalClass"/>
+        <module name="HideUtilityClassConstructor"/>
+        <module name="InterfaceIsType"/>
+        <module name="MutableException"/>
+        <module name="ThrowsCount">
+        	<property name="max" value="5"/>
+        </module>
+        <module name="VisibilityModifier">
+            <property name="protectedAllowed" value="true"/>
+            <property name="packageAllowed" value="true"/>
+			<!-- this is needed for the resource injection unit tests.  It will removed 
+			     when private member inject is supported.
+			-->
+    		<property name="publicMemberPattern" value="resource[12].*"/>
+        </module>
+
+
+
+        <!-- Metrics checks.                   -->
+        <!-- See http://checkstyle.sf.net/config_metrics.html -->
+        <module name="BooleanExpressionComplexity">
+        	<property name="max" value="6"/>
+        </module>
+        <!--<module name="ClassDataAbstractionCoupling"/>-->
+        <!--<module name="ClassFanOutComplexity"/>-->
+        <!--<module name="CyclomaticComplexity"/>-->
+        <!--<module name="NPathComplexity"/>-->
+        <module name="JavaNCSS">
+       		<property name="methodMaximum" value="75"/>
+        </module>
+
+		
+        <!-- Miscellaneous other checks.                   -->
+        <!-- See http://checkstyle.sf.net/config_misc.html -->
+        <!-- 
+        <module name="ArrayTypeStyle"/>
+        <module name="FinalParameters"/>
+        -->
+        <!--
+        <module name="GenericIllegalRegexp">
+            <property name="format" value="\s+$"/>
+            <property name="message" value="Line has trailing spaces."/>
+        </module>
+        -->
+        <module name="TodoComment">
+			<property name="format" value="WARNING"/>
+		</module>
+
+        <module name="UpperEll"/>
+        
+        <!--Assert statement may have side effects:-->
+		<module name="DescendantToken">
+    		<property name="tokens" value="LITERAL_ASSERT"/>
+		    <property name="limitedTokens" value="ASSIGN,DEC,INC,POST_DEC,POST_INC,PLUS_ASSIGN,MINUS_ASSIGN,STAR_ASSIGN,DIV_ASSIGN,MOD_ASSIGN,BSR_ASSIGN,SR_ASSIGN,SL_ASSIGN,BAND_ASSIGN,BXOR_ASSIGN,BOR_ASSIGN"/>
+		    <property name="maximumNumber" value="0"/>
+		</module>
+ 
+        <!--<module name="UncommentedMain"/>-->
+        <module name="TrailingComment"/>
+        <module name="Indentation">
+            <property name="caseIndent" value="0"/>
+        </module>
+        <!--<module name="RequiredRegexp">-->
+    </module>
+
+</module>

Propchange: incubator/yoko/trunk/maven-plugins/checkstyle.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/yoko/trunk/maven-plugins/checkstyle.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/yoko/trunk/maven-plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/maven-plugins/pom.xml?rev=413080&view=auto
==============================================================================
--- incubator/yoko/trunk/maven-plugins/pom.xml (added)
+++ incubator/yoko/trunk/maven-plugins/pom.xml Fri Jun  9 09:00:07 2006
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.yoko</groupId>
+  <artifactId>yoko-maven-plugins</artifactId>
+  <name>Yoko Maven plugins</name>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>maven-plugin</packaging>
+
+  <parent>
+      <groupId>org.apache.yoko</groupId>
+      <artifactId>Yoko</artifactId>
+      <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <dependencies>
+    <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>3.8.1</version>
+        <scope>test</scope>
+    </dependency>
+
+    <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-plugin-api</artifactId>
+        <version>2.0.1</version>
+        <scope>compile</scope>
+        <exclusions>
+            <exclusion>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+            </exclusion>
+        </exclusions>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-project</artifactId>
+        <version>2.0.1</version>
+        <scope>compile</scope>
+        <exclusions>
+            <exclusion>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+            </exclusion>
+        </exclusions>
+    </dependency>
+    <dependency>
+       <groupId>org.apache.yoko</groupId>
+       <artifactId>yoko-tools</artifactId>
+       <version>${project.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>ant</groupId>
+        <artifactId>ant</artifactId>
+        <version>1.6.5</version>
+    </dependency>
+    <dependency>
+        <groupId>ant</groupId>
+        <artifactId>ant-nodeps</artifactId>
+        <version>1.6.5</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+       <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-checkstyle-plugin</artifactId>
+       </plugin>
+    </plugins>
+  </build>
+
+  <reporting> 
+    <plugins>
+      <plugin>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-clover-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-pmd-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
+</project>
+

Propchange: incubator/yoko/trunk/maven-plugins/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/yoko/trunk/maven-plugins/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/IDLToWSDLOption.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/IDLToWSDLOption.java?rev=413080&view=auto
==============================================================================
--- incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/IDLToWSDLOption.java
(added)
+++ incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/IDLToWSDLOption.java
Fri Jun  9 09:00:07 2006
@@ -0,0 +1,25 @@
+package org.apache.yoko.maven.plugins;
+
+import java.util.List;
+
+public class IDLToWSDLOption {
+
+    String idl;
+    List<String> extraargs;
+    
+    public String getIDL() {
+        return idl;
+    }
+
+    public void setIDL(String idlFile) {
+        idl = idlFile;
+    }
+
+    public List<String> getExtraargs() {
+        return extraargs;
+    }
+
+    public void setExtraargs(List<String> args) {
+        extraargs = args;
+    }
+}

Propchange: incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/IDLToWSDLOption.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/IDLToWSDLPlugin.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/IDLToWSDLPlugin.java?rev=413080&view=auto
==============================================================================
--- incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/IDLToWSDLPlugin.java
(added)
+++ incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/IDLToWSDLPlugin.java
Fri Jun  9 09:00:07 2006
@@ -0,0 +1,84 @@
+package org.apache.yoko.maven.plugins;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.tools.ant.ExitException;
+import org.apache.tools.ant.util.optional.NoExitSecurityManager;
+
+import org.apache.yoko.tools.IDLToWSDL;
+
+/**
+ * @goal idltowsdl
+ * @description Yoko IDL To WSDL Tool
+ */
+public class IDLToWSDLPlugin extends AbstractMojo {
+
+    /**
+     * @parameter  expression="${project.build.directory}/generated/src/main/java"
+     * @required
+     */
+    String outputDir;
+    
+    /**
+     * @parameter
+     */
+    IDLToWSDLOption idltowsdlOptions[];
+
+
+    public void execute() throws MojoExecutionException {
+        File outputDirFile = new File(outputDir);
+        outputDirFile.mkdirs();
+        
+        boolean result = true;
+        
+        if (idltowsdlOptions == null) {
+            throw new MojoExecutionException("Please specify the idltowsdl options");
+        }
+
+        for (int x = 0; x < idltowsdlOptions.length; x++) {
+            File file = new File(idltowsdlOptions[x].getIDL());
+            File doneFile = new File(outputDirFile, "." + file.getName() + ".DONE");
+
+            boolean doWork = file.lastModified() > doneFile.lastModified();
+            if (!doneFile.exists()) {
+                doWork = true;
+            } else if (file.lastModified() > doneFile.lastModified()) {
+                doWork = true;
+            }
+
+            if (doWork) {
+                List<Object> list = new ArrayList<Object>();
+                list.add("-o");
+                list.add(outputDir);
+                list.addAll(idltowsdlOptions[x].getExtraargs());
+                list.add(idltowsdlOptions[x].getIDL());            
+                SecurityManager oldSm = System.getSecurityManager();
+                try {
+                    try {
+                        System.setSecurityManager(new NoExitSecurityManager());
+                        IDLToWSDL.main((String[])list.toArray(new String[list.size()]));
+                        doneFile.delete();
+                        doneFile.createNewFile();
+                    } catch (ExitException e) {
+                        if (e.getStatus() == 0) {
+                            doneFile.delete();
+                            doneFile.createNewFile();
+                        } else {
+                            throw e;
+                        }
+                    }
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                    throw new MojoExecutionException(e.getMessage(), e);
+                } finally {
+                    System.setSecurityManager(oldSm);
+                }
+            }
+        }
+    }
+
+}

Propchange: incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/IDLToWSDLPlugin.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/WSDLToIDLOption.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/WSDLToIDLOption.java?rev=413080&view=auto
==============================================================================
--- incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/WSDLToIDLOption.java
(added)
+++ incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/WSDLToIDLOption.java
Fri Jun  9 09:00:07 2006
@@ -0,0 +1,44 @@
+package org.apache.yoko.maven.plugins;
+
+import java.util.List;
+
+public class WSDLToIDLOption {
+
+    String wsdl;
+    boolean corbabinding;
+    boolean idl;
+
+    List<String> extraargs;
+    
+    public String getWSDL() {
+        return wsdl;
+    }
+
+    public void setWSDL(String wsdlFile) {
+        wsdl = wsdlFile;
+    }
+
+    public boolean isCorbaEnabled() {
+        return corbabinding;
+    }
+
+    public void setCorbabinding(boolean flag) {
+        corbabinding = flag;
+    }
+
+    public boolean isIdlEnabled() {
+        return idl;
+    }
+
+    public void setIdl(boolean flag) {
+        idl = flag;
+    }
+
+    public List<String> getExtraargs() {
+        return extraargs;
+    }
+
+    public void setExtraargs(List<String> args) {
+        extraargs = args;
+    }
+}

Propchange: incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/WSDLToIDLOption.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/WSDLToIDLPlugin.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/WSDLToIDLPlugin.java?rev=413080&view=auto
==============================================================================
--- incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/WSDLToIDLPlugin.java
(added)
+++ incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/WSDLToIDLPlugin.java
Fri Jun  9 09:00:07 2006
@@ -0,0 +1,92 @@
+package org.apache.yoko.maven.plugins;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.tools.ant.ExitException;
+import org.apache.tools.ant.util.optional.NoExitSecurityManager;
+
+import org.apache.yoko.tools.WSDLToIDL;
+
+/**
+ * @goal wsdltoidl
+ * @description Yoko WSDL To IDL Tool
+ */
+public class WSDLToIDLPlugin extends AbstractMojo {
+
+    /**
+     * @parameter  expression="${project.build.directory}/generated/src/main/java"
+     * @required
+     */
+    String outputDir;
+    
+    /**
+     * @parameter
+     */
+    WSDLToIDLOption wsdltoidlOptions[];
+
+
+    public void execute() throws MojoExecutionException {
+        File outputDirFile = new File(outputDir);
+        outputDirFile.mkdirs();
+        
+        boolean result = true;
+        
+        if (wsdltoidlOptions == null) {
+            throw new MojoExecutionException("Please specify the wsdltoidl options");
+        }
+
+        for (int x = 0; x < wsdltoidlOptions.length; x++) {
+            File file = new File(wsdltoidlOptions[x].getWSDL());
+            File doneFile = new File(outputDirFile, "." + file.getName() + ".DONE");
+
+            boolean doWork = file.lastModified() > doneFile.lastModified();
+            if (!doneFile.exists()) {
+                doWork = true;
+            } else if (file.lastModified() > doneFile.lastModified()) {
+                doWork = true;
+            }
+
+            if (doWork) {
+                List<Object> list = new ArrayList<Object>();
+                list.add("-d");
+                list.add(outputDir);
+                if (wsdltoidlOptions[x].isCorbaEnabled()) {
+                    list.add("-corba");
+                }
+                if (wsdltoidlOptions[x].isIdlEnabled()) {
+                    list.add("-idl");
+                }
+                if (wsdltoidlOptions[x].getExtraargs() != null) {
+                    list.addAll(wsdltoidlOptions[x].getExtraargs());
+                }
+                list.add(wsdltoidlOptions[x].getWSDL());            
+                SecurityManager oldSm = System.getSecurityManager();
+                try {
+                    try {
+                        System.setSecurityManager(new NoExitSecurityManager());
+                        WSDLToIDL.main((String[])list.toArray(new String[list.size()]));
+                        doneFile.delete();
+                        doneFile.createNewFile();
+                    } catch (ExitException e) {
+                        if (e.getStatus() == 0) {
+                            doneFile.delete();
+                            doneFile.createNewFile();
+                        } else {
+                            throw e;
+                        }
+                    }
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                    throw new MojoExecutionException(e.getMessage(), e);
+                } finally {
+                    System.setSecurityManager(oldSm);
+                }
+            }
+        }
+    }
+
+}

Propchange: incubator/yoko/trunk/maven-plugins/src/main/java/org/apache/yoko/maven/plugins/WSDLToIDLPlugin.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/yoko/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/pom.xml?rev=413080&r1=413079&r2=413080&view=diff
==============================================================================
--- incubator/yoko/trunk/tools/pom.xml (original)
+++ incubator/yoko/trunk/tools/pom.xml Fri Jun  9 09:00:07 2006
@@ -24,12 +24,6 @@
             <version>3.8.1</version>
             <scope>test</scope>
         </dependency>
-        <!-- <dependency>
-            <groupId>easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <version>2.0-20050821.154600</version>
-            <scope>test</scope>
-        </dependency>         -->
         <dependency>
             <groupId>org.objectweb.celtix</groupId>
             <artifactId>celtix-api</artifactId>
@@ -38,7 +32,7 @@
         <dependency>
             <groupId>org.apache.yoko</groupId>
             <artifactId>yoko-api</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>antlr</groupId>

Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java?rev=413080&r1=413079&r2=413080&view=diff
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java
(original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java
Fri Jun  9 09:00:07 2006
@@ -17,6 +17,7 @@
 
 import org.objectweb.celtix.tools.common.Processor;
 import org.objectweb.celtix.tools.common.ProcessorEnvironment;
+import org.objectweb.celtix.tools.common.ToolConstants;
 import org.objectweb.celtix.tools.common.ToolException;
 
 public class IDLToWSDLProcessor implements Processor {
@@ -44,6 +45,12 @@
         parser.specification();
         AST idlTree = parser.getAST();
 
+        Object obj = env.get(ToolConstants.CFG_OUTPUTDIR);
+        String outputDir = ".";
+        if (obj != null) {
+            outputDir = obj.toString();
+        }
+
         String tns = (String) env.get(ToolCorbaConstants.CFG_TNS);
         if (tns == null) {
             tns = CORBAConstants.WSDL_NS_URI + idl;
@@ -53,8 +60,9 @@
             WSDLASTVisitor visitor = new WSDLASTVisitor(tns);
             visitor.visit(idlTree);
             if (outStream == null) {
-                //Use the specified file name from the environment(if provided)
-                java.io.File file = new java.io.File(idl + ".wsdl");
+                java.io.File outputDirFile = new java.io.File(outputDir);
+                outputDirFile.mkdirs();
+                java.io.File file = new java.io.File(outputDirFile, idl + ".wsdl");
                 outStream = new java.io.FileOutputStream(file);
             }
             Definition def = visitor.getDefinition();

Modified: incubator/yoko/trunk/tools/src/test/resources/toolspecs/wsdl2idl.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/toolspecs/wsdl2idl.xml?rev=413080&r1=413079&r2=413080&view=diff
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/toolspecs/wsdl2idl.xml (original)
+++ incubator/yoko/trunk/tools/src/test/resources/toolspecs/wsdl2idl.xml Fri Jun  9 09:00:07
2006
@@ -51,7 +51,7 @@
         </associatedArgument>
       </option>
       
-           <option id="outputfile" maxOccurs="2">
+      <option id="outputfile" maxOccurs="2">
         <annotation>The wsdl/idl output file name.(can be specified twice)</annotation>
         <switch>o</switch>
         <associatedArgument placement="afterSpace">



Mime
View raw message