JBoss Tools SVN: r30511 - in trunk/module_template/docs/reference: en-US and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-04-12 00:33:12 -0400 (Tue, 12 Apr 2011)
New Revision: 30511
Modified:
trunk/module_template/docs/reference/README
trunk/module_template/docs/reference/en-US/latest_developments.xml
trunk/module_template/docs/reference/en-US/reference.xml
Log:
updated with new info in readme and new code in xml files
Modified: trunk/module_template/docs/reference/README
===================================================================
--- trunk/module_template/docs/reference/README 2011-04-12 04:31:27 UTC (rev 30510)
+++ trunk/module_template/docs/reference/README 2011-04-12 04:33:12 UTC (rev 30511)
@@ -1,21 +1,46 @@
Template for reference guide.
-How to build everything:
- mvn install
+MAVEN:
-Just build just html-single:
- mvn -Phtml-single install
+ How to build everything:
+ mvn install or mvn compile
- Other profiles: pdf, html, eclipse
+ Just build html-single:
+ mvn -Phtml-single install
- Look for other <profile>'s in parent pom.
-
+ All profiles available: html-single, html, pdf, eclipse
+
+ Look for other <profile>'s in parent pom.
+
+PUBLICAN:
+
+ How to build everything:
+ publican build --formats=html-single,eclipse,html,pdf --langs=en-US
+
+ Just build html-single:
+ publican build --formats=html-single --langs=en-US
+
+ All profiles available: html-single, html, pdf, eclipse
+
+
+
Guidelines:
use lowercase names for filenames to avoid casing issues
on various OS's and to make it easier to search for names/content.
+ EXCEPTIONS:
+ Book_Info.xml
+ Name_of_book.xml
+ Name_of_book.ent
+ The above files must be mixed case for compatability with Publican
- Comment out chapters/sections that is not correct/actively maintained.
+ Comment out chapters/sections that are not correct/actively maintained.
+ Code in template is there as a guide of which tags are to be used.
+ Before committing a revision or new content in a book, ensure it
+ is buildable in both Maven and Publican - if you can
+ (Publican currently available for Linux and Windows
+ - talk with irooskov(a)redhat.com if you can assist with testing on Mac).
+
Known issues:
- Translation dependds on ${docname} and other variables
- in artifactid but that is not really supported/recommended by Maven
\ No newline at end of file
+ Translation depends on ${docname} and other variables
+ in artifactid but that is not really supported/recommended by Maven
Modified: trunk/module_template/docs/reference/en-US/latest_developments.xml
===================================================================
--- trunk/module_template/docs/reference/en-US/latest_developments.xml 2011-04-12 04:31:27 UTC (rev 30510)
+++ trunk/module_template/docs/reference/en-US/latest_developments.xml 2011-04-12 04:33:12 UTC (rev 30511)
@@ -1,5 +1,7 @@
<?xml version='1.0' encoding='utf-8' ?>
+ <!-- This chapter only relates to the enterprise version (JBoss Developer Studio), as the community (JBoss Tools) already has their 'What's New' webpage for this information -->
+
<chapter id="chap-Template-Latest_developments">
<title>Latest developments</title>
<para>
Modified: trunk/module_template/docs/reference/en-US/reference.xml
===================================================================
--- trunk/module_template/docs/reference/en-US/reference.xml 2011-04-12 04:31:27 UTC (rev 30510)
+++ trunk/module_template/docs/reference/en-US/reference.xml 2011-04-12 04:33:12 UTC (rev 30511)
@@ -3,7 +3,7 @@
<chapter id="chap-template-reference">
<title>Reference</title>
<para>
- This section should detail the actual screen and interface that a user interacts with. For instance, if a user is attempting to create a project through a wizard, then each of the screen should be available here, documenting what each section of the screen means. In this way, a user may not be wishing to undertake a perdefined task as mentioned in the task section, but still need assistance with what should go in certain fields and such.
+ This section should detail the actual screen and interface that a user interacts with. For instance, if a user is attempting to create a project through a wizard, then each of the screens should be available here, documenting what each section of the screen means. In this way, a user may not be wishing to undertake a pre-defined task as mentioned in the task section, but still need assistance with what should go in certain fields and such.
</para>
<section id="sect-template-reference-wizards">
<title>Wizards</title>
@@ -15,6 +15,23 @@
<para>
Placeholder text
</para>
+ <!-- ensure that all images are PNG format, with an image size of 96 pixels -->
+ <figure>
+ <title>Title of the screenshot</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/reference/wizard_one/wizard_screenshot_one.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>Alternate text for the visually impared</phrase>
+ </textobject>
+ <caption>
+ <para>
+ Caption referring to the wizard screenshot - if necessary
+ </para>
+ </caption>
+ </mediaobject>
+ </figure>
</section>
<section id="sect-template-reference-wizards-wizard_two">
<title>Wizard two</title>
13 years, 7 months
JBoss Tools SVN: r30510 - trunk/build/aggregate/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-04-12 00:31:27 -0400 (Tue, 12 Apr 2011)
New Revision: 30510
Modified:
trunk/build/aggregate/site/build.xml
Log:
better support for upstream git builds - don't fail if can't find SVN rev
Modified: trunk/build/aggregate/site/build.xml
===================================================================
--- trunk/build/aggregate/site/build.xml 2011-04-12 04:29:19 UTC (rev 30509)
+++ trunk/build/aggregate/site/build.xml 2011-04-12 04:31:27 UTC (rev 30510)
@@ -488,42 +488,50 @@
</if>
<!-- TXT way: load into .SVN_REVISION -->
- <propertycopy from="${prefix}.revision.module" property="temprm.all" override="true" />
- <propertycopy from="${prefix}.revision.revision" property="temprr.all" override="true" />
- <var name="i" value="0" />
- <for list="${temprm.all}" delimiter=", " param="module">
- <sequential>
- <math result="i" operand1="1" operation="+" operand2="${i}" datatype="int" />
- <var name="j" value="0" />
- <for list="${temprr.all}" delimiter=", " param="revision">
+ <if>
+ <and>
+ <isset property="${prefix}.revision.module" />
+ <isset property="${prefix}.revision.revision" />
+ </and>
+ <then>
+ <propertycopy from="${prefix}.revision.module" property="temprm.all" override="true" />
+ <propertycopy from="${prefix}.revision.revision" property="temprr.all" override="true" />
+ <var name="i" value="0" />
+ <for list="${temprm.all}" delimiter=", " param="module">
<sequential>
- <math result="j" operand1="1" operation="+" operand2="${j}" datatype="int" />
- <if>
- <equals arg1="${i}" arg2="${j}" />
- <then>
- <var name="temprr" value="@{revision}" />
+ <math result="i" operand1="1" operation="+" operand2="${i}" datatype="int" />
+ <var name="j" value="0" />
+ <for list="${temprr.all}" delimiter=", " param="revision">
+ <sequential>
+ <math result="j" operand1="1" operation="+" operand2="${j}" datatype="int" />
<if>
- <isset property="${prefix}.SVN_REVISION" />
+ <equals arg1="${i}" arg2="${j}" />
<then>
- <propertycopy from="${prefix}.SVN_REVISION" property="temp.all" override="true" />
- <var name="${prefix}.SVN_REVISION" value="${temp.all},@{module}@${temprr}" />
- <var name="temp.all" unset="true" />
+ <var name="temprr" value="@{revision}" />
+ <if>
+ <isset property="${prefix}.SVN_REVISION" />
+ <then>
+ <propertycopy from="${prefix}.SVN_REVISION" property="temp.all" override="true" />
+ <var name="${prefix}.SVN_REVISION" value="${temp.all},@{module}@${temprr}" />
+ <var name="temp.all" unset="true" />
+ </then>
+ <else>
+ <var name="${prefix}.SVN_REVISION" value="@{module}@${temprr}" />
+ </else>
+ </if>
+ <var name="temprr" unset="true" />
</then>
- <else>
- <var name="${prefix}.SVN_REVISION" value="@{module}@${temprr}" />
- </else>
</if>
- <var name="temprr" unset="true" />
- </then>
- </if>
+ </sequential>
+ </for>
+ <var name="j" unset="true" />
</sequential>
</for>
- <var name="j" unset="true" />
- </sequential>
- </for>
- <var name="i" unset="true" />
- <var name="temprm.all" unset="true" />
- <var name="temprr.all" unset="true" />
+ <var name="i" unset="true" />
+ <var name="temprm.all" unset="true" />
+ <var name="temprr.all" unset="true" />
+ </then>
+ </if>
</then>
<elseif>
<available file="${svnrevTXT}" type="file" />
13 years, 7 months
JBoss Tools SVN: r30509 - branches/jbosstools-3.2.x/build/aggregate/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-04-12 00:29:19 -0400 (Tue, 12 Apr 2011)
New Revision: 30509
Modified:
branches/jbosstools-3.2.x/build/aggregate/site/aggregateSite.jbosstools.properties
Log:
http://download.jboss.org/jbosstools/updates/helios/ now contains all the other sites mirrored so no need to all the other URLs
Modified: branches/jbosstools-3.2.x/build/aggregate/site/aggregateSite.jbosstools.properties
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/site/aggregateSite.jbosstools.properties 2011-04-12 04:27:47 UTC (rev 30508)
+++ branches/jbosstools-3.2.x/build/aggregate/site/aggregateSite.jbosstools.properties 2011-04-12 04:29:19 UTC (rev 30509)
@@ -4,15 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/helios/,\
-http://download.eclipse.org/eclipse/updates/3.6/,\
-http://download.eclipse.org//birt/update-site/2.6/,\
-http://download.eclipse.org/tptp/updates/galileo/,\
-http://m2eclipse.sonatype.org/sites/m2e/,\
-http://m2eclipse.sonatype.org/sites/m2e-extras/,\
-http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/updateSite/,\
-http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2,\
-http://dl.google.com/eclipse/plugin/3.6/,\
-http://subclipse.tigris.org/update_1.6.x/,\
-http://download.eclipse.org/technology/subversive/0.7/update-site/,\
-http://community.polarion.com/projects/subversive/download/eclipse/2.0/update-site/
+associate.sites=http://download.jboss.org/jbosstools/updates/helios/
\ No newline at end of file
13 years, 7 months
JBoss Tools SVN: r30508 - branches/jbosstools-3.2.x/build/aggregate/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-04-12 00:27:47 -0400 (Tue, 12 Apr 2011)
New Revision: 30508
Modified:
branches/jbosstools-3.2.x/build/aggregate/site/build.xml
Log:
better support for upstream git builds - don't fail if can't find SVN rev
Modified: branches/jbosstools-3.2.x/build/aggregate/site/build.xml
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/site/build.xml 2011-04-12 01:53:40 UTC (rev 30507)
+++ branches/jbosstools-3.2.x/build/aggregate/site/build.xml 2011-04-12 04:27:47 UTC (rev 30508)
@@ -488,42 +488,50 @@
</if>
<!-- TXT way: load into .SVN_REVISION -->
- <propertycopy from="${prefix}.revision.module" property="temprm.all" override="true" />
- <propertycopy from="${prefix}.revision.revision" property="temprr.all" override="true" />
- <var name="i" value="0" />
- <for list="${temprm.all}" delimiter=", " param="module">
- <sequential>
- <math result="i" operand1="1" operation="+" operand2="${i}" datatype="int" />
- <var name="j" value="0" />
- <for list="${temprr.all}" delimiter=", " param="revision">
+ <if>
+ <and>
+ <isset property="${prefix}.revision.module" />
+ <isset property="${prefix}.revision.revision" />
+ </and>
+ <then>
+ <propertycopy from="${prefix}.revision.module" property="temprm.all" override="true" />
+ <propertycopy from="${prefix}.revision.revision" property="temprr.all" override="true" />
+ <var name="i" value="0" />
+ <for list="${temprm.all}" delimiter=", " param="module">
<sequential>
- <math result="j" operand1="1" operation="+" operand2="${j}" datatype="int" />
- <if>
- <equals arg1="${i}" arg2="${j}" />
- <then>
- <var name="temprr" value="@{revision}" />
+ <math result="i" operand1="1" operation="+" operand2="${i}" datatype="int" />
+ <var name="j" value="0" />
+ <for list="${temprr.all}" delimiter=", " param="revision">
+ <sequential>
+ <math result="j" operand1="1" operation="+" operand2="${j}" datatype="int" />
<if>
- <isset property="${prefix}.SVN_REVISION" />
+ <equals arg1="${i}" arg2="${j}" />
<then>
- <propertycopy from="${prefix}.SVN_REVISION" property="temp.all" override="true" />
- <var name="${prefix}.SVN_REVISION" value="${temp.all},@{module}@${temprr}" />
- <var name="temp.all" unset="true" />
+ <var name="temprr" value="@{revision}" />
+ <if>
+ <isset property="${prefix}.SVN_REVISION" />
+ <then>
+ <propertycopy from="${prefix}.SVN_REVISION" property="temp.all" override="true" />
+ <var name="${prefix}.SVN_REVISION" value="${temp.all},@{module}@${temprr}" />
+ <var name="temp.all" unset="true" />
+ </then>
+ <else>
+ <var name="${prefix}.SVN_REVISION" value="@{module}@${temprr}" />
+ </else>
+ </if>
+ <var name="temprr" unset="true" />
</then>
- <else>
- <var name="${prefix}.SVN_REVISION" value="@{module}@${temprr}" />
- </else>
</if>
- <var name="temprr" unset="true" />
- </then>
- </if>
+ </sequential>
+ </for>
+ <var name="j" unset="true" />
</sequential>
</for>
- <var name="j" unset="true" />
- </sequential>
- </for>
- <var name="i" unset="true" />
- <var name="temprm.all" unset="true" />
- <var name="temprr.all" unset="true" />
+ <var name="i" unset="true" />
+ <var name="temprm.all" unset="true" />
+ <var name="temprr.all" unset="true" />
+ </then>
+ </if>
</then>
<elseif>
<available file="${svnrevTXT}" type="file" />
13 years, 7 months
JBoss Tools SVN: r30507 - trunk/module_template/docs/reference/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-04-11 21:53:40 -0400 (Mon, 11 Apr 2011)
New Revision: 30507
Added:
trunk/module_template/docs/reference/en-US/latest_developments.xml
Log:
adding in latest developments file ONLY for enterprise, not community
Added: trunk/module_template/docs/reference/en-US/latest_developments.xml
===================================================================
--- trunk/module_template/docs/reference/en-US/latest_developments.xml (rev 0)
+++ trunk/module_template/docs/reference/en-US/latest_developments.xml 2011-04-12 01:53:40 UTC (rev 30507)
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='utf-8' ?>
+
+<chapter id="chap-Template-Latest_developments">
+ <title>Latest developments</title>
+ <para>
+ The following are new features added to the Tool in release x.x.
+ </para>
+ <table frame='all'><title>New features</title>
+ <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+ <colspec colname='c1'/>
+ <colspec colname='c2'/>
+ <colspec colname='c3'/>
+ <thead>
+ <row>
+ <entry>Feature name</entry>
+ <entry>Description</entry>
+ <entry>Further information</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>Name of the feature</entry>
+ <entry>Describe new feature, why it's been created</entry>
+ <entry>Link to task section for new feature and concept section (if it is also a new concept)</entry>
+ </row>
+ </tbody>
+ </tgroup>
+
+ </table>
+</chapter>
+
13 years, 7 months
JBoss Tools SVN: r30506 - in trunk/module_template/docs/reference: en-US and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-04-11 21:51:55 -0400 (Mon, 11 Apr 2011)
New Revision: 30506
Modified:
trunk/module_template/docs/reference/en-US/Book_Info.xml
trunk/module_template/docs/reference/en-US/Template.xml
trunk/module_template/docs/reference/en-US/getting_started.xml
trunk/module_template/docs/reference/pom.xml
trunk/module_template/docs/reference/publican.cfg
Log:
updated to allow for conditional building
Modified: trunk/module_template/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/module_template/docs/reference/en-US/Book_Info.xml 2011-04-12 00:26:00 UTC (rev 30505)
+++ trunk/module_template/docs/reference/en-US/Book_Info.xml 2011-04-12 01:51:55 UTC (rev 30506)
@@ -31,5 +31,5 @@
<xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="author_group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</bookinfo>
Modified: trunk/module_template/docs/reference/en-US/Template.xml
===================================================================
--- trunk/module_template/docs/reference/en-US/Template.xml 2011-04-12 00:26:00 UTC (rev 30505)
+++ trunk/module_template/docs/reference/en-US/Template.xml 2011-04-12 01:51:55 UTC (rev 30506)
@@ -3,13 +3,13 @@
]>
<book>
<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Latest_Developments.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Getting_Started.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Tasks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Reference.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Troubleshooting.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="latest_developments.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="getting_started.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="tasks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="reference.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="troubleshooting.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="revision_history.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</book>
Modified: trunk/module_template/docs/reference/en-US/getting_started.xml
===================================================================
--- trunk/module_template/docs/reference/en-US/getting_started.xml 2011-04-12 00:26:00 UTC (rev 30505)
+++ trunk/module_template/docs/reference/en-US/getting_started.xml 2011-04-12 01:51:55 UTC (rev 30506)
@@ -13,7 +13,7 @@
</para>
<variablelist>
<title>Ensure that the following applications are pre-configured on your system.</title>
- <varlistentry>
+ <varlistentry condition="jbds">
<term>JBoss Developer Studio x.x.</term>
<listitem>
<para>
@@ -24,6 +24,14 @@
</para>
</listitem>
</varlistentry>
+ <varlistentry condition="jbt">
+ <term>JBoss Tools plug-in</term>
+ <listitem>
+ <para>
+ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/GettingStartedGuide/...">Instructions on installing JBoss Tools plug-ins</ulink>
+ </para>
+ </listitem>
+ </varlistentry>
<varlistentry>
<term>Java Development Kit 1.6</term>
<listitem>
Modified: trunk/module_template/docs/reference/pom.xml
===================================================================
--- trunk/module_template/docs/reference/pom.xml 2011-04-12 00:26:00 UTC (rev 30505)
+++ trunk/module_template/docs/reference/pom.xml 2011-04-12 01:51:55 UTC (rev 30506)
@@ -1,23 +1,247 @@
<?xml version="1.0" encoding="utf-8"?>
<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>
- <parent>
- <relativePath>../../../documentation/parent/pom.xml</relativePath>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.documentation.parent.pom</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>${docname}-${translation}</artifactId>
+ <version>1.0</version>
+ <packaging>jdocbook</packaging>
+ <name>${bookname}-(${translation})</name>
+
+ <properties>
+ <translation>en-US</translation>
+ <docname>Reference_Template</docname>
+ <bookname>Reference Template</bookname>
+ </properties>
+
+ <profiles>
- <groupId>org.jboss.tools.template.documentation</groupId>
- <artifactId>${docname}-${translation}</artifactId>
- <version>1.0</version>
- <packaging>jdocbook</packaging>
- <name>${bookname}-(${translation})</name>
+ <!-- mvn compile -->
+ <profile>
+ <id>all</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.3.4</version>
+ <extensions>true</extensions>
+ <configuration>
+
+ <profiling>
+ <enabled>true</enabled>
+ <attributeName>condition</attributeName>
+ <attributeValue>jbt</attributeValue>
+ </profiling>
+
+
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ <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>eclipse</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/eclipse.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <useRelativeImageUris>true</useRelativeImageUris>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
- <properties>
- <docname>template_reference</docname>
- <bookname>template_refeerence</bookname>
- </properties>
+ <!-- mvn compile -Phtml -->
+ <profile>
+ <id>html</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.3.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <!-- mvn compile -Phtml-single -->
+ <profile>
+ <id>html-single</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.3.3</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- mvn compile -Ppdf -->
+ <profile>
+ <id>pdf</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.3.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${docname}.pdf</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- mvn compile -Peclipse -->
+ <profile>
+ <id>eclipse</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.3.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <formats>
+ <format>
+ <formatName>eclipse</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/eclipse.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.3.3</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.pressgang</groupId>
+ <artifactId>pressgang-xslt</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.1</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDirectory>${project.basedir}</sourceDirectory>
+ <!-- <sourceDocumentName>${docname}.xml</sourceDocumentName> -->
+ <sourceDocumentName>master.xml</sourceDocumentName>
+ <masterTranslation>en-US</masterTranslation>
+ <imageResource>
+ <directory>${project.basedir}/en-US</directory>
+ <includes>
+ <include>images/**/*</include>
+ </includes>
+ </imageResource>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${pdf.name}</finalName>
+ </format>
+ <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>eclipse</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/eclipse.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <docbookVersion>1.72.0</docbookVersion>
+ <localeSeparator>-</localeSeparator>
+ <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>
+ </transformerParameters>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
Modified: trunk/module_template/docs/reference/publican.cfg
===================================================================
--- trunk/module_template/docs/reference/publican.cfg 2011-04-12 00:26:00 UTC (rev 30505)
+++ trunk/module_template/docs/reference/publican.cfg 2011-04-12 01:51:55 UTC (rev 30506)
@@ -5,5 +5,5 @@
type: Book
brand: JBoss
debug: 1
+condition: jbds
-
13 years, 7 months
JBoss Tools SVN: r30505 - trunk/module_template/docs/reference/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-04-11 20:26:00 -0400 (Mon, 11 Apr 2011)
New Revision: 30505
Added:
trunk/module_template/docs/reference/en-US/Book_Info.xml
trunk/module_template/docs/reference/en-US/Template.ent
trunk/module_template/docs/reference/en-US/Template.xml
Removed:
trunk/module_template/docs/reference/en-US/book_info.xml
trunk/module_template/docs/reference/en-US/template.ent
trunk/module_template/docs/reference/en-US/template.xml
Log:
changing case of Book info and Template named files as this is required by Publican - sorry
Added: trunk/module_template/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/module_template/docs/reference/en-US/Book_Info.xml (rev 0)
+++ trunk/module_template/docs/reference/en-US/Book_Info.xml 2011-04-12 00:26:00 UTC (rev 30505)
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+<bookinfo id="book-template-template">
+ <title>Template</title>
+ <subtitle>
+ Provides information about the use of the <application>JBoss Developer Studio</application> from a beginners level.
+ </subtitle>
+
+ <productname>JBoss Developer Studio</productname>
+
+ <productnumber>0.0</productnumber>
+
+ <edition>0.0.0</edition>
+
+ <pubsnumber>0</pubsnumber>
+
+ <abstract>
+ <para>
+ The Template for creating new books for <application>JBoss Developer Studio</application> and <application>JBoss Tools</application>. It is intended for developers who wish to document their creations.
+ </para>
+ </abstract>
+
+ <corpauthor>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
+ </imageobject>
+ </inlinemediaobject>
+ </corpauthor>
+
+ <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</bookinfo>
Added: trunk/module_template/docs/reference/en-US/Template.ent
===================================================================
--- trunk/module_template/docs/reference/en-US/Template.ent (rev 0)
+++ trunk/module_template/docs/reference/en-US/Template.ent 2011-04-12 00:26:00 UTC (rev 30505)
@@ -0,0 +1,4 @@
+<!ENTITY PRODUCT "JBoss">
+<!ENTITY BOOKID "Template">
+<!ENTITY YEAR "2011">
+<!ENTITY HOLDER "Red Hat">
Added: trunk/module_template/docs/reference/en-US/Template.xml
===================================================================
--- trunk/module_template/docs/reference/en-US/Template.xml (rev 0)
+++ trunk/module_template/docs/reference/en-US/Template.xml 2011-04-12 00:26:00 UTC (rev 30505)
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+<book>
+ <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Latest_Developments.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Getting_Started.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Tasks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Reference.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Troubleshooting.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</book>
+
Deleted: trunk/module_template/docs/reference/en-US/book_info.xml
===================================================================
--- trunk/module_template/docs/reference/en-US/book_info.xml 2011-04-12 00:19:16 UTC (rev 30504)
+++ trunk/module_template/docs/reference/en-US/book_info.xml 2011-04-12 00:26:00 UTC (rev 30505)
@@ -1,35 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-]>
-<bookinfo id="book-template-template">
- <title>Template</title>
- <subtitle>
- Provides information about the use of the <application>JBoss Developer Studio</application> from a beginners level.
- </subtitle>
-
- <productname>JBoss Developer Studio</productname>
-
- <productnumber>0.0</productnumber>
-
- <edition>0.0.0</edition>
-
- <pubsnumber>0</pubsnumber>
-
- <abstract>
- <para>
- The Template for creating new books for <application>JBoss Developer Studio</application> and <application>JBoss Tools</application>. It is intended for developers who wish to document their creations.
- </para>
- </abstract>
-
- <corpauthor>
- <inlinemediaobject>
- <imageobject>
- <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" />
- </imageobject>
- </inlinemediaobject>
- </corpauthor>
-
- <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-
- <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</bookinfo>
Deleted: trunk/module_template/docs/reference/en-US/template.ent
===================================================================
--- trunk/module_template/docs/reference/en-US/template.ent 2011-04-12 00:19:16 UTC (rev 30504)
+++ trunk/module_template/docs/reference/en-US/template.ent 2011-04-12 00:26:00 UTC (rev 30505)
@@ -1,4 +0,0 @@
-<!ENTITY PRODUCT "JBoss">
-<!ENTITY BOOKID "Template">
-<!ENTITY YEAR "2011">
-<!ENTITY HOLDER "Red Hat">
Deleted: trunk/module_template/docs/reference/en-US/template.xml
===================================================================
--- trunk/module_template/docs/reference/en-US/template.xml 2011-04-12 00:19:16 UTC (rev 30504)
+++ trunk/module_template/docs/reference/en-US/template.xml 2011-04-12 00:26:00 UTC (rev 30505)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-]>
-<book>
- <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Latest_Developments.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Getting_Started.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Concepts.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Tasks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Reference.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Troubleshooting.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</book>
-
13 years, 7 months
JBoss Tools SVN: r30504 - trunk/documentation/guides/Document_Conventions/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-04-11 20:19:16 -0400 (Mon, 11 Apr 2011)
New Revision: 30504
Added:
trunk/documentation/guides/Document_Conventions/en-US/Feedback.xml
Log:
updated to include link to Bugzilla JBDS instead of JIRA
Added: trunk/documentation/guides/Document_Conventions/en-US/Feedback.xml
===================================================================
--- trunk/documentation/guides/Document_Conventions/en-US/Feedback.xml (rev 0)
+++ trunk/documentation/guides/Document_Conventions/en-US/Feedback.xml 2011-04-12 00:19:16 UTC (rev 30504)
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='utf-8' ?>
+
+<section id="sect-Beginners_Guide-We_Need_Feedback" lang="en-US">
+ <title>We Need Feedback!</title>
+ <indexterm>
+ <primary>feedback</primary>
+ <secondary>contact information for this manual</secondary>
+ </indexterm>
+ <para>
+ If you find a typographical error in this manual, or if you have thought of a way to make this manual better, we would love to hear from you! Please submit a report in Bugzilla against JBoss Developer Studio: <ulink url="https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss%20Developer%20Studio">https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss%20Developer%20Studio</ulink>
+ </para>
+ <para>
+ When submitting a bug report, be sure to select the manual's name and the poducts version.
+ </para>
+ <para>
+ If you have a suggestion for improving the documentation, try to be as specific as possible when describing it. If you have found an error, please include the section number and some of the surrounding text so we can find it easily.
+ </para>
+</section>
+
+
13 years, 7 months
JBoss Tools SVN: r30503 - trunk/documentation/guides/Document_Conventions/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-04-11 20:13:30 -0400 (Mon, 11 Apr 2011)
New Revision: 30503
Removed:
trunk/documentation/guides/Document_Conventions/en-US/Chapter.xml
Log:
removed chapter - not needed
Deleted: trunk/documentation/guides/Document_Conventions/en-US/Chapter.xml
===================================================================
--- trunk/documentation/guides/Document_Conventions/en-US/Chapter.xml 2011-04-11 23:36:13 UTC (rev 30502)
+++ trunk/documentation/guides/Document_Conventions/en-US/Chapter.xml 2011-04-12 00:13:30 UTC (rev 30503)
@@ -1,33 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Document_Conventions.ent">
-%BOOK_ENTITIES;
-]>
-<chapter id="chap-Document_Conventions-Test_Chapter">
- <title>Test Chapter</title>
- <para>
- This is a test paragraph
- </para>
- <section id="sect-Document_Conventions-Test_Chapter-Test_Section_1">
- <title>Test Section 1</title>
- <para>
- This is a test paragraph in a section
- </para>
- </section>
-
- <section id="sect-Document_Conventions-Test_Chapter-Test_Section_2">
- <title>Test Section 2</title>
- <para>
- This is a test paragraph in Section 2
- <orderedlist>
- <listitem>
- <para>
- listitem text
- </para>
- </listitem>
- </orderedlist>
- </para>
- </section>
-
-</chapter>
-
13 years, 7 months
JBoss Tools SVN: r30502 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2011-04-11 19:36:13 -0400 (Mon, 11 Apr 2011)
New Revision: 30502
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java
Log:
https://issues.jboss.org/browse/JBIDE-8627
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2011-04-11 23:32:02 UTC (rev 30501)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2011-04-11 23:36:13 UTC (rev 30502)
@@ -58,6 +58,8 @@
@Override
public void run(IMarker marker) {
IAnnotation originalAnnotation = getScopeAnnotation();
+ if(originalAnnotation == null)
+ return;
try{
ICompilationUnit original = EclipseUtil.getCompilationUnit(file);
ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
@@ -79,13 +81,15 @@
// delete import
String qualifiedName = getFullyQualifiedName();
- IImportDeclaration importDeclaration = compilationUnit.getImport(qualifiedName);
- IImportContainer importContainer = compilationUnit.getImportContainer();
- if(importDeclaration != null && importContainer != null){
- int importSize = importContainer.getSourceRange().getOffset()+importContainer.getSourceRange().getLength();
- String text = buffer.getText(importSize, buffer.getLength()-importSize);
- if(checkImport(text, originalAnnotation.getElementName()))
- importDeclaration.delete(false, new NullProgressMonitor());
+ if(qualifiedName != null){
+ IImportDeclaration importDeclaration = compilationUnit.getImport(qualifiedName);
+ IImportContainer importContainer = compilationUnit.getImportContainer();
+ if(importDeclaration != null && importContainer != null){
+ int importSize = importContainer.getSourceRange().getOffset()+importContainer.getSourceRange().getLength();
+ String text = buffer.getText(importSize, buffer.getLength()-importSize);
+ if(checkImport(text, originalAnnotation.getElementName()))
+ importDeclaration.delete(false, new NullProgressMonitor());
+ }
}
}
13 years, 7 months