Author: bimargulies
Date: Sun Dec 14 15:18:54 2008
New Revision: 726576
URL: http://svn.apache.org/viewvc?rev=726576&view=rev
Log:
Start moving on 2.0. Set up a set of PMD and Checkstyle options. Do an initial
push of all of the code
to respect them. mvn install doesn't run them yet, because even with this there
are a lot of bits of
code to clean up before they run cleanly.
Added:
webservices/commons/trunk/modules/XmlSchema/etc/
webservices/commons/trunk/modules/XmlSchema/etc/eclipse/
webservices/commons/trunk/modules/XmlSchema/etc/eclipse/XmlSchemaCleanUp.xml
- copied, changed from r726570, cxf/trunk/etc/eclipse/CXFCleanUp.xml
webservices/commons/trunk/modules/XmlSchema/etc/eclipse/XmlSchemaCodeFormatter.xml
- copied, changed from r726570, cxf/trunk/etc/eclipse/CXFCodeFormatter.xml
webservices/commons/trunk/modules/XmlSchema/etc/eclipse/addcheckstyle.xsl
- copied unchanged from r726570, cxf/trunk/etc/eclipse/addcheckstyle.xsl
webservices/commons/trunk/modules/XmlSchema/etc/eclipse/codetemplates.xml
- copied unchanged from r726570, cxf/trunk/etc/eclipse/codetemplates.xml
webservices/commons/trunk/modules/XmlSchema/etc/eclipse/template.checkstyle-config.xml
- copied unchanged from r726570,
cxf/trunk/etc/eclipse/template.checkstyle-config.xml
webservices/commons/trunk/modules/XmlSchema/etc/eclipse/xmltemplates.xml
- copied unchanged from r726570, cxf/trunk/etc/eclipse/xmltemplates.xml
webservices/commons/trunk/modules/XmlSchema/etc/xmlschema-checkstyle.xml
- copied, changed from r726568,
cxf/trunk/buildtools/src/main/resources/cxf-checkstyle.xml
webservices/commons/trunk/modules/XmlSchema/etc/xmlschema-eclipse-checkstyle
- copied unchanged from r726570,
cxf/trunk/buildtools/src/main/resources/cxf-eclipse-checkstyle
webservices/commons/trunk/modules/XmlSchema/etc/xmlschema-eclipse-pmd
- copied unchanged from r726570,
cxf/trunk/buildtools/src/main/resources/cxf-eclipse-pmd
webservices/commons/trunk/modules/XmlSchema/etc/xmlschema-pmd-ruleset.xml
- copied unchanged from r726570,
cxf/trunk/buildtools/src/main/resources/cxf-pmd-ruleset.xml
Modified:
webservices/commons/trunk/modules/XmlSchema/pom.xml
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/DocumentFragmentNodeList.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/TypeReceiver.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/ValidationEvent.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchema.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAll.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAnnotated.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAnnotation.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAny.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAnyAttribute.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAppInfo.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttribute.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttributeGroup.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaAttributeGroupRef.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaChoice.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaComplexContent.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaComplexContentExtension.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaComplexContentRestriction.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaComplexType.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaContent.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaContentProcessing.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaContentType.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaDerivationMethod.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaDocumentation.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaElement.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaEnumerationFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaException.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaExternal.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaForm.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaFractionDigitsFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroup.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaGroupRef.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaIdentityConstraint.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaImport.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaInclude.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaKey.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaKeyref.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaLengthFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxExclusiveFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxInclusiveFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMaxLengthFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinExclusiveFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinInclusiveFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaMinLengthFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaNotation.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaNumericFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObject.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectCollection.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectTable.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaParticle.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaPatternFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaRedefine.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSequence.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSimpleContent.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSimpleContentExtension.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSimpleContentRestriction.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSimpleType.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSimpleTypeList.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSimpleTypeRestriction.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSimpleTypeUnion.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaTotalDigitsFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaType.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaUnique.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaUse.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaWhiteSpaceFacet.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaXPath.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSeverityType.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlTokenizedType.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/constants/Constants.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/constants/Enum.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionDeserializer.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionSerializer.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/ExtensionDeserializer.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/ExtensionRegistry.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/ExtensionSerializer.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/resolver/CollectionURIResolver.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/resolver/DefaultURIResolver.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/resolver/URIResolver.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NamespaceContextOwner.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NamespacePrefixList.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/PrefixCollector.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/XDOMUtil.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AllSimpleTypeTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnnotationTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyAttTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AppInfoMarkupTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeGroupTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeRefTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/BlockTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ChoiceTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/CircularSchemaTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ComplexContentRestrictionTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ConstraintsTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ElementRefs2Test.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ElementRefsTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/EncodingTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/EnumValueTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ExternalAttTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/FacetsTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/GroupTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ImportTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/IncludeTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ListTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/MixedContentTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/MultipleExternalAttTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/NamespaceContextTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/NotationTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/RecursiveImportTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/RedefineTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/SequenceTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/SimpleContentExtensionTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/SimpleContentRestrictionTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestForwardRefs.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestLocalUnnamedSimpleType.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestSimpleRestriction.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestUnqualifiedSchema.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TwoSchemasRefTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TwoSchemasTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/UnionTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/WSCOMMONS377Test.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomAttribute.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomAttributeDeserializer.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomAttributeSerializer.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomExtDeserializerTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomExtensionRegistry.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/attrib/CustomExtensionSerializerTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomElement.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomElementDeserializer.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomElementSerializer.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomExtElementDeserializerTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomExtElementSerializerTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/customext/elt/CustomExtensionRegistry.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ext/PlainExtensionDeserializerTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ext/PlainExtensionSerializerTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/SchemaTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestRoundTripXSD.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaBucket.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaTestSet.java
Copied:
webservices/commons/trunk/modules/XmlSchema/etc/eclipse/XmlSchemaCleanUp.xml
(from r726570, cxf/trunk/etc/eclipse/CXFCleanUp.xml)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/etc/eclipse/XmlSchemaCleanUp.xml?p2=webservices/commons/trunk/modules/XmlSchema/etc/eclipse/XmlSchemaCleanUp.xml&p1=cxf/trunk/etc/eclipse/CXFCleanUp.xml&r1=726570&r2=726576&rev=726576&view=diff
==============================================================================
--- cxf/trunk/etc/eclipse/CXFCleanUp.xml (original)
+++
webservices/commons/trunk/modules/XmlSchema/etc/eclipse/XmlSchemaCleanUp.xml
Sun Dec 14 15:18:54 2008
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<profiles version="2">
-<profile kind="CleanUpProfile" name="CXF" version="2">
+<profiles version="1">
+<profile kind="CleanUpProfile" name="XmlSchema" version="1">
<setting id="cleanup.always_use_blocks" value="true"/>
<setting id="cleanup.use_this_for_non_static_field_access_only_if_necessary"
value="true"/>
<setting id="cleanup.use_this_for_non_static_field_access" value="false"/>
Copied:
webservices/commons/trunk/modules/XmlSchema/etc/eclipse/XmlSchemaCodeFormatter.xml
(from r726570, cxf/trunk/etc/eclipse/CXFCodeFormatter.xml)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/etc/eclipse/XmlSchemaCodeFormatter.xml?p2=webservices/commons/trunk/modules/XmlSchema/etc/eclipse/XmlSchemaCodeFormatter.xml&p1=cxf/trunk/etc/eclipse/CXFCodeFormatter.xml&r1=726570&r2=726576&rev=726576&view=diff
==============================================================================
--- cxf/trunk/etc/eclipse/CXFCodeFormatter.xml (original)
+++
webservices/commons/trunk/modules/XmlSchema/etc/eclipse/XmlSchemaCodeFormatter.xml
Sun Dec 14 15:18:54 2008
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<profiles version="11">
-<profile kind="CodeFormatterProfile" name="CXF Java Conventions" version="11">
+<profiles version="1">
+<profile kind="CodeFormatterProfile" name="XMLSchema Java Conventions"
version="1">
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert"
value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant"
value="end_of_line"/>
Copied:
webservices/commons/trunk/modules/XmlSchema/etc/xmlschema-checkstyle.xml (from
r726568, cxf/trunk/buildtools/src/main/resources/cxf-checkstyle.xml)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/etc/xmlschema-checkstyle.xml?p2=webservices/commons/trunk/modules/XmlSchema/etc/xmlschema-checkstyle.xml&p1=cxf/trunk/buildtools/src/main/resources/cxf-checkstyle.xml&r1=726568&r2=726576&rev=726576&view=diff
==============================================================================
--- cxf/trunk/buildtools/src/main/resources/cxf-checkstyle.xml (original)
+++ webservices/commons/trunk/modules/XmlSchema/etc/xmlschema-checkstyle.xml
Sun Dec 14 15:18:54 2008
@@ -22,7 +22,7 @@
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd";>
<!--
- Checks to make sure the code meets the CXF coding guidelines which
+ Checks to make sure the code meets the XMLSchema coding guidelines
which
are similar to the Sun guidelines at:
http://java.sun.com/docs/codeconv/index.html
@@ -88,7 +88,7 @@
<module name="UnusedImports" />
<module name="ImportOrder">
<property name="groups"
- value="java,javax,org.w3c,org.xml,junit" />
+ value="java,javax,org.w3c,org.xml,org.junit" />
<property name="ordered" value="true" />
</module>
<!--
Modified: webservices/commons/trunk/modules/XmlSchema/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/pom.xml?rev=726576&r1=726575&r2=726576&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/pom.xml (original)
+++ webservices/commons/trunk/modules/XmlSchema/pom.xml Sun Dec 14 15:18:54 2008
@@ -70,6 +70,38 @@
</testResource>
</testResources>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.5.1</version>
+ <configuration>
+ <outputDirectory>${eclipse.outputDirectory}</outputDirectory>
+ <buildcommands>
+
<java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
+
<java.lang.String>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String>
+
<java.lang.String>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</java.lang.String>
+ </buildcommands>
+ <projectnatures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+ <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
+ </projectnatures>
+ <additionalConfig>
+ <file>
+ <name>.checkstyle</name>
+ <location>etc/xmlschema-eclipse-checkstyle</location>
+ </file>
+ <file>
+ <name>.pmd</name>
+ <location>etc/xmlschema-eclipse-pmd</location>
+ </file>
+ <file>
+ <name>.ruleset</name>
+ <location>etc/xmlschema-pmd-ruleset.xml</location>
+ </file>
+ </additionalConfig>
+ </configuration>
+ </plugin>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.0</version>
@@ -146,6 +178,50 @@
<target>1.5</target>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-velocity</artifactId>
+ <version>1.1.3</version>
+ <exclusions>
+ <exclusion>
+ <!-- Use the version specified by
checkstyle:checkstyle instead -->
+
<artifactId>commons-collections</artifactId>
+ <groupId>commons-collections</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>plexus-utils</artifactId>
+ <groupId>plexus</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <configuration>
+
<configLocation>etc/xmlschema-checkstyle.xml</configLocation>
+ <consoleOutput>true</consoleOutput>
+ <failsOnError>true</failsOnError>
+ <linkXRef>false</linkXRef>
+
<suppressionsLocation>etc/xmlschema-checkstyle-suppressions.xml</suppressionsLocation>
+
<sourceDirectory>${basedir}/src</sourceDirectory>
+ </configuration>
+ <goals>
+ <goal>checkstyle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -405,7 +481,117 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>setup.eclipse</id>
+ <properties>
+ <eclipse.workspace.dir>${basedir}/../workspace</eclipse.workspace.dir>
+ </properties>
+ <build>
+ <defaultGoal>process-test-sources</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>setup.eclipse.workspace</id>
+ <phase>process-test-sources</phase>
+ <goals>
+ <goal>configure-workspace</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <workspace>${eclipse.workspace.dir}</workspace>
+
<workspaceCodeStylesURL>etc/eclipse/XmlSchemaCodeFormatter.xml</workspaceCodeStylesURL>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <inherited>false</inherited>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>setup.workspace</id>
+ <phase>validate</phase>
+ <configuration>
+ <tasks>
+ <path id="ecp.ws.path" location="${eclipse.workspace.dir}"
/>
+ <property name="full.eclipse.workspace" refid="ecp.ws.path"
/>
+ <property name="checkstyle.url"
location="etc/xmlschema-checkstyle.xml"/>
+
+ <mkdir
dir="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings"
/>
+ <mkdir
dir="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle"
/>
+ <mkdir
dir="${full.eclipse.workspace}/.metadata/.plugins/net.sourceforge.pmd.eclipse"
/>
+
+ <get src="file:${checkstyle.url}"
dest="${full.eclipse.workspace}/xmlschema-checkstyle.xml" />
+
+ <!-- Add checkstyle config -->
+ <copy
file="${basedir}/etc/eclipse/template.checkstyle-config.xml"
tofile="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml"
overwrite="no">
+ <filterset>
+ <filter token="CHECKSTYLE_CONFIG_FILE"
value="${full.eclipse.workspace}/xmlschema-checkstyle.xml" />
+ </filterset>
+ </copy>
+ <xslt style="${basedir}/etc/eclipse/addcheckstyle.xsl"
in="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml"
out="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml.new">
+ <param name="checkstyleconfig"
expression="${full.eclipse.workspace}/xmlschema-checkstyle.xml" />
+ </xslt>
+ <copy
file="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml.new"
tofile="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml"
overwrite="yes" />
+
+
+ <!-- Add warning flags that we want -->
+ <propertyfile
file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs">
+ <entry
key="org.eclipse.jdt.core.compiler.problem.missingSerialVersion" value="ignore"
/>
+ <entry
key="org.eclipse.jdt.core.compiler.problem.unusedImport" value="ignore" />
+ <entry
key="org.eclipse.jdt.core.compiler.problem.annotationSuperInterface"
value="ignore" />
+ <entry
key="org.eclipse.jdt.core.compiler.problem.rawTypeReference" value="ignore" />
+ </propertyfile>
+ <!-- Add code format rules -->
+ <loadfile property="eclipse.code.cleanup"
srcFile="${basedir}/etc/eclipse/XmlSchemaCleanUp.xml" />
+ <loadfile property="eclipse.code.templates"
srcFile="${basedir}/etc/eclipse/codetemplates.xml" />
+ <loadfile property="eclipse.xml.templates"
srcFile="${basedir}/etc/eclipse/xmltemplates.xml" />
+ <propertyfile
file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs">
+ <entry key="cleanup_profile" value="XmlSchema" />
+ <entry key="org.eclipse.jdt.ui.cleanupprofiles"
value="${eclipse.code.cleanup}" />
+ <entry
key="org.eclipse.jdt.ui.text.custom_code_templates"
value="${eclipse.code.templates}" />
+
+ <!-- Add import order -->
+ <entry key="org.eclipse.jdt.ui.importorder"
value="java;javax;org.w3c;org.xml;org.junit" />
+ <!-- Sort order -->
+ <entry key="org.eclipse.jdt.ui.visibility.order"
value="B,R,D,V," />
+ <entry key="outlinesortoption"
value="T,SF,F,SI,I,C,SM,M," />
+ <entry key="org.eclipse.jdt.ui.enable.visibility.order"
value="true" />
+ </propertyfile>
+ <propertyfile
file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.xml.ui.prefs">
+ <entry key="eclipse.preferences.version" value="1" />
+ <entry key="org.eclipse.wst.sse.ui.custom_templates"
value="${eclipse.xml.templates}" />
+ </propertyfile>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
+
<pluginRepositories>
<pluginRepository>
<id>snapshot</id>
@@ -434,7 +620,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/DocumentFragmentNodeList.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/DocumentFragmentNodeList.java?rev=726576&r1=726575&r2=726576&view=diff
==============================================================================
---
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/DocumentFragmentNodeList.java
(original)
+++
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/DocumentFragmentNodeList.java
Sun Dec 14 15:18:54 2008
@@ -27,52 +27,52 @@
/**
* Class to return a node list without thread-safety issue.
- *
*/
class DocumentFragmentNodeList implements NodeList {
- private List nodes;
- private DocumentFragment fragment;
-
- /**
- * Construct a list of the children of a given node.
- * @param parentNode node from which to copy children.
- */
- DocumentFragmentNodeList(Node parentNode) {
- fragment =
parentNode.getOwnerDocument().createDocumentFragment();
- nodes = new ArrayList();
- for(Node child = parentNode.getFirstChild(); child != null;
child = child.getNextSibling()) {
- nodes.add(fragment.appendChild(child.cloneNode(true)));
- }
- }
-
- /**
- * Create a list of the children of a given node that are elements with
a specified qualified name.
- * @param parentNode node from which to copy children.
- * @param filterUri Namespace URI of children to copy.
- * @param filterLocal Local name of children to copy.
- */
- DocumentFragmentNodeList(Node parentNode, String filterUri, String
filterLocal) {
- fragment =
parentNode.getOwnerDocument().createDocumentFragment();
- nodes = new ArrayList();
- for(Node child = parentNode.getFirstChild(); child != null;
child = child.getNextSibling()) {
- if(child.getNodeType() == Node.ELEMENT_NODE
- &&
child.getNamespaceURI().equals(filterUri)
- &&
child.getLocalName().equals(filterLocal)) {
-
nodes.add(fragment.appendChild(child.cloneNode(true)));
- }
- }
- }
-
- public int getLength() {
- return nodes.size();
- }
-
- public Node item(int index) {
- if(nodes == null) {
- return null;
- } else {
- return (Node) nodes.get(index);
- }
- }
+ private List nodes;
+ private DocumentFragment fragment;
+
+ /**
+ * Construct a list of the children of a given node.
+ *
+ * @param parentNode node from which to copy children.
+ */
+ DocumentFragmentNodeList(Node parentNode) {
+ fragment = parentNode.getOwnerDocument().createDocumentFragment();
+ nodes = new ArrayList();
+ for (Node child = parentNode.getFirstChild(); child != null; child =
child.getNextSibling()) {
+ nodes.add(fragment.appendChild(child.cloneNode(true)));
+ }
+ }
+
+ /**
+ * Create a list of the children of a given node that are elements with a
specified qualified name.
+ *
+ * @param parentNode node from which to copy children.
+ * @param filterUri Namespace URI of children to copy.
+ * @param filterLocal Local name of children to copy.
+ */
+ DocumentFragmentNodeList(Node parentNode, String filterUri, String
filterLocal) {
+ fragment = parentNode.getOwnerDocument().createDocumentFragment();
+ nodes = new ArrayList();
+ for (Node child = parentNode.getFirstChild(); child != null; child =
child.getNextSibling()) {
+ if (child.getNodeType() == Node.ELEMENT_NODE &&
child.getNamespaceURI().equals(filterUri)
+ && child.getLocalName().equals(filterLocal)) {
+ nodes.add(fragment.appendChild(child.cloneNode(true)));
+ }
+ }
+ }
+
+ public int getLength() {
+ return nodes.size();
+ }
+
+ public Node item(int index) {
+ if (nodes == null) {
+ return null;
+ } else {
+ return (Node)nodes.get(index);
+ }
+ }
}
