[savara-commits] savara SVN: r223 - in trunk: distribution and 15 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue May 18 17:31:34 EDT 2010


Author: objectiser
Date: 2010-05-18 17:31:32 -0400 (Tue, 18 May 2010)
New Revision: 223

Added:
   trunk/docs/samplesguide/
   trunk/docs/samplesguide/pom.xml
   trunk/docs/samplesguide/src/
   trunk/docs/samplesguide/src/main/
   trunk/docs/samplesguide/src/main/images/
   trunk/docs/samplesguide/src/main/images/ChoreoMonReady.jpg
   trunk/docs/samplesguide/src/main/images/MonitorMenu.jpg
   trunk/docs/samplesguide/src/main/images/TrailblazerWebPage.jpg
   trunk/docs/samplesguide/src/main/master.xml
   trunk/docs/samplesguide/src/main/module/
   trunk/docs/samplesguide/src/main/module/author_group.xml
   trunk/docs/samplesguide/src/main/module/overview.xml
   trunk/docs/samplesguide/src/main/module/servicevalidator.xml
   trunk/docs/samplesguide/src/main/xslt/
   trunk/docs/samplesguide/src/main/xslt/pdf.xsl
   trunk/docs/trailblazer/
   trunk/docs/trailblazer/TBGuide.odt
   trunk/docs/trailblazer/TBGuide.pdf
   trunk/docs/user/
   trunk/docs/user/TBGuide.odt
   trunk/docs/user/TBGuide.pdf
   trunk/tools/
   trunk/tools/eclipse/
   trunk/tools/pom.xml
Removed:
   trunk/plugins/
Modified:
   trunk/distribution/pom.xml
   trunk/distribution/src/main/assembly/bin.xml
   trunk/docs/gettingstartedguide/pom.xml
   trunk/docs/pom.xml
   trunk/docs/userguide/pom.xml
   trunk/pom.xml
   trunk/tools/eclipse/eclipse-build/pom.xml
   trunk/tools/eclipse/pom.xml
Log:
Refactored trunk to prepare for combining tools and validator distributions. Currently just moved the plugins and added the docs from validator.

Modified: trunk/distribution/pom.xml
===================================================================
--- trunk/distribution/pom.xml	2010-05-18 17:30:48 UTC (rev 222)
+++ trunk/distribution/pom.xml	2010-05-18 21:31:32 UTC (rev 223)
@@ -19,16 +19,16 @@
 -->
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.jboss.savara.tools.eclipse</groupId>
+    <groupId>org.jboss.savara</groupId>
     <artifactId>distribution</artifactId>
     <packaging>pom</packaging>
-    <name>Savara::Tools::Eclipse::Distribution</name>
+    <name>Savara::Distribution</name>
     <version>1.0-SNAPSHOT</version>
     <url>http://www.jboss.org/savara</url>
 
 	<parent>
-		<groupId>org.jboss.savara.tools</groupId>
-		<artifactId>eclipse</artifactId>
+		<groupId>org.jboss</groupId>
+		<artifactId>savara</artifactId>
 		<version>1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
@@ -61,7 +61,7 @@
                   <goal>single</goal>
                 </goals>
                 <configuration>
-                  <finalName>savara-tools-eclipse-${project.version}</finalName>
+                  <finalName>savara-${project.version}</finalName>
                   <appendAssemblyId>false</appendAssemblyId>
                   <descriptors>
                     <descriptor>src/main/assembly/bin.xml</descriptor>
@@ -75,7 +75,7 @@
 		              <goal>single</goal>
 		            </goals>
 		            <configuration>
-		              <finalName>savara-tools-eclipse-${project.version}-src</finalName>
+		              <finalName>savara-${project.version}-src</finalName>
 		              <appendAssemblyId>false</appendAssemblyId>
 		              <descriptors>
 		                <descriptor>src/main/assembly/src.xml</descriptor>

Modified: trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- trunk/distribution/src/main/assembly/bin.xml	2010-05-18 17:30:48 UTC (rev 222)
+++ trunk/distribution/src/main/assembly/bin.xml	2010-05-18 21:31:32 UTC (rev 223)
@@ -40,7 +40,7 @@
 
         <!-- copy Eclipse features and plugins -->
         <fileSet>
