From: Kai Moritz <kai@juplo.de> Date: Mon, 4 Sep 2017 15:15:15 +0000 (+0200) Subject: Released version 2.5.0 X-Git-Url: https://juplo.de/gitweb/?a=commitdiff_plain;h=af1db91ecbc6cce43dea9ac2a5e314a0db2396a8;p=facebook-errors Released version 2.5.0 --- diff --git a/pom.xml b/pom.xml index 42f2841..262c9f4 100644 --- a/pom.xml +++ b/pom.xml @@ -13,9 +13,9 @@ <artifactId>facebook-errors</artifactId> <name>Juplo - Facebook-Errors</name> <description>Helper-Classes to handle errors, thrown by the Graph-API from Facebook</description> - <version>2.5-SNAPSHOT</version> + <version>2.5.0</version> <packaging>jar</packaging> - <url>http://www.juplo.de/facebook-errors</url> + <url>http://juplo.de/facebook-errors</url> <prerequisites> @@ -158,8 +158,8 @@ <distributionManagement> <site> - <id>www.juplo.de</id> - <url>scp://juplo.de/var/www/juplo/facebook-errors-${project.version}</url> + <id>juplo.de</id> + <url>scpexe://juplo.de/var/www/juplo.de/facebook-errors-${project.version}</url> </site> <repository> <id>sonatype-nexus-staging</id> @@ -186,6 +186,21 @@ <arguments>-Psonatype-oss-release</arguments> </configuration> </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <version>3.4</version> + <configuration> + <siteDirectory>${project.build.directory}/filtered-site</siteDirectory> + <templateFile>src/site/template.vm</templateFile> + </configuration> + <dependencies> + <dependency><!-- add support for ssh/scp --> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>2.12</version> + </dependency> + </dependencies> + </plugin> </plugins> </pluginManagement> <plugins> @@ -231,6 +246,46 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.7</version><!-- Should be same version as in oss-parent-7 --> + <configuration> + <additionalparam>-Xdoclint:none</additionalparam> + </configuration> + <executions> + <execution> + <id>attach-javadoc</id> + <phase>verify</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.7</version> + <executions> + <execution> + <id>copy-resources</id> + <phase>pre-site</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/filtered-site</outputDirectory> + <resources> + <resource> + <directory>src/site</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> @@ -245,7 +300,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.3</version> + <version>2.7</version><!-- Should be same version as in oss-parent-7 --> + <configuration> + <additionalparam>-Xdoclint:none</additionalparam> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -266,11 +324,11 @@ </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> <version>3.5</version> <configuration> <linkXref>true</linkXref> + <targetJdk>1.6</targetJdk> </configuration> </plugin> </plugins> diff --git a/src/site/site.xml b/src/site/site.xml new file mode 100644 index 0000000..ffbfaf2 --- /dev/null +++ b/src/site/site.xml @@ -0,0 +1,10 @@ +<project> + <googleAnalyticsAccountId>UA-571104-3</googleAnalyticsAccountId> + <body> + <menu> + <item name="Configuration" href="index.html"/> + </menu> + <menu ref="reports"/> + </body> +</project> + diff --git a/src/site/template.vm b/src/site/template.vm new file mode 100644 index 0000000..5f58629 --- /dev/null +++ b/src/site/template.vm @@ -0,0 +1,334 @@ +<!DOCTYPE html> +<!-- Generated by Apache Maven Doxia Site Renderer#if( $doxiaSiteRendererVersion ) $doxiaSiteRendererVersion#end at $dateFormat.format( $currentDate ) --> +## Datenstrukturen für die Navigation (Breadcrumbs und Menü) vorbereiten +#set ( $crumbs = $project.getClass().forName('java.util.LinkedList').newInstance() ) +#set ( $parents = $project.getClass().forName('java.util.LinkedList').newInstance() ) +#set ( $active = 'index.html' ) +#set ( $skiplist = [ 'index.html' ] ) +#macro ( searchBreadcrumbTrail $items ) + #if ( $breadcrumbs ) + ## Der zuerst gefundene Pfad gilt (denn dieser liegt im selbst erzeugten Menü) + #else + #foreach ( $item in $items ) + #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) ) + #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) ) + #if ( $alignedFileName == $currentItemHref ) + ## Sonderfall abfangen :/ + #if ( $alignedFileName == 'index.html' ) + #set ( $breadcrumbs = [] ) + #set ( $path = [ 'index.html' ] ) + #else + #set ( $breadcrumbs = $crumbs.clone() ) + ## Den Titel der Seite korrigieren! + #set ( $title = "$project.name - $item.name" ) + #set ( $shortTitle = $item.name ) + ## Pfad für die Identifizierung sichtbarer Menüeinträge aufbauen + #set ( $path = [ 'index.html' ] ) + #foreach ( $crumb in $crumbs ) + #set ( $currentItemHref = $PathTool.calculateLink( $crumb.href, $relativePath ) ) + #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) ) + #set ( $sinkhole = $path.add( $currentItemHref ) ) + #end + #set ( $sinkhole = $path.add( $alignedFileName ) ) + #end + #else + #if ( !$item.items.empty ) + #set ( $sinkhole = $crumbs.push( $item ) ) + #searchBreadcrumbTrail ( $item.items ) + #set ( $sinkhole = $crumbs.pop() ) + #end + #end + #end + #end +#end +#macro ( buildSkiplist $item ) + #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) ) + #set ( $sinkhole = $skiplist.add( $currentItemHref.replaceAll( '\\', '/' ) ) ) + #foreach ( $item in $item.items ) + #buildSkiplist ( $item ) + #end +#end +#macro ( findActive $item $skip) + #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) ) + #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) ) + #set ( $doskip = false ) + #if ( $skip ) + #foreach ( $toskip in $skiplist ) + #if ( $currentItemHref == $toskip ) + #set ( $doskip = true ) + #end + #end + #end + #if ( !$doskip ) + #if ( $alignedFileName == $currentItemHref ) + #if ( $item.items.size() > 0 ) + #set ( $active = $alignedFileName ) + #else + #set ( $active = $parents.peek() ) + #end + #end + #set ( $sinkhole = $parents.push( $currentItemHref ) ) + #foreach ( $item in $item.items ) + #findActive ( $item $skip ) + #end + #set ( $sinkhole = $parents.pop() ) + #end +#end +#foreach ( $menu in $decoration.body.menus ) + ## Breadcrumb-Pfad suchen + #searchBreadcrumbTrail ( $menu.items ) + ## Bestimmen, welche Pfade in dem selbst definierten Menü liegen + #set ( $sinkhole = $parents.push( 'index.html' ) ) + #if ( !$menu.name ) + #foreach ( $item in $menu.items ) + #buildSkiplist( $item ) + #end + ## Aktives (Unter-)Menü bestimmen (und dabei nichts überspringen) + #foreach ( $item in $menu.items ) + #findActive( $item false) + #end + #else + ## Aktives (Unter-)Menü bestimmen (und dabei Einträge aus dem selbst + ## definierten Menü überspringen) + #foreach ( $item in $menu.items ) + #findActive( $item true) + #end + #end + #set ( $sinkhole = $parents.pop() ) + ## Sonderbehandlung der Einträge im selbst angelegten Menü + ## Das Menü wird daran erkannt, das der Name leer ist! +#end +<!-- Current: $alignedFileName --> +<!-- Active: $active --> +<!-- Path: $path --> +<!-- Skiplist: $skiplist --> +## +#macro ( link $href $name $class ) + #set ( $linkTitle = ' title="' + $name + '"' ) + #if ( $href.toLowerCase().startsWith("http:/") || $href.toLowerCase().startsWith("https:/") || + $href.toLowerCase().startsWith("ftp:/") || $href.toLowerCase().startsWith("mailto:") || + $href.toLowerCase().startsWith("file:/") || ($href.toLowerCase().indexOf("://") != -1) ) + #set ( $linkClass = ' class="external ' + $class + '"' ) + #else + #set ( $linkClass = ' class="' + $class + '"' ) + #end + <a href="$href"$linkClass$linkTitle>$name</a> +#end +## +#macro ( menuItem $item $parent $skip) + #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) ) + #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) ) + #set ( $doskip = false ) + #if ( $skip ) + #foreach ( $toskip in $skiplist ) + #if ( $currentItemHref == $toskip ) + #set ( $doskip = true ) + #end + #end + #end +## + #if ( !$doskip ) + #set ( $onPath = false ) + #set ( $parentActive = false ) + #set ( $off = '' ) + #set ( $sub = '' ) + #set ( $cssClass = 's' ) + #foreach ( $entry in $path ) + #if ( $entry == $currentItemHref ) + #set ( $onPath = true ) + #set ( $cssClass = 's selected' ) + #end + #if ( $entry == $parent && $parent == $active ) + #set ( $parentActive = true ) + #end + #end + #if ( $item.items.size() > 0 ) + #set ( $sub = ' sub' ) + #end + #if ( !$onPath && !$parentActive ) + #set ( $off = ' off' ) + #end + <li class="s$sub$off"> + #if ( $alignedFileName == $currentItemHref ) + <strong class="s">$item.name</strong> + #else + #link( $currentItemHref $item.name $cssClass ) + #end + #if ( $item.items.size() > 0 && ( $currentItemHref == $active || $onPath ) ) + #set ( $newparent = $currentItemHref ) + <ul class="s#if ( $active == $currentItemHref ) active#end"> + #foreach( $item in $item.items ) + #menuItem( $item $newparent $skip ) + #end + </ul> + #end + </li> + #end +#end +## +#macro ( copyright ) + #if ( $project ) + #set ( $currentYear = ${currentDate.year} + 1900 ) +## + #if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) ) + ${project.inceptionYear}-${currentYear} + #else + ${currentYear} + #end + #end +#end +## +<html> + <head> + <title>juplo - $title</title> + <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" /> + <link rel="canonical" href="$project.url/$alignedFileName"/> + <meta name="viewport" content="width=device-width, initial-scale=1" /> + <link rel="stylesheet" type="text/css" href="/css/base.css" /> + <style type="text/css"> + @import '/css/screen.css' screen; + </style> + <script src="/js/prettify.js"></script> + <!--[if lt IE 9]> + <script src="/js/html5shiv.js"></script> + <![endif]--> + <!--[if IE 8]> + <link rel="stylesheet" type="text/css" href="/css/ie8.css" /> + <![endif]--> +#foreach( $author in $authors ) + <meta name="author" content="$author" /> +#end +#if ( $dateCreation ) + <meta name="author" content="$author" /> +#end + #if ( $decoration.body.head ) + #foreach( $item in $decoration.body.head.getChildren() ) + ## Workaround for DOXIA-150 due to a non-desired behaviour in p-u + ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toString() + ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toUnescapedString() + #set ( $documentHeader = '<?xml version="1.0" encoding="UTF-8"?>' ) + #if ( $item.name == "script" ) + $StringUtils.replace( $item.toUnescapedString(), $documentHeader, "" ) + #else + $StringUtils.replace( $item.toString(), $documentHeader, "" ) + #end + #end + #end + $headContent + </head> + <body class="menu" onload="prettyPrint()"> + <div id="page" class="cf"> + <header id="header"> + <h1 id="logo"><a href="/" title="Home" class="l">juplo</a></h1> + <span id="slogan"><strong>Java</strong> bits from nerds for nerds</span> + <hr class="h" /> + </header> + <div id="breadcrumb"> + <strong class="b title">You are here:</strong> + <ol class="b"> + <li class="b"><a class="b" href="/">Home</a></li> + <li class="b"><a class="b" href="/projects.html">Projects</a></li> + #if ( $alignedFileName == 'index.html' ) + <li class="b"><strong class="b">$project.name</strong></li> + #else + <li class="b"><a class="b" href="$relativePath/index.html">$project.name</a></li> + #foreach( $crumb in $breadcrumbs ) + #set ( $currentItemHref = $PathTool.calculateLink( $crumb.href, $relativePath ) ) + #set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) ) + <li class="b">#link( $currentItemHref $crumb.name 'b')</li> + #end + <li class="b"><strong class="b">$shortTitle</strong></li> + #end + </ol> + <a class="hide" href="#navigation">Jump to navigation</a> + <hr class="b" /> + </div> + <main class="content cf"> + <article id="content" class="main"> + <header><h1>$shortTitle</h1></header> + $bodyContent + </article> + <div class="marginal"> + <nav id="nav"> + <hr class="n" /> + <a id="navigation"></a> + <a class="hide" href="#top" title="Show Content">Jump back to the top of the page</a> + <h2 class="nav menu">Section-Menu</h2> + <ul id="menu"> + <li class="m blog"><a href="/blog/" class="m">Blog</a></li> + <li class="m projects"><a href="/projects.html" class="m selected">Projects</a></li> + <li class="m about"><a href="/about.html" class="m">About</a></li> + </ul> + <h2 class="nav submenu"> + <span class="s">Submenu for section</span> + <a class="s selected" href="/projects.html">Projects</a> + </h2> + <ul id="submenu" class="s"> + ## Die vorhandenen Projekte sind hier hartkodiert! + #set ( $projects = { + 'Hibernate Maven Plugin' : '/hibernate-maven-plugin/' + } ) + #foreach( $entry in $projects.entrySet() ) + #if ( $project.name == $entry.key ) + <li class="s sub"> + #if ( $alignedFileName == 'index.html' ) + <strong class="s">$entry.key</strong> + #else + <a class="s selected" href="$relativePath/index.html">$entry.key</a> + #end + <ul class="s#if ( $active == 'index.html' ) active#end"> + ## Die Einträge aller Menüs werden als Einträge eines gemeinsamen + ## Menüs angezeigt + #foreach ( $menu in $decoration.body.menus ) + ## Einträge aus dem selbst definierten Menü in den + ## automatisch erzeuten Menüs überspringen + #if ( $menu.name ) + #foreach ( $item in $menu.items ) + #menuItem ( $item 'index.html' true ) + #end + #else + #foreach ( $item in $menu.items ) + #menuItem ( $item 'index.html' false ) + #end + #end + #end + </ul> + </li> + #else + <li class="s sub off"><a class="s" href="$entry.value">$entry.key</a></li> + #end + #end + </ul> + <hr class="n" /> + </nav> + <aside class="m"> + <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"> + <img class="poweredBy" alt="Built by Maven" src="$relativePath/images/logos/maven-feather.png" /> + </a> + </aside> + </div> + </main> + <footer id="footer"> + <hr class="f" /> + <ul id="footerlinks"> + <li class="f" id="copyright">© <strong>mo</strong> #copyright()</li> + <li class="f"><a class="f" href="/impressum.html">Impressum</a></li> + <li class="f about"><a class="f" href="/about.html">About</a></li> + </ul> + </footer> + </div> + #if( $decoration.googleAnalyticsAccountId && $decoration.googleAnalyticsAccountId != "" ) + <script type="text/javascript"><!--//--><![CDATA[//><!-- + var _gaq = _gaq || []; + _gaq.push(['_setAccount', '$decoration.googleAnalyticsAccountId']); + _gaq.push(['_trackPageview']); + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + //--><!]]> + </script> + #end + </body> +</html> diff --git a/src/site/xhtml/index.xhtml b/src/site/xhtml/index.xhtml new file mode 100644 index 0000000..db32866 --- /dev/null +++ b/src/site/xhtml/index.xhtml @@ -0,0 +1,16 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Facebook Error-Handler</h1> + <h2>A ResponseErrorHandler, that converts error-messages from the Graph-API to a hierarchy of exceptions, that can be cateched easily</h2> + <h2>Releases</h2> + <ul> + <li><a href="http://juplo.de/hibernate-maven-plugin">current version</a></li> + <li>${project.version} (this version)</li> + <li><a href="http://juplo.de/facebook-errors-2.5.0">2.5.0</a></li> + </ul> + </body> +</html> diff --git a/src/site/xhtml/issue-tracking.xhtml b/src/site/xhtml/issue-tracking.xhtml new file mode 100644 index 0000000..f7e6859 --- /dev/null +++ b/src/site/xhtml/issue-tracking.xhtml @@ -0,0 +1,13 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <strong>There is no bug-tracking system set up for this project!</strong> + <p> + Please send your bug-reports, questions or feature-requests directly + to the developer. + </p> + </body> +</html> diff --git a/src/site/xhtml/mail-lists.xhtml b/src/site/xhtml/mail-lists.xhtml new file mode 100644 index 0000000..ff8d7f2 --- /dev/null +++ b/src/site/xhtml/mail-lists.xhtml @@ -0,0 +1,13 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <strong>There are no mailinglists defined for this project!</strong> + <p> + Please send your bug-reports, questions or feature-requests directly + to the developer. + </p> + </body> +</html>