12:26 p.m.
Author: objectiser
Date: 2010-11-01 13:26:38 -0400 (Mon, 01 Nov 2010)
New Revision: 451
Modified:
branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/architecture.xml
branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml
branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml
trunk/docs/gettingstartedguide/src/main/en-US/module/architecture.xml
trunk/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml
trunk/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml
trunk/tools/parent-pom.xml
trunk/tools/plugins/org.jboss.savara.contract.model/META-INF/MANIFEST.MF
trunk/tools/pom.xml
Log:
Some 'getting started guide' comments from Jeff D, and copying Nick's
pom/manifest changes from 1.1.x branch to trunk.
Modified: branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/architecture.xml
===================================================================
---
branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/architecture.xml 2010-10-29
20:23:48 UTC (rev 450)
+++
branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/architecture.xml 2010-11-01
17:26:38 UTC (rev 451)
@@ -97,7 +97,7 @@
<para>
The choreography description for the Purchasing example can be found in
-<filename>purchasing-models/PurchaseGoods.cdm</filename>. When the
+<filename>purchasing/PurchaseGoods.cdm</filename>. When the
choreography editor has been launched, by double-clicking on this file within the Eclipse
environment, then navigate to the <emphasis>Choreography Flows</emphasis> tab
to see the
definition of the purchasing process:
@@ -156,7 +156,7 @@
Once the choreography description has been successfully tested against the scenarios,
the
next step may be to obtain approval to proceed to the analysis/design phase. To help
support
this effort, the pi4soa tools provide the means to export the choreography description
to
-a range of representations. HTML documentation generated is discussed below, and BPMN
+a range of representations. HTML documentation generation is discussed below, and BPMN
diagram generation is discussed in the Service Oriented Analysis and Design section.
</para>
Modified:
branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml
===================================================================
---
branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml 2010-10-29
20:23:48 UTC (rev 450)
+++
branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml 2010-11-01
17:26:38 UTC (rev 451)
@@ -59,7 +59,7 @@
</para>
<para>
-In the <filename>purchasing-models</filename> Eclipse project, the
+In the <filename>purchasing</filename> Eclipse project, the
<filename>SuccessfulPurchase.scn</filename> scenario looks like this:
</para>
@@ -82,7 +82,7 @@
</para>
<para>
- Some previously defined examples can be found in the
<filename>process-models</filename>
+ Some previously defined examples can be found in the
<filename>purchasing</filename>
Eclipse project. For example, the Buy request is defined as:
</para>
Modified: branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml
===================================================================
---
branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml 2010-10-29
20:23:48 UTC (rev 450)
+++
branches/1.1.x/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml 2010-11-01
17:26:38 UTC (rev 451)
@@ -61,7 +61,7 @@
<para>
To test out this feature, uncheck the <emphasis>Buyer</emphasis> participant,
leave the build system
-as <emphasis>Ant</emphasis>, select the messaging system appropriate for your
target environment and
+as <emphasis>Ant</emphasis>, and
press the 'Ok' button. This will create a single new project for the
<emphasis>Store</emphasis> and
<emphasis>CreditAgency</emphasis> participants.
</para>
Modified: trunk/docs/gettingstartedguide/src/main/en-US/module/architecture.xml
===================================================================
--- trunk/docs/gettingstartedguide/src/main/en-US/module/architecture.xml 2010-10-29
20:23:48 UTC (rev 450)
+++ trunk/docs/gettingstartedguide/src/main/en-US/module/architecture.xml 2010-11-01
17:26:38 UTC (rev 451)
@@ -97,7 +97,7 @@
<para>
The choreography description for the Purchasing example can be found in
-<filename>purchasing-models/PurchaseGoods.cdm</filename>. When the
+<filename>purchasing/PurchaseGoods.cdm</filename>. When the
choreography editor has been launched, by double-clicking on this file within the Eclipse
environment, then navigate to the <emphasis>Choreography Flows</emphasis> tab
to see the
definition of the purchasing process:
@@ -156,7 +156,7 @@
Once the choreography description has been successfully tested against the scenarios,
the
next step may be to obtain approval to proceed to the analysis/design phase. To help
support
this effort, the pi4soa tools provide the means to export the choreography description
to
-a range of representations. HTML documentation generated is discussed below, and BPMN
+a range of representations. HTML documentation generation is discussed below, and BPMN
diagram generation is discussed in the Service Oriented Analysis and Design section.
</para>
Modified: trunk/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml
===================================================================
--- trunk/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml 2010-10-29
20:23:48 UTC (rev 450)
+++ trunk/docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml 2010-11-01
17:26:38 UTC (rev 451)
@@ -59,7 +59,7 @@
</para>
<para>
-In the <filename>purchasing-models</filename> Eclipse project, the
+In the <filename>purchasing</filename> Eclipse project, the
<filename>SuccessfulPurchase.scn</filename> scenario looks like this:
</para>
@@ -82,7 +82,7 @@
</para>
<para>
- Some previously defined examples can be found in the
<filename>process-models</filename>
+ Some previously defined examples can be found in the
<filename>purchasing</filename>
Eclipse project. For example, the Buy request is defined as:
</para>
Modified: trunk/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml
===================================================================
--- trunk/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml 2010-10-29
20:23:48 UTC (rev 450)
+++ trunk/docs/gettingstartedguide/src/main/en-US/module/servicedev.xml 2010-11-01
17:26:38 UTC (rev 451)
@@ -61,7 +61,7 @@
<para>
To test out this feature, uncheck the <emphasis>Buyer</emphasis> participant,
leave the build system
-as <emphasis>Ant</emphasis>, select the messaging system appropriate for your
target environment and
+as <emphasis>Ant</emphasis>, and
press the 'Ok' button. This will create a single new project for the
<emphasis>Store</emphasis> and
<emphasis>CreditAgency</emphasis> participants.
</para>
Modified: trunk/tools/parent-pom.xml
===================================================================
--- trunk/tools/parent-pom.xml 2010-10-29 20:23:48 UTC (rev 450)
+++ trunk/tools/parent-pom.xml 2010-11-01 17:26:38 UTC (rev 451)
@@ -8,8 +8,7 @@
<packaging>pom</packaging>
<properties>
- <!-- <tychoVersion>0.10.0-SNAPSHOT</tychoVersion> -->
- <tychoVersion>0.9.0</tychoVersion>
+ <tychoVersion>0.10.0</tychoVersion>
<scmBranch>trunk</scmBranch>
<BUILD_ALIAS>SNAPSHOT</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
Modified: trunk/tools/plugins/org.jboss.savara.contract.model/META-INF/MANIFEST.MF
===================================================================
--- trunk/tools/plugins/org.jboss.savara.contract.model/META-INF/MANIFEST.MF 2010-10-29
20:23:48 UTC (rev 450)
+++ trunk/tools/plugins/org.jboss.savara.contract.model/META-INF/MANIFEST.MF 2010-11-01
17:26:38 UTC (rev 451)
@@ -6,6 +6,6 @@
Bundle-Activator: org.jboss.savara.contract.model.osgi.Activator
Bundle-Vendor: www.jboss.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.osgi.framework;version="1.3.0"
+Import-Package: org.osgi.framework
Require-Bundle: org.scribble.core;bundle-version="[1.0.0,2.0.0)"
Export-Package: org.jboss.savara.contract.model
Modified: trunk/tools/pom.xml
===================================================================
--- trunk/tools/pom.xml 2010-10-29 20:23:48 UTC (rev 450)
+++ trunk/tools/pom.xml 2010-11-01 17:26:38 UTC (rev 451)
@@ -1,6 +1,6 @@
-<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">
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.savara</groupId>
<artifactId>tools</artifactId>
@@ -8,12 +8,23 @@
<version>1.1.0-SNAPSHOT</version>
<name>Savara::Tools</name>
- <parent>
+ <!-- use JBoss Tools' trunk/build/parent/pom.xml - must be built locally first!
+ Then, build like this to suck in latest pi4soa + target-platform:
+ mvn3 clean install -U -B -e -fae -P
jbosstools-nightly-trunk,helios-remote-target,\!helios
+ -->
+ <parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <!-- Don't use Savara's own local parent-pom.xml. ~nickb
+ <parent>
<relativePath>parent-pom.xml</relativePath>
<groupId>org.jboss.savara.tools</groupId>
<artifactId>org.jboss.savara.tools.parent.pom</artifactId>
<version>1.1.0-SNAPSHOT</version>
- </parent>
+ </parent> -->
<properties>
<jaxb.version>2.1</jaxb.version>
@@ -59,7 +70,6 @@
<repository>
<id>pi4soa</id>
<url>http://download.jboss.org/jbosstools/builds/staging/pi4soa/all/rep...
- <!--
>url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-pi4soa/all/repo/</url
-->
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -68,6 +78,17 @@
<enabled>true</enabled>
</releases>
</repository>
+ <repository>
+ <id>eclipse-helios</id>
+ <url>http://download.eclipse.org/releases/helios</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
</repositories>
</project>