-		   <directory>../plugins/eclipse-build/target/dist</directory>
+		   <directory>../tools/eclipse/eclipse-build/target/dist</directory>
 		   <outputDirectory>eclipse</outputDirectory>
 			<!-- includes>
 			  <include>*.zip</include>
@@ -64,6 +64,11 @@
 		   <outputDirectory>docs/gettingstartedguide</outputDirectory>
 		</fileSet>
 
+		<fileSet>
+		   <directory>../docs/samplesguide/target/docbook/publish/en-US</directory>
+		   <outputDirectory>docs/samplesguide</outputDirectory>
+		</fileSet>
+
         <!-- End of copying documents -->       
          
     </fileSets>

Modified: trunk/docs/gettingstartedguide/pom.xml
===================================================================
--- trunk/docs/gettingstartedguide/pom.xml	2010-05-18 17:30:48 UTC (rev 222)
+++ trunk/docs/gettingstartedguide/pom.xml	2010-05-18 21:31:32 UTC (rev 223)
@@ -4,14 +4,14 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jboss.savara.tools.eclipse.docs</groupId>
+    <groupId>org.jboss.savara.docs</groupId>
     <artifactId>gettingstartedguide</artifactId>
     <packaging>jdocbook</packaging>
-    <name>Savara::Tools::Eclipse::Docs::GettingStartedGuide</name>
+    <name>Savara::Docs::GettingStartedGuide</name>
     <version>1.0-SNAPSHOT</version>
 
    <parent>
-    <groupId>org.jboss.savara.tools.eclipse</groupId>
+    <groupId>org.jboss.savara</groupId>
     <artifactId>docs</artifactId>
     <version>1.0-SNAPSHOT</version>
    </parent>
@@ -60,7 +60,7 @@
 		                <format>
 		                    <formatName>pdf</formatName>
 		                    <stylesheetResource>file:///${basedir}/src/main/xslt/pdf.xsl</stylesheetResource>
-				            <finalName>SAVARA-Eclipse-Tools-GettingStartedGuide.pdf</finalName>
+				            <finalName>SAVARA-GettingStartedGuide.pdf</finalName>
 		                </format>
 						<format>
 						    <formatName>html</formatName>

Modified: trunk/docs/pom.xml
===================================================================
--- trunk/docs/pom.xml	2010-05-18 17:30:48 UTC (rev 222)
+++ trunk/docs/pom.xml	2010-05-18 21:31:32 UTC (rev 223)
@@ -4,21 +4,22 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jboss.savara.tools.eclipse</groupId>
+    <groupId>org.jboss.savara</groupId>
     <artifactId>docs</artifactId>
     <packaging>pom</packaging>
-    <name>Savara::Tools::Eclipse::Docs</name>
+    <name>Savara::Docs</name>
     <version>1.0-SNAPSHOT</version>
     
     <parent>
-	  <groupId>org.jboss.savara.tools</groupId>
-	  <artifactId>eclipse</artifactId>
+	  <groupId>org.jboss</groupId>
+	  <artifactId>savara</artifactId>
       <version>1.0-SNAPSHOT</version>
 	</parent>
   
     <modules>
       <module>userguide</module>
 	  <module>gettingstartedguide</module>
+	  <module>samplesguide</module>
     </modules>
 
 </project>

