You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sk...@apache.org on 2013/06/02 01:55:44 UTC
svn commit: r1488634 - in
/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src:
main/java/org/apache/maven/dist/tools/
main/java/org/apache/maven/dist/tools/checkers/ site/ site/markdown/
Author: skygo
Date: Sat Jun 1 23:55:43 2013
New Revision: 1488634
URL: http://svn.apache.org/r1488634
Log:
add todo in site as markdown file,
move checker to own package, keep each checker simple (controlling version) but may be other check based on dom
Added:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/FluidoHTMLChecker.java (with props)
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLChecker.java (with props)
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLCheckerFactory.java (with props)
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/StylusLeftHTMLChecker.java (with props)
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/StylusRightHTMLChecker.java (with props)
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/todo.md
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/site.xml
Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java?rev=1488634&r1=1488633&r2=1488634&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java Sat Jun 1 23:55:43 2013
@@ -24,10 +24,8 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.List;
-
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.siterenderer.Renderer;
-
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java?rev=1488634&r1=1488633&r2=1488634&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java Sat Jun 1 23:55:43 2013
@@ -39,6 +39,8 @@ import org.apache.maven.artifact.reposit
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.MavenArtifactRepository;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+import org.apache.maven.dist.tools.checkers.HTMLChecker;
+import org.apache.maven.dist.tools.checkers.HTMLCheckerFactory;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
@@ -50,7 +52,6 @@ import org.apache.maven.reporting.MavenR
import org.jsoup.HttpStatusException;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
/**
*
@@ -88,26 +89,6 @@ public class DistCheckSiteMojo extends A
return "Verification of various maven web sites";
}
- interface HTMLChecker
- {
-
- /**
- * name of the checker.
- *
- * @return
- */
- String getName();
-
- /**
- * true if checker find pattern in document
- *
- * @param doc
- * @param version
- * @return
- */
- boolean isOk( Document doc, String version );
- }
-
class DistCheckSiteResult extends AbstractCheckResult
{
@@ -181,7 +162,7 @@ public class DistCheckSiteMojo extends A
}
// keep result
private List<DistCheckSiteResult> results = new LinkedList<>();
- private List<HTMLChecker> checker = new LinkedList<>();
+ private final List<HTMLChecker> checker = HTMLCheckerFactory.getCheckers();
private List<ArtifactRepository> artifactRepositories = new LinkedList<>();
@Override
@@ -208,7 +189,9 @@ public class DistCheckSiteMojo extends A
sink.body();
sink.section1();
- sink.rawText( "Checked sites" );
+ sink.rawText( "Checked sites, also do some basic checking in index.html contents." );
+ sink.rawText( "This is to help maintaining some choerence. How many site are skin fluido, stylus, where they have version (right left)" );
+ sink.rawText( "All sun icons in one column is kind of objective." );
sink.section1_();
sink.table();
sink.tableRow();
@@ -225,7 +208,7 @@ public class DistCheckSiteMojo extends A
sink.rawText( "URL" );
sink.tableHeaderCell_();
sink.tableHeaderCell();
- sink.rawText( "check summary" );
+ sink.rawText( "Contents check summary details on your left ==>" );
sink.tableHeaderCell_();
for ( HTMLChecker c : checker )
{
@@ -375,51 +358,6 @@ public class DistCheckSiteMojo extends A
ArtifactRepository aa = new MavenArtifactRepository( "central", repoBaseUrl, new DefaultRepositoryLayout(), new ArtifactRepositoryPolicy( false, ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS, ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN ), new ArtifactRepositoryPolicy( true, ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS, ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN ) );
artifactRepositories.add( aa );
- //add html checker
- checker.add( new HTMLChecker()
- {
- @Override
- public String getName()
- {
- return "Stylus Skin";
- }
-
- @Override
- public boolean isOk( Document doc, String version )
- {
- Element links = doc.select( "div.xright" ).first();
- if ( links != null )
- {
- return links.text().contains( version );
- }
- else
- {
- return false;
- }
- }
- } );
- checker.add( new HTMLChecker()
- {
- @Override
- public String getName()
- {
- return "Fluido Skin";
- }
-
- @Override
- public boolean isOk( Document doc, String version )
- {
- Element links = doc.select( "li#projectVersion" ).first();
- if ( links != null )
- {
- return links.text().contains( version );
- }
- else
- {
- return false;
- }
- }
- } );
super.execute();
}
}
Added: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/FluidoHTMLChecker.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/FluidoHTMLChecker.java?rev=1488634&view=auto
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/FluidoHTMLChecker.java (added)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/FluidoHTMLChecker.java Sat Jun 1 23:55:43 2013
@@ -0,0 +1,47 @@
+package org.apache.maven.dist.tools.checkers;
+
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+
+/*
+ * 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.
+ */
+
+public class FluidoHTMLChecker implements HTMLChecker
+{
+
+ @Override
+ public String getName()
+ {
+ return "Is version present in Fluido Skin";
+ }
+
+ @Override
+ public boolean isOk( Document doc, String version )
+ {
+ Element links = doc.select( "li#projectVersion" ).first();
+ if ( links != null )
+ {
+ return links.text().contains( version );
+ }
+ else
+ {
+ return false;
+ }
+ }
+}
Propchange: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/FluidoHTMLChecker.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLChecker.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLChecker.java?rev=1488634&view=auto
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLChecker.java (added)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLChecker.java Sat Jun 1 23:55:43 2013
@@ -0,0 +1,46 @@
+package org.apache.maven.dist.tools.checkers;
+
+/*
+ * 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.
+ */
+
+import org.jsoup.nodes.Document;
+
+/**
+ *
+ * @author skygo
+ */
+public interface HTMLChecker {
+
+ /**
+ * name of the checker.
+ *
+ * @return
+ */
+ String getName();
+
+ /**
+ * true if checker find pattern in document
+ *
+ * @param doc
+ * @param version
+ * @return
+ */
+ boolean isOk( Document doc, String version );
+
+}
Propchange: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLChecker.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLCheckerFactory.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLCheckerFactory.java?rev=1488634&view=auto
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLCheckerFactory.java (added)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLCheckerFactory.java Sat Jun 1 23:55:43 2013
@@ -0,0 +1,45 @@
+package org.apache.maven.dist.tools.checkers;
+
+/*
+ * 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.
+ */
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ *
+ * @author skygo
+ */
+public final class HTMLCheckerFactory
+{
+
+ private HTMLCheckerFactory()
+ {
+ }
+
+ public static List<HTMLChecker> getCheckers()
+ {
+ List<HTMLChecker> tmp = new LinkedList<>();
+ tmp.add( new FluidoHTMLChecker() );
+ tmp.add( new StylusRightHTMLChecker() );
+ tmp.add( new StylusLeftHTMLChecker() );
+ return tmp;
+ }
+
+}
Propchange: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/HTMLCheckerFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/StylusLeftHTMLChecker.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/StylusLeftHTMLChecker.java?rev=1488634&view=auto
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/StylusLeftHTMLChecker.java (added)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/StylusLeftHTMLChecker.java Sat Jun 1 23:55:43 2013
@@ -0,0 +1,47 @@
+package org.apache.maven.dist.tools.checkers;
+
+/*
+ * 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.
+ */
+
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+
+public class StylusLeftHTMLChecker implements HTMLChecker
+{
+
+ @Override
+ public String getName()
+ {
+ return "Is version present in Stylus Skin (on left side)";
+ }
+
+ @Override
+ public boolean isOk( Document doc, String version )
+ {
+ Element links = doc.select( "div.xleft" ).first();
+ if ( links != null )
+ {
+ return links.text().contains( version );
+ }
+ else
+ {
+ return false;
+ }
+ }
+}
Propchange: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/StylusLeftHTMLChecker.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/StylusRightHTMLChecker.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/StylusRightHTMLChecker.java?rev=1488634&view=auto
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/StylusRightHTMLChecker.java (added)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/StylusRightHTMLChecker.java Sat Jun 1 23:55:43 2013
@@ -0,0 +1,47 @@
+package org.apache.maven.dist.tools.checkers;
+
+/*
+ * 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.
+ */
+
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+
+public class StylusRightHTMLChecker implements HTMLChecker
+{
+
+ @Override
+ public String getName()
+ {
+ return "Is version present in Stylus Skin (on right side)";
+ }
+
+ @Override
+ public boolean isOk( Document doc, String version )
+ {
+ Element links = doc.select( "div.xright" ).first();
+ if ( links != null )
+ {
+ return links.text().contains( version );
+ }
+ else
+ {
+ return false;
+ }
+ }
+}
Propchange: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/checkers/StylusRightHTMLChecker.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/todo.md
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/todo.md?rev=1488634&view=auto
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/todo.md (added)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/markdown/todo.md Sat Jun 1 23:55:43 2013
@@ -0,0 +1,6 @@
+Todo
+====
+
+* Shell command for cleaning messy artifacts
+* check older artifact in dist
+
Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/site.xml?rev=1488634&r1=1488633&r2=1488634&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/site.xml (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/site/site.xml Sat Jun 1 23:55:43 2013
@@ -5,6 +5,10 @@
<version>1.3.0</version>
</skin>
<body>
+
<menu ref="reports"/>
+ <menu name="for dev">
+ <item name="TODO" href="todo.html" />
+ </menu>
</body>
</project>
\ No newline at end of file