svn commit: r561752 - in /maven/doxia/doxia/branches/doxia-modules: ./ doxia-module-xdoc/
Author: vsiveton Date: Wed Aug 1 03:22:27 2007 New Revision: 561752 URL: http://svn.apache.org/viewvc?view=revrev=561752 Log: o created structure Added: maven/doxia/doxia/branches/doxia-modules/ maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/
svn commit: r561788 [3/3] - in /maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123: pom.xml src/main/resources/xdoc-2.0.xsd src/test/resources/test-xdoc-xsd.xml
Added: maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/src/test/resources/test-xdoc-xsd.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/src/test/resources/test-xdoc-xsd.xml?view=autorev=561788 == --- maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/src/test/resources/test-xdoc-xsd.xml (added) +++ maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/src/test/resources/test-xdoc-xsd.xml Wed Aug 1 05:49:04 2007 @@ -0,0 +1,63 @@ +?xml version=1.0? + +!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +License); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +-- + +document xmlns=http://maven.apache.org/XDOC/2.0; + xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/XDOC/2.0 ../../main/resources/xdoc-2.0.xsd + + properties +titleTest Xdoc XSD/title +author email=[EMAIL PROTECTED]Vincent Siveton/author + /properties + body +section name=Documentation + p +This page test the new Xdoc schema for a href=http://maven.apache.org/doxia;Doxia/a. + /p + h4Documentation/h4 + ul +liitem 1/li +liitem 2 + ul +liitem 21/li +liitem 22/li + /ul +/li + /ul + h4Additional/h4 + pre +TOTO + /pre + h4Example/h4 + pre![CDATA[ +Pure xml text +]] + /pre + subsection name=Sub section +pSubsection/p +macro name=name + param name=name value=value/ + param name=name value=value/ +/macro + /subsection +/section + /body +/document Propchange: maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/src/test/resources/test-xdoc-xsd.xml -- svn:eol-style = native Propchange: maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/src/test/resources/test-xdoc-xsd.xml -- svn:keywords = Author Date Id Revision
svn commit: r561788 [1/3] - in /maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123: pom.xml src/main/resources/xdoc-2.0.xsd src/test/resources/test-xdoc-xsd.xml
Author: vsiveton Date: Wed Aug 1 05:49:04 2007 New Revision: 561788 URL: http://svn.apache.org/viewvc?view=revrev=561788 Log: o first add of xdoc-2.0.xsd o added a test xdoc file to play with the new xsd o updated pom to include xsddoc (XML Schema documentation generator) ant task for the site phase Added: maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/src/main/resources/xdoc-2.0.xsd (with props) maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/src/test/resources/test-xdoc-xsd.xml (with props) Modified: maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/pom.xml Modified: maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/pom.xml?view=diffrev=561788r1=561787r2=561788 == --- maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/pom.xml (original) +++ maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/pom.xml Wed Aug 1 05:49:04 2007 @@ -12,6 +12,53 @@ build plugins plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-antrun-plugin/artifactId +executions + execution +phasesite/phase +configuration + tasks + +taskdef name=xsddoc + classname=net.sf.xframe.xsddoc.Task + classpathref=maven.plugin.classpath/ + +mkdir dir=${project.reporting.outputDirectory}/xsddoc// + +tstamp + format property=currentYear pattern= / +/tstamp + +echo message=Generate Schema Documentation for Xdoc-2.0/ +xsddoc file=${basedir}/src/main/resources/xdoc-2.0.xsd + out=${project.reporting.outputDirectory}/xsddoc + doctitle=Schema documentation for Xdoc-2.0 + bottom=Copyright #169; ${project.inceptionYear}-${currentYear} ${project.organization.name}. All Rights Reserved. + verbose=false/ + + /tasks +/configuration +goals + goalrun/goal +/goals + /execution +/executions + +dependencies + dependency +groupIdxsddoc/groupId +artifactIdxsddoc/artifactId +version1.0/version + /dependency + dependency +groupIdxalan/groupId +artifactIdxalan/artifactId +version2.7.0/version + /dependency +/dependencies + /plugin + plugin groupIdorg.codehaus.plexus/groupId artifactIdplexus-maven-plugin/artifactId configuration @@ -30,5 +77,4 @@ /plugin /plugins /build - /project
svn commit: r561789 - /maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/
Author: vsiveton Date: Wed Aug 1 05:50:18 2007 New Revision: 561789 URL: http://svn.apache.org/viewvc?view=revrev=561789 Log: o ignored idea files Modified: maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/ (props changed) Propchange: maven/doxia/doxia/branches/doxia-modules/doxia-module-xdoc/DOXIA-123/ -- --- svn:ignore (original) +++ svn:ignore Wed Aug 1 05:50:18 2007 @@ -1,3 +1,6 @@ target .classpath .project +doxia-module-xdoc.iml +doxia-module-xdoc.ipr +doxia-module-xdoc.iws
svn commit: r561795 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
Author: vsiveton Date: Wed Aug 1 06:45:21 2007 New Revision: 561795 URL: http://svn.apache.org/viewvc?view=revrev=561795 Log: o split up the long parseXhtml() method into parts (see r557536) o Clean up Exception handling. Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java?view=diffrev=561795r1=561794r2=561795 == --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java Wed Aug 1 06:45:21 2007 @@ -79,20 +79,19 @@ parseXhtml( parser, sink ); } -catch ( Exception ex ) +catch ( XmlPullParserException ex ) { -throw new ParseException( Error parsing the model., ex ); +throw new ParseException( Error parsing the model!, ex ); } } - /** * @param parser * @param sink * @throws IOException if any * @throws XmlPullParserException if any */ -public void parseXhtml( XmlPullParser parser, Sink sink ) throws XmlPullParserException, IOException +public void parseXhtml( XmlPullParser parser, Sink sink ) throws XmlPullParserException { int eventType = parser.getEventType(); @@ -100,256 +99,294 @@ { if ( eventType == XmlPullParser.START_TAG ) { -if ( parser.getName().equals( Tag.TITLE.toString() ) ) -{ -sink.title(); -} -/* - * The ADDRESS element may be used by authors to supply contact information - * for a model or a major part of a model such as a form. This element - * often appears at the beginning or end of a model. - */ -else if ( parser.getName().equals( Tag.ADDRESS.toString() ) ) -{ -sink.author(); -} -else if ( parser.getName().equals( Tag.BODY.toString() ) ) -{ -sink.body(); -} -else if ( parser.getName().equals( Tag.H1.toString() ) || parser.getName().equals( Tag.H2.toString() ) || -parser.getName().equals( Tag.H3.toString() ) || parser.getName().equals( Tag.H4.toString() ) || -parser.getName().equals( Tag.H5.toString() ) ) -{ -this.closeSubordinatedSections( parser.getName(), sink ); -this.startSection( this.sections.size(), sink ); -this.startSectionTitle( this.sections.size(), sink ); -this.sections.push( parser.getName() ); +handleStartTag( parser, sink ); +} +else if ( eventType == XmlPullParser.END_TAG ) +{ +handleEndTag( parser, sink ); +} +else if ( eventType == XmlPullParser.TEXT ) +{ +handleText( parser, sink ); +} -} -else if ( parser.getName().equals( Tag.P.toString() ) ) -{ -sink.paragraph(); -} -/* - * The PRE element tells visual user agents that the enclosed text is - * preformatted. When handling preformatted text, visual user agents: - * - May leave white space intact. - * - May render text with a fixed-pitch font. - * - May disable automatic word wrap. - * - Must not disable bidirectional processing. - * Non-visual user agents are not required to respect extra white space - * in the content of a PRE element. - */ -else if ( parser.getName().equals( Tag.PRE.toString() ) ) -{ -sink.verbatim( true ); -} -else if ( ( parser.getName().equals( Tag.CODE.toString() ) ) || ( parser.getName().equals( Tag.SAMP.toString() ) ) || -( parser.getName().equals( Tag.TT.toString() ) ) ) -{ -sink.monospaced(); -} -else if ( parser.getName().equals( Tag.UL.toString() ) ) -{ -sink.list(); -} -else if ( parser.getName().equals(
svn commit: r561966 - /maven/doxia/doxia-sitetools/trunk/
Author: dennisl Date: Wed Aug 1 14:41:11 2007 New Revision: 561966 URL: http://svn.apache.org/viewvc?view=revrev=561966 Log: o Ignore IDEA files. Modified: maven/doxia/doxia-sitetools/trunk/ (props changed) Propchange: maven/doxia/doxia-sitetools/trunk/ -- --- svn:ignore (original) +++ svn:ignore Wed Aug 1 14:41:11 2007 @@ -1 +1,4 @@ target +*.iml +*.ipr +*.iws
svn commit: r562010 [2/2] - in /maven/core-integration-testing/trunk: maven-integration-test-archetype/ maven-integration-test-archetype/src/ maven-integration-test-archetype/src/main/ maven-integrati
Propchange: maven/core-integration-testing/trunk/maven-integration-test-archetype/src/main/resources/archetype-resources/src/test/resources/mng--descriptionOfProblem/checkstyle-assembly/target/checkstyle-assembly-1.0.jar -- svn:mime-type = application/octet-stream Added: maven/core-integration-testing/trunk/maven-integration-test-archetype/src/main/resources/archetype-resources/src/test/resources/mng--descriptionOfProblem/checkstyle-assembly/target/classes/rule_set.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/maven-integration-test-archetype/src/main/resources/archetype-resources/src/test/resources/mng--descriptionOfProblem/checkstyle-assembly/target/classes/rule_set.xml?view=autorev=562010 == --- maven/core-integration-testing/trunk/maven-integration-test-archetype/src/main/resources/archetype-resources/src/test/resources/mng--descriptionOfProblem/checkstyle-assembly/target/classes/rule_set.xml (added) +++ maven/core-integration-testing/trunk/maven-integration-test-archetype/src/main/resources/archetype-resources/src/test/resources/mng--descriptionOfProblem/checkstyle-assembly/target/classes/rule_set.xml Wed Aug 1 20:50:20 2007 @@ -0,0 +1,112 @@ +?xml version=1.0? +ruleset name=EPHS Custom ruleset +xmlns=http://pmd.sf.net/ruleset/1.0.0; +xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; +xsi:schemaLocation=http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd; +xsi:noNamespaceSchemaLocation=http://pmd.sf.net/ruleset_xml_schema.xsd; + + description + This ruleset checks EPHS code + /description + + rule ref=rulesets/finalizers.xml/ + + + rule ref=rulesets/controversial.xml/UnnecessaryParentheses/ + + rule ref=rulesets/optimizations.xml/UseArrayListInsteadOfVector/ + rule ref=rulesets/optimizations.xml/SimplifyStartsWith/ + rule ref=rulesets/optimizations.xml/UseArraysAsList/ + rule ref=rulesets/optimizations.xml/AvoidArrayLoops/ + !--rule ref=rulesets/optimizations.xml/UnnecessaryWrapperObjectCreation/ -- + + rule ref=rulesets/j2ee.xml/UseProperClassLoader/ + + + rule ref=rulesets/basic.xml/EmptyCatchBlock/ + rule ref=rulesets/basic.xml/EmptyIfStmt/ + rule ref=rulesets/basic.xml/EmptyWhileStmt/ + rule ref=rulesets/basic.xml/EmptyTryBlock/ + rule ref=rulesets/basic.xml/EmptyFinallyBlock/ + rule ref=rulesets/basic.xml/EmptySwitchStatements/ + rule ref=rulesets/basic.xml/JumbledIncrementer/ + rule ref=rulesets/basic.xml/UnnecessaryConversionTemporary/ + rule ref=rulesets/basic.xml/DoubleCheckedLocking/ + rule ref=rulesets/basic.xml/OverrideBothEqualsAndHashcode/ + rule ref=rulesets/basic.xml/ReturnFromFinallyBlock/ + rule ref=rulesets/basic.xml/EmptySynchronizedBlock/ + rule ref=rulesets/basic.xml/UnnecessaryReturn/ + rule ref=rulesets/basic.xml/UnconditionalIfStatement/ + rule ref=rulesets/basic.xml/EmptyStatementNotInLoop/ + rule ref=rulesets/basic.xml/BooleanInstantiation/ + rule ref=rulesets/basic.xml/CollapsibleIfStatements/ + rule ref=rulesets/basic.xml/ClassCastExceptionWithToArray/ + rule ref=rulesets/basic.xml/UselessOperationOnImmutable/ + !-- rule ref=rulesets/basic.xml/NullPointerException/ -- + rule ref=rulesets/basic.xml/AvoidThreadGroup/ + !-- rule ref=rulesets/basic.xml/BrokenNullCheck/ -- + + rule ref=rulesets/sunsecure.xml/ + rule ref=rulesets/strictexception.xml/ + + rule ref=rulesets/codesize.xml/ExcessiveMethodLength/ + rule ref=rulesets/codesize.xml/ExcessiveParameterList/ + + rule ref=rulesets/design.xml/SimplifyBooleanReturns/ + + + rule ref=rulesets/design.xml/AvoidDeeplyNestedIfStmts/ + rule ref=rulesets/design.xml/ConstructorCallsOverridableMethod/ + rule ref=rulesets/design.xml/CloseResource/ + rule ref=rulesets/design.xml/NonStaticInitializer/ + rule ref=rulesets/design.xml/DefaultLabelNotLastInSwitchStmt/ + rule ref=rulesets/design.xml/NonCaseLabelInSwitchStatement/ + rule ref=rulesets/design.xml/OptimizableToArrayCall/ + rule ref=rulesets/design.xml/BadComparison/ + rule ref=rulesets/design.xml/EqualsNull/ + rule ref=rulesets/design.xml/InstantiationToGetClass/ + rule ref=rulesets/design.xml/IdempotentOperations/ + rule ref=rulesets/design.xml/AssignmentToNonFinalStatic/ + rule ref=rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass/ + rule ref=rulesets/design.xml/MissingBreakInSwitch/ + rule ref=rulesets/design.xml/UseNotifyAllInsteadOfNotify/ + rule ref=rulesets/design.xml/SimplifyConditional/ + rule ref=rulesets/design.xml/CompareObjectsWithEquals/ + rule ref=rulesets/design.xml/UnnecessaryLocalBeforeReturn/ + rule ref=rulesets/design.xml/UnsynchronizedStaticDateFormatter/ + rule ref=rulesets/design.xml/PreserveStackTrace/ + + rule ref=rulesets/strings.xml/StringInstantiation/ + rule ref=rulesets/strings.xml/StringToString/ + rule