Added: trunk/docs/samplesguide/pom.xml
===================================================================
--- trunk/docs/samplesguide/pom.xml	                        (rev 0)
+++ trunk/docs/samplesguide/pom.xml	2010-05-18 21:31:32 UTC (rev 223)
@@ -0,0 +1,86 @@
+<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.savara.docs</groupId>
+    <artifactId>samplesguide</artifactId>
+    <packaging>jdocbook</packaging>
+    <name>Savara::Docs::SamplesGuide</name>
+    <version>1.0-M1</version>
+
+   <parent>
+    <groupId>org.jboss.savara</groupId>
+    <artifactId>docs</artifactId>
+    <version>1.0-SNAPSHOT</version>
+   </parent>
+
+
+    <build>
+        <plugins>
+            <plugin>
+			<groupId>org.jboss.maven.plugins</groupId>
+			<artifactId>maven-jdocbook-plugin</artifactId>
+			<version>2.1.2</version>
+			<extensions>true</extensions>
+			<executions>
+			  <execution>
+			    <id>generate-docbook</id>
+			    <phase>package</phase>
+			    <goals>
+			      <goal>resources</goal>
+			      <goal>generate</goal>
+			    </goals>
+			  </execution>
+			</executions>
+			<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.1.0</version>
+			    <type>jdocbook-style</type>
+			  </dependency>
+			</dependencies>
+			<configuration>
+			  <sourceDocumentName>master.xml</sourceDocumentName>
+			  <sourceDirectory>${basedir}/src/main</sourceDirectory>
+			  <imageResource>
+			    <directory>${basedir}/src/main</directory>
+			    <includes>
+			      <include>images/**/*</include>
+			    </includes>
+			  </imageResource>
+		            <formats>
+		                <format>
+		                    <formatName>pdf</formatName>
+		                    <stylesheetResource>file:///${basedir}/src/main/xslt/pdf.xsl</stylesheetResource>
+				            <finalName>SAVARA-SamplesGuide.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>
+		            </formats>
+			  <options>
+			    <xincludeSupported>true</xincludeSupported>
+			    <xmlTransformerType>saxon</xmlTransformerType>
+			    <docbookVersion>1.72.0</docbookVersion>
+			  </options>
+			</configuration>
+            </plugin>           
+        </plugins>
+    </build>
+
+</project>

Added: trunk/docs/samplesguide/src/main/images/ChoreoMonReady.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/docs/samplesguide/src/main/images/ChoreoMonReady.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/docs/samplesguide/src/main/images/MonitorMenu.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/docs/samplesguide/src/main/images/MonitorMenu.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/docs/samplesguide/src/main/images/TrailblazerWebPage.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/docs/samplesguide/src/main/images/TrailblazerWebPage.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/docs/samplesguide/src/main/master.xml
===================================================================
--- trunk/docs/samplesguide/src/main/master.xml	                        (rev 0)
+++ trunk/docs/samplesguide/src/main/master.xml	2010-05-18 21:31:32 UTC (rev 223)
@@ -0,0 +1,17 @@
+<?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" [
+<!ENTITY % RH-ENTITIES SYSTEM "Common_Config/rh-entities.ent">
+]>
+
+<book lang="en">
+  <bookinfo>
+    <title>SAVARA Validator 1.0-M1</title>
+    <subtitle>Samples Guide</subtitle>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/author_group.xml"/>
+  </bookinfo>
+  
+  <toc/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/overview.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/servicevalidator.xml"/>
+
+</book>

Added: trunk/docs/samplesguide/src/main/module/author_group.xml
===================================================================
--- trunk/docs/samplesguide/src/main/module/author_group.xml	                        (rev 0)
+++ trunk/docs/samplesguide/src/main/module/author_group.xml	2010-05-18 21:31:32 UTC (rev 223)
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+<authorgroup>
+	<corpauthor>Gary Brown</corpauthor>
+	<corpauthor>Jeff Yu</corpauthor>
+</authorgroup>

Added: trunk/docs/samplesguide/src/main/module/overview.xml
===================================================================
--- trunk/docs/samplesguide/src/main/module/overview.xml	                        (rev 0)
+++ trunk/docs/samplesguide/src/main/module/overview.xml	2010-05-18 21:31:32 UTC (rev 223)
@@ -0,0 +1,25 @@
+<?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" [
+]>
+<chapter id="overview">
+  <title>Overview</title>
+  <para>The SAVARA Validator component provides the ability to validate executing services 
+  against a choreography description, demonstrating a form runtime governance.
+  </para>
+  
+	<para>
+		Further information about configuring the runtime validation of services against a choreography 
+		can be found in the <emphasis role="bold">SAVARA Validator User Guide</emphasis> and the
+		<emphasis role="bold">SAVARA Eclipse Tools User Guide</emphasis>. 
+	</para>
+	
+	<note>
+		<para>
+			Before attempting to deploy and run these examples, you must follow the instructions 
+			in the <filename>${SAVARA-Validator}/install</filename> folder. To be able to
+			examine and modify the examples, it is advisable to install the SAVARA Eclipse Tools,
+			and import the samples into the Eclipse environment.
+		</para>
+	</note>
+	
+</chapter>

