Permalink
Browse files

Merge pull request #181 from patriot1burke/master

docbook
  • Loading branch information...
2 parents 410ec0d + 6dfa3f7 commit d64a6f47e34f4b8ce8917f3e4c86e17aae3d414a @patriot1burke patriot1burke committed Oct 3, 2012
Showing with 1,546 additions and 2,406 deletions.
  1. +119 −138 jaxrs/docbook/pom.xml
  2. 0 jaxrs/docbook/reference/en/{ → en-US}/master.xml
  3. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/AJAX_Client.xml
  4. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Async_job_service.xml
  5. +69 −71 jaxrs/docbook/reference/en/{ → en-US}/modules/Asynchronous_HTTP.xml
  6. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Atom.xml
  7. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Authentication.xml
  8. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Books.xml
  9. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/CDI.xml
  10. +165 −185 jaxrs/docbook/reference/en/{ → en-US}/modules/Cache_NoCache_CacheControl.xml
  11. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Configuring_Individual_JAX-RS_Resource_Beans.xml
  12. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Content_Marshalling_Providers.xml
  13. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/ExceptionMappers.xml
  14. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Guice.xml
  15. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Installation_Configuration.xml
  16. +124 −0 jaxrs/docbook/reference/en/en-US/modules/Interceptors.xml
  17. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/JAX-RS_Content_Negotiation.xml
  18. +73 −73 jaxrs/docbook/reference/en/{ → en-US}/modules/JAX-RS_Resource_Locators_and_Sub_Resources.xml
  19. +28 −28 jaxrs/docbook/reference/en/{ → en-US}/modules/JBoss.xml
  20. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Jaxb.xml
  21. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Json.xml
  22. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/License.xml
  23. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Links.xml
  24. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Maven_and_RESTEasy.xml
  25. +232 −231 jaxrs/docbook/reference/en/{ → en-US}/modules/Migration_from_older_versions.xml
  26. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Multipart.xml
  27. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Overview.xml
  28. +367 −0 jaxrs/docbook/reference/en/en-US/modules/RESTEasy_Client_Framework.xml
  29. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/RESTEasy_EJB_Integration.xml
  30. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/RESTEasy_Embedded_Container.xml
  31. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/RESTEasy_Server-side_Mock_Framework.xml
  32. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/RESTEasy_Spring_Integration.xml
  33. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Responses_using_javax.ws.rs.core.Response.xml
  34. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Seam.xml
  35. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Securing_JAX-RS_and_RESTeasy.xml
  36. +10 −0 jaxrs/docbook/reference/en/en-US/modules/StringConverter.xml
  37. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Using_Path.xml
  38. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Validation.xml
  39. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/Yaml.xml
  40. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/_Context.xml
  41. +11 −11 jaxrs/docbook/reference/en/{ → en-US}/modules/_CookieParam.xml
  42. +3 −3 jaxrs/docbook/reference/en/{ → en-US}/modules/_DefaultValue.xml
  43. +30 −30 jaxrs/docbook/reference/en/{ → en-US}/modules/_Encoded_and_encoding.xml
  44. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/_Form.xml
  45. +25 −25 jaxrs/docbook/reference/en/{ → en-US}/modules/_FormParam.xml
  46. +10 −10 jaxrs/docbook/reference/en/{ → en-US}/modules/_HeaderParam.xml
  47. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/_MatrixParam.xml
  48. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/_PathParam.xml
  49. +8 −8 jaxrs/docbook/reference/en/{ → en-US}/modules/_QueryParam.xml
  50. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/gzip.xml
  51. 0 jaxrs/docbook/reference/en/{ → en-US}/modules/signature.xml
  52. +252 −235 jaxrs/docbook/reference/en/{ → en-US}/modules/smime.xml
  53. +0 −366 jaxrs/docbook/reference/en/modules/Interceptors.xml
  54. +0 −761 jaxrs/docbook/reference/en/modules/RESTEasy_Client_Framework.xml
  55. +0 −214 jaxrs/docbook/reference/en/modules/StringConverter.xml
  56. +1 −1 jaxrs/resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/ResteasyClient.java
  57. +4 −4 .../src/main/java/org/jboss/resteasy/client/jaxrs/{internal → }/engines/ApacheHttpClient4Engine.java
  58. +2 −2 jaxrs/security/skeleton-key-idm/example/skeleton-key-server/src/main/webapp/WEB-INF/web.xml
  59. +1 −1 ...eleton-key-as7/src/main/java/org/jboss/resteasy/skeleton/key/as7/SkeletonKeyStoneLoginModule.java
  60. +11 −8 ...keleton-key-core/src/main/java/org/jboss/resteasy/skeleton/key/server/SkeletonKeyApplication.java
  61. +1 −1 ...y-idm/skeleton-key-core/src/test/java/org/jboss/resteasy/test/skeleton/key/UsersResourceTest.java
