From 6fdb30c86af1fe76eba37c11c4ded8ece5a66a5a Mon Sep 17 00:00:00 2001 From: Bill Burke Date: Tue, 4 Nov 2014 15:53:04 -0500 Subject: [PATCH 1/2] 0.10.2 --- doclets/pom.xml | 2 +- .../doclets/jax/jaxrs/writers/ResourceWriter.java | 4 ++++ pom.xml | 12 ++++++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) mode change 100644 => 100755 doclets/pom.xml mode change 100644 => 100755 doclets/src/main/java/com/lunatech/doclets/jax/jaxrs/writers/ResourceWriter.java mode change 100644 => 100755 pom.xml diff --git a/doclets/pom.xml b/doclets/pom.xml old mode 100644 new mode 100755 index 7e4dbda..ead93bd --- a/doclets/pom.xml +++ b/doclets/pom.xml @@ -5,7 +5,7 @@ com.lunatech.jax-doclets parent - 0.10.2-SNAPSHOT + 0.10.2 doclets diff --git a/doclets/src/main/java/com/lunatech/doclets/jax/jaxrs/writers/ResourceWriter.java b/doclets/src/main/java/com/lunatech/doclets/jax/jaxrs/writers/ResourceWriter.java old mode 100644 new mode 100755 index 9a0b59d..b240828 --- a/doclets/src/main/java/com/lunatech/doclets/jax/jaxrs/writers/ResourceWriter.java +++ b/doclets/src/main/java/com/lunatech/doclets/jax/jaxrs/writers/ResourceWriter.java @@ -142,6 +142,7 @@ private void printSubresources() { for (String subResourceKey : resources.keySet()) { Resource realSubResource = resources.get(subResourceKey); Resource subResource = deepFilter(realSubResource); + if (subResource == null) continue; open("tr"); open("td"); String path = subResource.getPathFrom(resource); @@ -176,6 +177,9 @@ private Resource deepFilter(Resource resource) { return resource; // there cannot be any resource with no method, and no subresources // return the first subresource + if (!resource.getResources().values().iterator().hasNext()) { + return null; + } return deepFilter(resource.getResources().values().iterator().next()); } diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 index 1af9412..51eb343 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.lunatech.jax-doclets parent - 0.10.2-SNAPSHOT + 0.10.2 pom jax-doclets @@ -36,6 +36,14 @@ https://github.com/FroMage/jax-doclets + + + jboss-releases-repository + JBoss Releases Repository + https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/ + + + github https://github.com/FroMage/jax-doclets/issues @@ -110,7 +118,7 @@ doclets - docs + From 6480f4b7e810f3df105797ec4937e75913128638 Mon Sep 17 00:00:00 2001 From: Bill Burke Date: Tue, 4 Nov 2014 16:02:31 -0500 Subject: [PATCH 2/2] sources --- doclets/pom.xml | 38 ++++++++++++++++++++++++++++++++++++++ pom.xml | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/doclets/pom.xml b/doclets/pom.xml index ead93bd..439157a 100755 --- a/doclets/pom.xml +++ b/doclets/pom.xml @@ -280,6 +280,44 @@ + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + true + + true + true + + + ${project.url} + ${java.version} + ${java.vendor} + ${os.name} + ${os.arch} + ${os.version} + ${project.scm.url} + ${project.scm.connection} + ${buildNumber} + ${build.datetime} + JBoss (http://www.jboss.org/) + http://www.jboss.org/ + JBoss by Red Hat, Inc + http://www.jboss.org/ + + + + + + verify + + jar + + + + diff --git a/pom.xml b/pom.xml index 51eb343..390a8fe 100755 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,44 @@ true - + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + true + + true + true + + + ${project.url} + ${java.version} + ${java.vendor} + ${os.name} + ${os.arch} + ${os.version} + ${project.scm.url} + ${project.scm.connection} + ${buildNumber} + ${build.datetime} + JBoss (http://www.jboss.org/) + http://www.jboss.org/ + JBoss by Red Hat, Inc + http://www.jboss.org/ + + + + + + verify + + jar + + + +