Added: trunk/docs/samplesguide/src/main/module/servicevalidator.xml
===================================================================
--- trunk/docs/samplesguide/src/main/module/servicevalidator.xml	                        (rev 0)
+++ trunk/docs/samplesguide/src/main/module/servicevalidator.xml	2010-05-18 21:31:32 UTC (rev 223)
@@ -0,0 +1,166 @@
+<?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" [
+]>
+<chapter id="servicevalidator">
+  <title>Service Validator</title>
+
+  <section>
+	<title>Trailblazer Example</title>
+
+	<para>
+This example can be found in the <filename>trailblazer</filename> folder. See the TrailBlazer Guide 
+(<filename>${SAVARA-Validator}/docs/samples/trailblazer/TBGuide.pdf</filename>) for more information about the example. 
+	</para>
+
+<note>
+	<para>
+The choreography description for the Trailblazer example can be found in the 
+<emphasis>trailblazer-models</emphasis> project in the Eclipse environment. If the project has 
+not yet been imported, then please refer to the instructions in the 
+<emphasis>SAVARA Eclipse Tools Getting Started Guide</emphasis>.
+	</para>
+	<para>
+You can open the choreography for the trailblazer (trailblazer.cdm) and also a scenario representing 
+a valid transaction associated with the choreography (LoanRequest.scn). In the choreography description 
+editor, view the "Choreography Flows" tab to see the structure of the process.
+	</para>
+	<para>
+To simulate the scenario against the choreography, to ensure that the choreography correctly caters 
+for the valid business scenario, the user should press the green 'play' button in the toolbar, associated 
+with the Scenario Editor.
+	</para>
+</note>
+
+
+  <orderedlist>
+	  <listitem>
+Update the <filename>${JBossAS}/server/default/deployers/esb.deployer/jbossesb-properties.xml</filename> 
+file, in the section entitled "transports" and specify all of the SMTP mail server settings for your 
+environment.
+	</listitem>
+	<listitem>
+Update the <filename>${SAVARA-Validator}/samples/trailblazer/trailblazer.properties</filename>
+	<para>
+Update the <property>file.bank.monitored.directory</property> and 
+<property>file.output.directory</property> properties. These are folders used by the File Based Bank, 
+and are set to <filename>/tmp/input</filename> and <filename>/tmp/output</filename> by default. 
+If the selected folders do not exist, then please ensure they are created prior to running the example.
+	</para>
+	</listitem>
+	<listitem>
+Update the <filename>trailblazer/esb/conf/jboss-esb.xml</filename>
+	<para>
+There is a <emphasis>fs-provider</emphasis> block, update the <property>directory</property> 
+attribute value to be the same as the <property>file.output.directory</property> value in 
+<filename>trailblazer.properties</filename> file.
+	</para>
+	</listitem>
+	<listitem>
+Start the JBossAS server
+	</listitem>
+	<listitem>
+From the <filename>trailblazer</filename> folder, execute the command to start the ESB: 
+<emphasis role="bold">ant deploy</emphasis>
+	<para>
+this should deploy the ESB and WAR files to your JBoss AS <filename>server/default</filename>.
+	</para>
+	</listitem>
+	<listitem>
+From the <filename>trailblazer/banks</filename> folder, execute the command to start the JMS 
+Bank service: <emphasis role="bold">ant runJMSBank</emphasis>.
+	</listitem>
+	<listitem>
+From the <filename>trailblazer/banks</filename> folder, execute the command to start the File based 
+Bank service: <emphasis role="bold">ant runFileBank</emphasis>.
+	</listitem>
+	<listitem>
+		<para>
+In the Eclipse environment, select the popup menu associated with the <filename>trailblazer.cdm</filename> 
+file, and choose the <emphasis>Choreography->Monitor</emphasis> menu item.
+		</para>
+
+		<imageobject>
+			<imagedata fileref="images/MonitorMenu.jpg" align="center" width="2in" />
+		</imageobject>
+
+		<para>
+Wait for the monitor window to start, and indicate that the choreography is being monitored, shown in the 
+status line at the bottom of the window.
+		</para>
+
+		<imageobject>
+			<imagedata fileref="images/ChoreoMonReady.jpg" align="center" width="4in" />
+		</imageobject>
+
+	</listitem>
+	<listitem>
+		<para>
+Start a browser and enter the URL: 
+<ulink url="http://localhost:8080/trailblazer">localhost:8080/trailblazer</ulink>.
+		</para>
+
+		<imageobject>
+			<imagedata fileref="images/TrailblazerWebPage.jpg" align="center" width="4in" />
+		</imageobject>
+
+	</listitem>
+	<listitem>
+Now you can submit quotes, You will see either a loan request rejected (single email) because the 
+score is less than 4, or two emails (one from JMS bank and one from FileBased bank) with valid quotes. 
+When entering subsequent quotes, make sure that the quote reference is updated, so that each session 
+has a unique id.
+	</listitem>
+     </orderedlist>
+	<para>
+To demonstrate what occurs when the implementation deviates from the expected behaviour as defined 
+in the choreography description, try the following steps:
+	</para>
+    <orderedlist>
+	<listitem>
+		Run the ant task <emphasis role="bold">ant deploy-error-client</emphasis> to redeploy the 
+		trailblaizer example.
+	</listitem>	
+	<listitem>
+		Run the commands from step 6 above.
+	</listitem>
+	</orderedlist>
+	<para>
+		The above steps show how changing the service implementation without updating a choreography 
+		can result in behavioural validation errors being detected. 	
+	</para>
+	<tip>
+	   <title>What is changed when we run ant deploy-error-client</title>
+		<para>
+			Compared to command of <emphasis role="bold">ant deploy</emphasis>, basically, we have 
+			just updated the following code in
+			<emphasis role="bold">${SAVARA-Validator}/samples/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java</emphasis> file.
+		</para>
+		<para>
+		In the following code within the <emphasis role="bold">processLoanRequest</emphasis> 
+		method, we've changed the "4" to "7"
+		
+<programlisting>
+        //step 2 - check if score is acceptable        
+        if (score >= 4) {
+</programlisting>
+		</para>
+	</tip>  
+	
+	<para>
+	TO BE UPDATED WITH JOPR APPROACH: 
+	Issue further loan requests, remembering to change the quote reference each time, until a Credit 
+	Check result of between 4 and 6 inclusive occurs, which will result in an out of sequence message 
+	being reported (in red) to the Choreography Monitor
+
+	<note>
+		<para>
+		It is currently a requirement that the choreography used within the Choreography Monitor is 
+		the same as the description used to locally monitor the services 
+		(i.e. within the savara-validator-jbossesb.esb/models directory).
+		</para>
+	</note>	
+	</para>
+
+  </section>
+	
+</chapter>

Added: trunk/docs/samplesguide/src/main/xslt/pdf.xsl
===================================================================
--- trunk/docs/samplesguide/src/main/xslt/pdf.xsl	                        (rev 0)
+++ trunk/docs/samplesguide/src/main/xslt/pdf.xsl	2010-05-18 21:31:32 UTC (rev 223)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+                xmlns:fo="http://www.w3.org/1999/XSL/Format"
+                version="1.0">
+
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/fo/docbook.xsl" />
+  <xsl:import href="classpath:/xslt/org/jboss/pdf.xsl" />
+
+  <!-- Override the default font settings -->
+  <xsl:param name="body.font.family" select="'Times New Roman, serif'" />
+  <xsl:param name="monospace.font.family" select="'DejaVu Sans Mono, monospace'" />
+  <xsl:param name="sans.font.family" select="'Arial, sans-serif'" />
+  <xsl:param name="title.font.family" select="$body.font.family" />
+  <xsl:param name="programlisting.font" select="$monospace.font.family" />
+  <xsl:param name="programlisting.font.size" select="'75%'" />
+
+  <!-- Remove the blank pages between the chapters -->
+  <xsl:param name="double.sided" select="0" />
+
+  <!-- Use SVG for callout images instead of PNG -->
+  <xsl:param name="callout.graphics" select="1" />
+  <xsl:param name="callout.graphics.extension" select="'.svg'" />
+
+  <!-- Hide URL -->
+  <xsl:param name="ulink.show" select="0"/>
+
+  <!-- Don't use italic font for links -->
+  <xsl:attribute-set name="xref.properties">
+    <xsl:attribute name="font-style">normal</xsl:attribute>
+  </xsl:attribute-set>
+
+  <!-- Decrease the link font size in the program listing -->
+  <xsl:attribute-set name="monospace.properties">
+    <xsl:attribute name="font-size">1em</xsl:attribute>
+    <xsl:attribute name="font-family">
+        <xsl:value-of select="$monospace.font.family"/>
+    </xsl:attribute>
+  </xsl:attribute-set>
+  
+  <!-- Add some spacing between callout listing items -->
+  <xsl:template match="callout">
+    <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
+    <fo:list-item id="{$id}" space-before="1em">
+      <fo:list-item-label end-indent="label-end()">
+        <fo:block>
+          <xsl:call-template name="callout.arearefs">
+            <xsl:with-param name="arearefs" select="@arearefs"/>
+          </xsl:call-template>
+        </fo:block>
+      </fo:list-item-label>
+      <fo:list-item-body start-indent="body-start()">
+        <fo:block padding-top="0.2em">
+          <xsl:apply-templates/>
+        </fo:block>
+      </fo:list-item-body>
+    </fo:list-item>
+  </xsl:template>
+  
+  <!-- Slight baseline-shift for callouts in the program listing -->
+  <xsl:template name="callout-bug">
+    <xsl:param name="conum" select='1'/>
+    <xsl:choose>
+      <xsl:when test="$conum &lt;= $callout.graphics.number.limit">
+        <xsl:variable name="filename"
+                      select="concat($callout.graphics.path, $conum,
+                                     $callout.graphics.extension)"/>
+
+        <fo:external-graphic content-width="{$callout.icon.size}"
+                             width="{$callout.icon.size}"
+                             padding="0.0em" margin="0.0em"
+                             baseline-shift="-0.375em">
+          <xsl:attribute name="src">
+            <xsl:choose>
+              <xsl:when test="$passivetex.extensions != 0
+                              or $fop.extensions != 0
+                              or $arbortext.extensions != 0">
+                <xsl:value-of select="$filename"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:text>url(</xsl:text>
+                <xsl:value-of select="$filename"/>
+                <xsl:text>)</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:attribute>
+        </fo:external-graphic>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:template>
+</xsl:stylesheet>
+