View
@@ -1,138 +1,119 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-reference-guide-${translation}</artifactId>
- <version>3.0-alpha-1-SNAPSHOT</version>
- <packaging>jdocbook</packaging>
- <name>RESTEasy Reference Guide (${translation})</name>
- <description/>
- <repositories>
- <repository>
- <id>jboss</id>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- <!--
- <repository>
- <id>repo1.maven.org</id>
- <url>http://repo1.maven.org/maven2</url>
- </repository> -->
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>jboss</id>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </pluginRepository>
- <!--
- <pluginRepository>
- <id>maven2-repository.dev.java.net</id>
- <url>http://download.java.net/maven/2</url>
- </pluginRepository>
- <pluginRepository>
- <id>plugin repo1.maven.org</id>
- <url>http://repo1.maven.org/maven2</url>
- </pluginRepository>
- <pluginRepository>
- <id>maven-repository.dev.java.net</id>
- <name>Java.net Maven 1 Repository (legacy)</name>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </pluginRepository>
- -->
- </pluginRepositories>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.1.2</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.0.0</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
- <configuration>
- <!--minmemory>1024m</minmemory>
- <maxmemory>1024m</maxmemory -->
- <sourceDocumentName>master.xml</sourceDocumentName>
- <sourceDirectory>reference/en</sourceDirectory>
- <imageResource>
- <directory>reference/en</directory>
- <includes>
- <include>images/*</include>
- </includes>
- </imageResource>
- <!-- <cssResource>
- <directory>src/main/css</directory>
- </cssResource> -->
- <!--put back css -->
-
- <formats>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
-
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>RESTEasy_Reference_Guide.pdf</finalName>
- <profilingTypeName>two_pass</profilingTypeName>
- </format>
-
-
- <!--<format>
- <formatName>eclipse</formatName>
- <stylesheetResource>classpath:/xslt/main-eclipse.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>-->
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
- <!-- could also locate the docbook dependency and inspect its version... -->
- <!--docbookVersion>1.72.0</docbookVersion -->
- <docbookVersion>1.72.0</docbookVersion>
- <transformerParameters>
- <property>
- <name>javax.xml.parsers.DocumentBuilderFactory</name>
- <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
- </property>
- <property>
- <name>javax.xml.parsers.SAXParserFactory</name>
- <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
- </property>
- <!--<javax.xml.parsers.DocumentBuilderFactory>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</javax.xml.parsers.DocumentBuilderFactory>
- <javax.xml.parsers.SAXParserFactory>org.apache.xerces.jaxp.SAXParserFactoryImpl</javax.xml.parsers.SAXParserFactory>
- <javax.xml.validation.SchemaFactory:http\://www.w3.org/2001/XMLSchema>org.apache.xerces.jaxp.validation.XMLSchemaFactory</javax.xml.validation.SchemaFactory:http\://www.w3.org/2001/XMLSchema>-->
- </transformerParameters>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <translation>en-US</translation>
- </properties>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-reference-guide-${translation}</artifactId>
+ <version>3.0-alpha-1-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+ <name>RESTEasy Reference Guide (${translation})</name>
+ <description/>
+ <repositories>
+ <repository>
+ <id>jboss</id>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </repository>
+ <!--
+ <repository>
+ <id>repo1.maven.org</id>
+ <url>http://repo1.maven.org/maven2</url>
+ </repository> -->
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss</id>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ </pluginRepository>
+ <!--
+ <pluginRepository>
+ <id>maven2-repository.dev.java.net</id>
+ <url>http://download.java.net/maven/2</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>plugin repo1.maven.org</id>
+ <url>http://repo1.maven.org/maven2</url>
+ </pluginRepository>
+ -->
+ </pluginRepositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.3.8</version>
+ <extensions>true</extensions>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.pressgang</groupId>
+ <artifactId>pressgang-xslt-ns</artifactId>
+ <version>2.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.pressgang</groupId>
+ <artifactId>pressgang-jdocbook-style</artifactId>
+ <type>jdocbook-style</type>
+ <version>2.0.2</version>
+ </dependency>
+ </dependencies>
+
+ <configuration>
+ <sourceDocumentName>master.xml</sourceDocumentName>
+ <masterTranslation>en-US</masterTranslation>
+ <sourceDirectory>reference/en</sourceDirectory>
+ <imageResource>
+ <directory>reference/en</directory>
+ <includes>
+ <include>images/*</include>
+ </includes>
+ </imageResource>
+ <formats>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ <!-- <profilingTypeName>two_pass</profilingTypeName> -->
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ <!-- <profilingTypeName>two_pass</profilingTypeName> -->
+ </format>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${project.artifactId}.pdf</finalName>
+ </format>
+ <!--<format>-->
+ <!--<formatName>eclipse</formatName>-->
+ <!--<stylesheetResource>classpath:/xslt/org/jboss/eclipse.xsl</stylesheetResource>-->
+ <!--<finalName>${project.artifactId}.html</finalName>-->
+ <!--</format>-->
+ </formats>
+ <injections>
+ <injection>
+ <name>project.version</name>
+ <value>${project.version}</value>
+ </injection>
+ </injections>
+ <options>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <xincludeSupported>true</xincludeSupported>
+ <useRelativeImageUris>true</useRelativeImageUris>
+ <!-- TODO Probably obsolete after the upgrade to maven-jdocbook-plugin 2.3.0 -->
+ <docbookVersion>1.72.0</docbookVersion>
+ <!-- <localeSeparator>-</localeSeparator> -->
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <translation>en-US</translation>
+ </properties>
+</project>
Oops, something went wrong.

0 comments on commit d64a6f4

Please sign in to comment.