Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed bugs, did a release #65

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fixed bugs, did a release #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fdb30c
0.10.2
patriot1burke Nov 4, 2014
6480f4b
sources
patriot1burke Nov 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 39 additions & 1 deletion doclets/pom.xml
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>parent</artifactId>
<version>0.10.2-SNAPSHOT</version>
<version>0.10.2</version>
</parent>

<artifactId>doclets</artifactId>
Expand Down Expand Up @@ -280,6 +280,44 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<configuration>
<archive>
<index>true</index>
<manifest>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Implementation-URL>${project.url}</Implementation-URL>
<Java-Version>${java.version}</Java-Version>
<Java-Vendor>${java.vendor}</Java-Vendor>
<Os-Name>${os.name}</Os-Name>
<Os-Arch>${os.arch}</Os-Arch>
<Os-Version>${os.version}</Os-Version>
<Scm-Url>${project.scm.url}</Scm-Url>
<Scm-Connection>${project.scm.connection}</Scm-Connection>
<Scm-Revision>${buildNumber}</Scm-Revision>
<Build-Timestamp>${build.datetime}</Build-Timestamp>
<Specification-Vendor>JBoss (http://www.jboss.org/)</Specification-Vendor>
<Implementation-URL>http://www.jboss.org/</Implementation-URL>
<Implementation-Vendor>JBoss by Red Hat, Inc</Implementation-Vendor>
<Implementation-Vendor-Id>http://www.jboss.org/</Implementation-Vendor-Id>
</manifestEntries>
</archive>
</configuration>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
4 changes: 4 additions & 0 deletions doclets/src/main/java/com/lunatech/doclets/jax/jaxrs/writers/ResourceWriter.java
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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());
}

Expand Down
51 changes: 48 additions & 3 deletions pom.xml
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>parent</artifactId>
<version>0.10.2-SNAPSHOT</version>
<version>0.10.2</version>
<packaging>pom</packaging>

<name>jax-doclets</name>
Expand All @@ -36,6 +36,14 @@
<url>https://github.com/FroMage/jax-doclets</url>
</scm>

<distributionManagement>
<repository>
<id>jboss-releases-repository</id>
<name>JBoss Releases Repository</name>
<url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<issueManagement>
<system>github</system>
<url>https://github.com/FroMage/jax-doclets/issues</url>
Expand Down Expand Up @@ -110,7 +118,7 @@

<modules>
<module>doclets</module>
<module>docs</module>
<!-- <module>docs</module> -->
</modules>

<build>
Expand All @@ -132,7 +140,44 @@
<createChecksum>true</createChecksum>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<configuration>
<archive>
<index>true</index>
<manifest>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Implementation-URL>${project.url}</Implementation-URL>
<Java-Version>${java.version}</Java-Version>
<Java-Vendor>${java.vendor}</Java-Vendor>
<Os-Name>${os.name}</Os-Name>
<Os-Arch>${os.arch}</Os-Arch>
<Os-Version>${os.version}</Os-Version>
<Scm-Url>${project.scm.url}</Scm-Url>
<Scm-Connection>${project.scm.connection}</Scm-Connection>
<Scm-Revision>${buildNumber}</Scm-Revision>
<Build-Timestamp>${build.datetime}</Build-Timestamp>
<Specification-Vendor>JBoss (http://www.jboss.org/)</Specification-Vendor>
<Implementation-URL>http://www.jboss.org/</Implementation-URL>
<Implementation-Vendor>JBoss by Red Hat, Inc</Implementation-Vendor>
<Implementation-Vendor-Id>http://www.jboss.org/</Implementation-Vendor-Id>
</manifestEntries>
</archive>
</configuration>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>

Expand Down