Added: trunk/docs/trailblazer/TBGuide.odt
===================================================================
(Binary files differ)


Property changes on: trunk/docs/trailblazer/TBGuide.odt
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/docs/trailblazer/TBGuide.pdf
===================================================================
(Binary files differ)


Property changes on: trunk/docs/trailblazer/TBGuide.pdf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/docs/user/TBGuide.odt
===================================================================
(Binary files differ)


Property changes on: trunk/docs/user/TBGuide.odt
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/docs/user/TBGuide.pdf
===================================================================
(Binary files differ)


Property changes on: trunk/docs/user/TBGuide.pdf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/docs/userguide/pom.xml
===================================================================
--- trunk/docs/userguide/pom.xml	2010-05-18 17:30:48 UTC (rev 222)
+++ trunk/docs/userguide/pom.xml	2010-05-18 21:31:32 UTC (rev 223)
@@ -4,14 +4,14 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jboss.savara.tools.eclipse.docs</groupId>
+    <groupId>org.jboss.savara.docs</groupId>
     <artifactId>userguide</artifactId>
     <packaging>jdocbook</packaging>
-    <name>Savara::Tools::Eclipse::Docs::UserGuide</name>
+    <name>Savara::Docs::UserGuide</name>
     <version>1.0-SNAPSHOT</version>
 
    <parent>
