Hello,
as we settled to be JAXB2.1 compliant I need some modifications on the
castor-jaxb-2.0 project.
I would like to modify:
pom.xml - for the dependency to jaxb api 2.1
.project - which hadn't been there before
.classpath - which hadn't been there before
.checkstyle - to configure checkstyle for the project
src/tools/checkstyle/*.xml - the checkstyle configuration itself
All these changes are in the attached patch file.
Have fun
Joachim
Property changes on: /Volumes/castor-work/workspace/castor-jaxb-2.0-HEAD
___________________________________________________________________
Name: svn:ignore
+ target
Index: /Volumes/castor-work/workspace/castor-jaxb-2.0-HEAD/.checkstyle
===================================================================
--- /Volumes/castor-work/workspace/castor-jaxb-2.0-HEAD/.checkstyle
(revision 0)
+++ /Volumes/castor-work/workspace/castor-jaxb-2.0-HEAD/.checkstyle
(revision 0)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fileset-config file-format-version="1.2.0" simple-config="false">
+ <local-check-config name="castor-main-checks"
location="src/tools/checkstyle/castor-main-checks.xml" type="project"
description="">
+ <additional-data name="protect-config-file" value="true"/>
+ </local-check-config>
+ <local-check-config name="castor-test-checks"
location="src/tools/checkstyle/castor-test-checks.xml" type="project"
description="">
+ <additional-data name="protect-config-file" value="true"/>
+ </local-check-config>
+ <fileset name="core main" enabled="true"
check-config-name="castor-main-checks" local="true">
+ <file-match-pattern
match-pattern="^src[/\\]main[/\\]java[/\\].*\.java" include-pattern="true"/>
+ </fileset>
+ <fileset name="core test" enabled="true"
check-config-name="castor-test-checks" local="true">
+ <file-match-pattern
match-pattern="^src[/\\]test[/\\]java[/\\].*\.java" include-pattern="true"/>
+ </fileset>
+</fileset-config>
Index: /Volumes/castor-work/workspace/castor-jaxb-2.0-HEAD/.classpath
===================================================================
--- /Volumes/castor-work/workspace/castor-jaxb-2.0-HEAD/.classpath
(revision 0)
+++ /Volumes/castor-work/workspace/castor-jaxb-2.0-HEAD/.classpath
(revision 0)
@@ -0,0 +1,19 @@
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/test/java"
output="target/test-classes"/>
+ <classpathentry kind="src" path="src/test/resources"
output="target/test-classes" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar"
sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/xerces/xerces/1.4.0/xerces-1.4.0.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/codehaus/castor/castor/1.1.2.1/castor-1.1.2.1.jar"
sourcepath="M2_REPO/org/codehaus/castor/castor/1.1.2.1/castor-1.1.2.1-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
+</classpath>
\ No newline at end of file
Index: /Volumes/castor-work/workspace/castor-jaxb-2.0-HEAD/.project
===================================================================
--- /Volumes/castor-work/workspace/castor-jaxb-2.0-HEAD/.project
(revision 0)
+++ /Volumes/castor-work/workspace/castor-jaxb-2.0-HEAD/.project
(revision 0)
@@ -0,0 +1,17 @@
+<projectDescription>
+ <name>castor-jaxb</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Index: /Volumes/castor-work/workspace/castor-jaxb-2.0-HEAD/pom.xml
===================================================================
--- /Volumes/castor-work/workspace/castor-jaxb-2.0-HEAD/pom.xml (revision 6900)
+++ /Volumes/castor-work/workspace/castor-jaxb-2.0-HEAD/pom.xml (working copy)
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.codehaus.castor</groupId>
<artifactId>castor</artifactId>
- <version>1.1-M1</version>
+ <version>1.1.2.1</version>
</dependency>
<dependency>
@@ -142,7 +142,7 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</dependency>
<!--
Index:
/Volumes/castor-work/workspace/castor-jaxb-2.0-HEAD/src/tools/checkstyle/castor-main-checks.xml
===================================================================
---
/Volumes/castor-work/workspace/castor-jaxb-2.0-HEAD/src/tools/checkstyle/castor-main-checks.xml
(revision 0)
+++
/Volumes/castor-work/workspace/castor-jaxb-2.0-HEAD/src/tools/checkstyle/castor-main-checks.xml
(revision 0)
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ This configuration file was written by the eclipse-cs plugin
configuration editor
+-->
+<!--
+Checkstyle-Configuration: castor-main-checks
+Description:
+
+-->
+<!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="ArrayTypeStyle"/>
+ <module name="FinalParameters"/>
+ <module name="GenericIllegalRegexp">
+ <property name="severity" value="ignore"/>
+ <property name="format" value="\s+$"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+ <module name="TodoComment"/>
+ <module name="UpperEll"/>
+ <module name="AvoidNestedBlocks"/>
+ <module name="EmptyBlock">
+ <property name="option" value="text"/>
+ </module>
+ <module name="LeftCurly"/>
+ <module name="NeedBraces"/>
+ <module name="RightCurly"/>
+ <module name="AvoidInlineConditionals">
+ <property name="severity" value="ignore"/>
+ </module>
+ <module name="DoubleCheckedLocking"/>
+ <module name="EmptyStatement"/>
+ <module name="EqualsHashCode"/>
+ <module name="HiddenField"/>
+ <module name="IllegalInstantiation"/>
+ <module name="InnerAssignment"/>
+ <module name="MagicNumber">
+ <property name="ignoreNumbers" value="-1, 0, 1, 2, 10, 60, 6000,
60000"/>
+ </module>
+ <module name="MissingSwitchDefault"/>
+ <module name="RedundantThrows">
+ <property name="allowUnchecked" value="true"/>
+ </module>
+ <module name="SimplifyBooleanExpression"/>
+ <module name="SimplifyBooleanReturn"/>
+ <module name="DesignForExtension">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="FinalClass"/>
+ <module name="HideUtilityClassConstructor"/>
+ <module name="InterfaceIsType"/>
+ <module name="VisibilityModifier">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="AvoidStarImport"/>
+ <module name="IllegalImport"/>
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+ <module name="JavadocMethod"/>
+ <module name="JavadocType"/>
+ <module name="JavadocVariable"/>
+ <module name="ConstantName"/>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName">
+ <property name="format" value="^_[a-z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="MethodName"/>
+ <module name="PackageName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName">
+ <property name="format" value="^_[a-z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="TypeName"/>
+ <module name="FileLength"/>
+ <module name="LineLength">
+ <property name="ignorePattern" value="href"/>
+ <property name="max" value="100"/>
+ </module>
+ <module name="MethodLength"/>
+ <module name="ParameterNumber"/>
+ <module name="EmptyForIteratorPad">
+ <property name="option" value="space"/>
+ </module>
+ <module name="NoWhitespaceAfter">
+ <property name="tokens"
value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
+ </module>
+ <module name="NoWhitespaceBefore"/>
+ <module name="OperatorWrap"/>
+ <module name="ParenPad"/>
+ <module name="TabCharacter"/>
+ <module name="WhitespaceAfter"/>
+ <module name="WhitespaceAround"/>
+ <module name="TodoComment">
+ <property name="format" value="FIXME:"/>
+ </module>
+ <module name="TodoComment">
+ <property name="format" value="TEMP:"/>
+ </module>
+ <module name="ParameterAssignment">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="MultipleVariableDeclarations">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="MultipleStringLiterals">
+ <metadata
name="com.atlassw.tools.eclipse.checkstyle.lastEnabledSeverity" value="info"/>
+ <property name="severity" value="ignore"/>
+ </module>
+ <module name="ModifiedControlVariable">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="JUnitTestCase"/>
+ <module name="FinalLocalVariable">
+ <metadata
name="com.atlassw.tools.eclipse.checkstyle.lastEnabledSeverity" value="info"/>
+ <property name="severity" value="ignore"/>
+ <property name="tokens" value="PARAMETER_DEF,VARIABLE_DEF"/>
+ </module>
+ <module name="CovariantEquals"/>
+ <module name="JavadocStyle"/>
+ </module>
+ <module name="Translation"/>
+ <module name="PackageHtml">
+ <property name="severity" value="info"/>
+ </module>
+</module>
Index:
/Volumes/castor-work/workspace/castor-jaxb-2.0-HEAD/src/tools/checkstyle/castor-test-checks.xml
===================================================================
---
/Volumes/castor-work/workspace/castor-jaxb-2.0-HEAD/src/tools/checkstyle/castor-test-checks.xml
(revision 0)
+++
/Volumes/castor-work/workspace/castor-jaxb-2.0-HEAD/src/tools/checkstyle/castor-test-checks.xml
(revision 0)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ This configuration file was written by the eclipse-cs plugin
configuration editor
+-->
+<!--
+Checkstyle-Configuration: Castor test checks
+Description:
+none
+-->
+<!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="ArrayTypeStyle"/>
+ <module name="FinalParameters"/>
+ <module name="GenericIllegalRegexp">
+ <property name="severity" value="ignore"/>
+ <property name="format" value="\s+$"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+ <module name="TodoComment"/>
+ <module name="UpperEll"/>
+ <module name="AvoidNestedBlocks"/>
+ <module name="EmptyBlock">
+ <property name="tokens" value="LITERAL_DO, LITERAL_ELSE,
LITERAL_FINALLY, LITERAL_IF, LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE,
STATIC_INIT"/>
+ </module>
+ <module name="LeftCurly"/>
+ <module name="NeedBraces"/>
+ <module name="RightCurly"/>
+ <module name="AvoidInlineConditionals">
+ <property name="severity" value="ignore"/>
+ </module>
+ <module name="DoubleCheckedLocking"/>
+ <module name="EmptyStatement"/>
+ <module name="EqualsHashCode"/>
+ <module name="HiddenField"/>
+ <module name="IllegalInstantiation"/>
+ <module name="InnerAssignment"/>
+ <module name="MagicNumber">
+ <property name="severity" value="ignore"/>
+ <property name="tokens" value="NUM_DOUBLE, NUM_FLOAT, NUM_INT,
NUM_LONG"/>
+ </module>
+ <module name="MissingSwitchDefault"/>
+ <module name="RedundantThrows"/>
+ <module name="SimplifyBooleanExpression"/>
+ <module name="SimplifyBooleanReturn"/>
+ <module name="DesignForExtension">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="FinalClass"/>
+ <module name="HideUtilityClassConstructor"/>
+ <module name="InterfaceIsType"/>
+ <module name="VisibilityModifier">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="AvoidStarImport"/>
+ <module name="IllegalImport"/>
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+ <module name="JavadocMethod">
+ <property name="severity" value="ignore"/>
+ <property name="tokens" value="METHOD_DEF, CTOR_DEF"/>
+ </module>
+ <module name="JavadocType">
+ <property name="severity" value="ignore"/>
+ <property name="tokens" value="CLASS_DEF, INTERFACE_DEF"/>
+ </module>
+ <module name="JavadocVariable">
+ <property name="severity" value="ignore"/>
+ </module>
+ <module name="ConstantName"/>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName">
+ <property name="format" value="^_[a-z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="MethodName"/>
+ <module name="PackageName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName">
+ <property name="format" value="^_[a-z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="TypeName"/>
+ <module name="FileLength"/>
+ <module name="LineLength">
+ <property name="max" value="100"/>
+ </module>
+ <module name="MethodLength"/>
+ <module name="ParameterNumber"/>
+ <module name="EmptyForIteratorPad"/>
+ <module name="NoWhitespaceAfter">
+ <property name="tokens"
value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
+ </module>
+ <module name="NoWhitespaceBefore"/>
+ <module name="OperatorWrap"/>
+ <module name="ParenPad"/>
+ <module name="TabCharacter"/>
+ <module name="WhitespaceAfter"/>
+ <module name="WhitespaceAround"/>
+ </module>
+</module>
---------------------------------------------------------------------
To unsubscribe from this list please visit:
http://xircles.codehaus.org/manage_email