-    <groupId>org.jboss.savara.tools.eclipse</groupId>
+    <groupId>org.jboss.savara</groupId>
     <artifactId>docs</artifactId>
     <version>1.0-SNAPSHOT</version>
    </parent>
@@ -60,7 +60,7 @@
 		                <format>
 		                    <formatName>pdf</formatName>
 		                    <stylesheetResource>file:///${basedir}/src/main/xslt/pdf.xsl</stylesheetResource>
-				            <finalName>SAVARA-Eclipse-Tools-UserGuide.pdf</finalName>
+				            <finalName>SAVARA-UserGuide.pdf</finalName>
 		                </format>
 						<format>
 						    <formatName>html</formatName>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-05-18 17:30:48 UTC (rev 222)
+++ trunk/pom.xml	2010-05-18 21:31:32 UTC (rev 223)
@@ -2,17 +2,17 @@
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jboss.savara.tools</groupId>
-	<artifactId>eclipse</artifactId>
+	<groupId>org.jboss</groupId>
+	<artifactId>savara</artifactId>
 	<version>1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
-    <name>Savara::Tools::Eclipse</name>
+    <name>Savara</name>
 	<url>http://www.jboss.org/savara</url>
 	<description>
-		The JBoss SAVARA Eclipse Tools. 
+		The JBoss SAVARA project
 	</description>
 	<scm>
-		<connection>scm:svn:https://svn.jboss.org/repos/savara/tools/eclipse</connection>
+		<connection>scm:svn:https://svn.jboss.org/repos/savara</connection>
 	</scm>
 	<developers>
 		<developer>
@@ -37,7 +37,7 @@
 		</developer>
 	</developers>
 	<modules>
-		<module>plugins</module>
+		<module>tools</module>
 		<module>docs</module>
 		<module>distribution</module>
 	</modules>

Copied: trunk/tools/eclipse (from rev 222, trunk/plugins)

Modified: trunk/tools/eclipse/eclipse-build/pom.xml
===================================================================
--- trunk/plugins/eclipse-build/pom.xml	2010-05-18 17:30:48 UTC (rev 222)
+++ trunk/tools/eclipse/eclipse-build/pom.xml	2010-05-18 21:31:32 UTC (rev 223)
@@ -3,15 +3,15 @@
 
 	<modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jboss.savara.tools.eclipse.plugins</groupId>
+    <groupId>org.jboss.savara.tools.eclipse</groupId>
     <artifactId>build</artifactId>
     <packaging>pom</packaging>
-    <name>Savara::Tools::Eclipse::Plugins::Build</name>
+    <name>Savara::Tools::Eclipse::Build</name>
     <version>1.0-SNAPSHOT</version>
     
     <parent>
-	  <groupId>org.jboss.savara.tools.eclipse</groupId>
-	  <artifactId>plugins</artifactId>
+	  <groupId>org.jboss.savara.tools</groupId>
+	  <artifactId>eclipse</artifactId>
       <version>1.0-SNAPSHOT</version>
 	</parent>
   
@@ -28,7 +28,7 @@
              <tasks>                              
                 <property name="eclipse.home" value="target/eclipse" />             
                 
-                <property name="localEclipseDrop" value="${basedir}/../../../local-eclipse-drop-mirror" />   
+                <property name="localEclipseDrop" value="${basedir}/../../../../local-eclipse-drop-mirror" />   
 
                 <delete failonerror="false" dir="target/eclipse.build"/>     
 

Modified: trunk/tools/eclipse/pom.xml
===================================================================
--- trunk/plugins/pom.xml	2010-05-18 17:30:48 UTC (rev 222)
+++ trunk/tools/eclipse/pom.xml	2010-05-18 21:31:32 UTC (rev 223)
@@ -3,15 +3,15 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jboss.savara.tools.eclipse</groupId>
-    <artifactId>plugins</artifactId>
+    <groupId>org.jboss.savara.tools</groupId>
+    <artifactId>eclipse</artifactId>
     <packaging>pom</packaging>
-    <name>Savara::Tools::Eclipse::Plugins</name>
+    <name>Savara::Tools::Eclipse</name>
     <version>1.0-SNAPSHOT</version>
     
     <parent>
-	  <groupId>org.jboss.savara.tools</groupId>
-	  <artifactId>eclipse</artifactId>
+	  <groupId>org.jboss.savara</groupId>
+	  <artifactId>tools</artifactId>
       <version>1.0-SNAPSHOT</version>
 	</parent>
   

Added: trunk/tools/pom.xml
===================================================================
--- trunk/tools/pom.xml	                        (rev 0)
+++ trunk/tools/pom.xml	2010-05-18 21:31:32 UTC (rev 223)
@@ -0,0 +1,23 @@
+<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.savara</groupId>
+    <artifactId>tools</artifactId>
+    <packaging>pom</packaging>
+    <name>Savara::Tools</name>
+    <version>1.0-SNAPSHOT</version>
+    
+    <parent>
+	  <groupId>org.jboss</groupId>
+	  <artifactId>savara</artifactId>
+      <version>1.0-SNAPSHOT</version>
+	</parent>
+  
+    <modules>
+      <module>eclipse</module>
+    </modules>
+
+</project>



More information about the savara-commits mailing list