Overlord SVN: r324 - cdl/trunk/docs/cdl/user.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2008-09-11 09:26:39 -0400 (Thu, 11 Sep 2008)
New Revision: 324
Added:
cdl/trunk/docs/cdl/user/GettingStartedGuide.odt
Log:
Initial version of getting started guide.
Added: cdl/trunk/docs/cdl/user/GettingStartedGuide.odt
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/docs/cdl/user/GettingStartedGuide.odt
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 8 months
Overlord SVN: r323 - in cdl/trunk/distribution/src/main: release/samples/jbossesb/brokerage/broker and 3 other directories.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2008-09-11 06:20:21 -0400 (Thu, 11 Sep 2008)
New Revision: 323
Modified:
cdl/trunk/distribution/src/main/assembly/bin.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/.classpath
cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/.classpath
cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/.classpath
cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/.classpath
Log:
Copy required jars into the lib folder for each samples Eclipse project. Jars are stored without version details to avoid issues with inconsistency between the entries in the Eclipse .classpath entries and the jar names when the version changes.
Modified: cdl/trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- cdl/trunk/distribution/src/main/assembly/bin.xml 2008-09-11 09:31:29 UTC (rev 322)
+++ cdl/trunk/distribution/src/main/assembly/bin.xml 2008-09-11 10:20:21 UTC (rev 323)
@@ -94,7 +94,52 @@
<include>log4j:log4j</include>
</includes>
</dependencySet>
+
+ <!-- Need to copy libraries into each of the samples Eclipse projects
+ as the jars must be referenced locally within each project. The
+ versions have been removed from the jars, as the Eclipse projects
+ need to explicitly refer to each Jar in the .classpath file, so
+ removing the version from the name avoids having to find a way
+ to automatically update the .classpath file -->
+
<dependencySet>
+ <outputDirectory>samples/brokerage/broker/lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.jboss.soa.overlord.cdl.runtime:jbossesb</include>
+ <include>org.jboss.jbossesb:rosetta</include>
+ <include>log4j:log4j</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>samples/brokerage/supplier/lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.jboss.soa.overlord.cdl.runtime:jbossesb</include>
+ <include>org.jboss.jbossesb:rosetta</include>
+ <include>log4j:log4j</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>samples/purchasing/store/lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.jboss.soa.overlord.cdl.runtime:jbossesb</include>
+ <include>org.jboss.jbossesb:rosetta</include>
+ <include>log4j:log4j</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>samples/common/creditAgency/lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.jboss.soa.overlord.cdl.runtime:jbossesb</include>
+ <include>org.jboss.jbossesb:rosetta</include>
+ <include>log4j:log4j</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
<outputDirectory>modules</outputDirectory>
<includes>
<include>org.jboss.soa.overlord.cdl.runtime:jbossesb-assembly</include>
Modified: cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/.classpath
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/.classpath 2008-09-11 09:31:29 UTC (rev 322)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/.classpath 2008-09-11 10:20:21 UTC (rev 323)
@@ -2,8 +2,8 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/rosetta-4.3.jar"/>
- <classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
- <classpathentry kind="lib" path="lib/jbossesb-1.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/rosetta.jar"/>
+ <classpathentry kind="lib" path="lib/log4j.jar"/>
+ <classpathentry kind="lib" path="lib/jbossesb.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
Modified: cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/.classpath
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/.classpath 2008-09-11 09:31:29 UTC (rev 322)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/.classpath 2008-09-11 10:20:21 UTC (rev 323)
@@ -2,8 +2,8 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/rosetta-4.3.jar"/>
- <classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
- <classpathentry kind="lib" path="lib/jbossesb-1.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/rosetta.jar"/>
+ <classpathentry kind="lib" path="lib/log4j.jar"/>
+ <classpathentry kind="lib" path="lib/jbossesb.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
Modified: cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/.classpath
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/.classpath 2008-09-11 09:31:29 UTC (rev 322)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/.classpath 2008-09-11 10:20:21 UTC (rev 323)
@@ -2,8 +2,8 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/rosetta-4.3.jar"/>
- <classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
- <classpathentry kind="lib" path="lib/jbossesb-1.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/rosetta.jar"/>
+ <classpathentry kind="lib" path="lib/log4j.jar"/>
+ <classpathentry kind="lib" path="lib/jbossesb.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
Modified: cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/.classpath
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/.classpath 2008-09-11 09:31:29 UTC (rev 322)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/store/.classpath 2008-09-11 10:20:21 UTC (rev 323)
@@ -2,8 +2,8 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/rosetta-4.3.jar"/>
- <classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
- <classpathentry kind="lib" path="lib/jbossesb-1.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/rosetta.jar"/>
+ <classpathentry kind="lib" path="lib/log4j.jar"/>
+ <classpathentry kind="lib" path="lib/jbossesb.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
15 years, 8 months
Overlord SVN: r322 - in cdl/trunk/samples/jbossesb/trailblazer/banks: lib/ext and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2008-09-11 05:31:29 -0400 (Thu, 11 Sep 2008)
New Revision: 322
Added:
cdl/trunk/samples/jbossesb/trailblazer/banks/lib/ext/jbossall-client.jar
cdl/trunk/samples/jbossesb/trailblazer/banks/lib/ext/junit-4.1.jar
cdl/trunk/samples/jbossesb/trailblazer/banks/lib/ext/log4j.jar
cdl/trunk/samples/jbossesb/trailblazer/banks/lib/ext/xstream-1.2.2.jar
Modified:
cdl/trunk/samples/jbossesb/trailblazer/banks/build.xml
Log:
* Add libraries to banks folder, so that it won't depend on JBossESB server.
Modified: cdl/trunk/samples/jbossesb/trailblazer/banks/build.xml
===================================================================
--- cdl/trunk/samples/jbossesb/trailblazer/banks/build.xml 2008-09-10 16:17:21 UTC (rev 321)
+++ cdl/trunk/samples/jbossesb/trailblazer/banks/build.xml 2008-09-11 09:31:29 UTC (rev 322)
@@ -6,7 +6,6 @@
<!-- Some default build locations -->
- <property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.home}/lib/ext"/>
<property name="org.jboss.esb.samples.loanbroker.banks.dest" value="${basedir}/build"/>
<property name="org.jboss.esb.samples.loanbroker.banks.classes.dir" value="${basedir}/build/classes/banks/"/>
<property name="org.jboss.esb.samples.loanbroker.banks.testclasses.dir" value="${basedir}/build/classes/tests/"/>
@@ -18,11 +17,9 @@
<path id="org.jboss.esb.samples.loanbroker.banks.classpath">
<fileset dir="${org.jboss.esb.samples.loanbroker.banks.lib.ext.dir}" includes="*.jar"/>
- <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
</path>
<path id="org.jboss.esb.samples.loanbroker.banks.testclasspath">
<fileset dir="${org.jboss.esb.samples.loanbroker.banks.lib.ext.dir}" includes="*.jar"/>
- <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
<pathelement location="${org.jboss.esb.samples.loanbroker.banks.classes.dir}"/>
<pathelement location="${org.jboss.esb.samples.loanbroker.banks.testclasses.dir}"/>
<pathelement location="."/>
Added: cdl/trunk/samples/jbossesb/trailblazer/banks/lib/ext/jbossall-client.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/samples/jbossesb/trailblazer/banks/lib/ext/jbossall-client.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: cdl/trunk/samples/jbossesb/trailblazer/banks/lib/ext/junit-4.1.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/samples/jbossesb/trailblazer/banks/lib/ext/junit-4.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: cdl/trunk/samples/jbossesb/trailblazer/banks/lib/ext/log4j.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/samples/jbossesb/trailblazer/banks/lib/ext/log4j.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: cdl/trunk/samples/jbossesb/trailblazer/banks/lib/ext/xstream-1.2.2.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/samples/jbossesb/trailblazer/banks/lib/ext/xstream-1.2.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 8 months
Overlord SVN: r321 - in cdl/trunk: samples/jbossesb and 5 other directories.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2008-09-10 12:17:21 -0400 (Wed, 10 Sep 2008)
New Revision: 321
Added:
cdl/trunk/docs/cdl/user/TrailblazerGuide.odt
cdl/trunk/docs/cdl/user/TrailblazerGuide.pdf
cdl/trunk/samples/jbossesb/SamplesGuide.odt
cdl/trunk/samples/jbossesb/SamplesGuide.pdf
Modified:
cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java
cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/PurchaseGoods.java
cdl/trunk/samples/jbossesb/trailblazer/readme.txt
Log:
Made the conversationType annotation consistent between the choreography descriptions and the Service annotations in the examples. Created a SamplesGuide to explain how to install/configure/use the examples. Moved the enhanced trailblazer guide into the docs folder.
Added: cdl/trunk/docs/cdl/user/TrailblazerGuide.odt
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/docs/cdl/user/TrailblazerGuide.odt
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: cdl/trunk/docs/cdl/user/TrailblazerGuide.pdf
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/docs/cdl/user/TrailblazerGuide.pdf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: cdl/trunk/samples/jbossesb/SamplesGuide.odt
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/samples/jbossesb/SamplesGuide.odt
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: cdl/trunk/samples/jbossesb/SamplesGuide.pdf
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/samples/jbossesb/SamplesGuide.pdf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm 2008-09-10 10:33:15 UTC (rev 320)
+++ cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm 2008-09-10 16:17:21 UTC (rev 321)
@@ -1,112 +1,118 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.pi4soa.cdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.pi4soa.cdl="http:///org/pi4soa/cdl.ecore" description="The choreography description for ESBBroker" name="ESBBroker" author="gary" version="0.2" targetNamespace="http://www.pi4soa.org/ESBBroker">
- <typeDefinitions>
- <nameSpaces description="Target Namespace for ESBBroker" prefix="tns" uRI="http://www.pi4soa.org/ESBBroker"/>
- <nameSpaces description="XML Schema Namespace" prefix="xsd" uRI="http://www.w3.org/2001/XMLSchema"/>
- <informationTypes description="This is the information type BookingReference" name="BookingReference" elementName="bookingReference"/>
- <informationTypes description="This is the information type Buy" name="Buy" elementName="buy"/>
- <informationTypes description="This is the information type Cancel" name="Cancel" elementName="cancel"/>
- <informationTypes description="This is the information type CreditInformation" name="CreditInformation" elementName="creditInformation"/>
- <informationTypes description="This is the information type CreditInvalid" name="CreditInvalid" elementName="creditInvalid"/>
- <informationTypes description="This is the information type CreditValid" name="CreditValid" elementName="creditValid"/>
- <informationTypes description="This is the information type Enquiry" name="Enquiry" typeName="" elementName="enquiry"/>
- <informationTypes description="This is the information type OrderConfirmed" name="OrderConfirmed" elementName="orderConfirmed"/>
- <informationTypes description="This is the information type OrderRejected" name="OrderRejected" elementName="orderRejected"/>
- <informationTypes description="This is the information type Quote" name="Quote" elementName="quote"/>
- <informationTypes description="This is the information type QuoteList" name="QuoteList" elementName="quoteList"/>
- <informationTypes description="This is the information type RequestForQuote" name="RequestForQuote" elementName="requestForQuote"/>
- <informationTypes description="This is the information type URIType" name="URIType"/>
- <tokens description="This is the token URI" name="URI" informationType="//@typeDefinitions/(a)informationTypes.12"/>
- <roleTypes description="This is the role type Broker" name="Broker">
- <behaviors description="This is the behavior BrokerBehavior" name="BrokerBehavior"/>
- </roleTypes>
- <roleTypes description="This is the role type Buyer" name="Buyer">
- <behaviors description="This is the behavior BuyerBehavior" name="BuyerBehavior"/>
- </roleTypes>
- <roleTypes description="This is the role type CreditAgency" name="CreditAgency">
- <behaviors description="This is the behavior CreditAgencyBehavior" name="CreditAgencyBehavior"/>
- </roleTypes>
- <roleTypes description="This is the role type Supplier" name="Supplier">
- <behaviors description="This is the behavior SupplierBehavior" name="SupplierBehavior"/>
- </roleTypes>
- <relationshipTypes description="Relationship between Broker and CreditAgency" name="BrokerToCreditAgencyRel" firstRoleType="//@typeDefinitions/(a)roleTypes.0" secondRoleType="//@typeDefinitions/(a)roleTypes.2"/>
- <relationshipTypes description="Relationship between Broker and Supplier" name="BrokerToSupplierRel" firstRoleType="//@typeDefinitions/(a)roleTypes.0" secondRoleType="//@typeDefinitions/(a)roleTypes.3"/>
- <relationshipTypes description="Relationship between Buyer and Broker" name="BuyerToBrokerRel" firstRoleType="//@typeDefinitions/(a)roleTypes.1" secondRoleType="//@typeDefinitions/(a)roleTypes.0"/>
- <participantTypes description="This is the participant type Broker" name="Broker" roleTypes="//@typeDefinitions/(a)roleTypes.0">
- <semanticAnnotations annotation="jboss.overlord.samples.LoanBroker@Broker" name="conversationType"/>
- </participantTypes>
- <participantTypes description="This is the participant type Buyer" name="Buyer" roleTypes="//@typeDefinitions/(a)roleTypes.1"/>
- <participantTypes description="This is the participant type CreditAgency" name="CreditAgency" roleTypes="//@typeDefinitions/(a)roleTypes.2"/>
- <participantTypes description="This is the participant type Supplier" name="Supplier" roleTypes="//@typeDefinitions/(a)roleTypes.3"/>
- <channelTypes description="This is the channel type BrokerChannelType" name="BrokerChannelType" referenceToken="//@typeDefinitions/(a)tokens.0" roleType="//@typeDefinitions/(a)roleTypes.0"/>
- <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken="//@typeDefinitions/(a)tokens.0" roleType="//@typeDefinitions/(a)roleTypes.2"/>
- <channelTypes description="This is the channel type SupplierChannelType" name="SupplierChannelType" referenceToken="//@typeDefinitions/(a)tokens.0" roleType="//@typeDefinitions/(a)roleTypes.3"/>
- </typeDefinitions>
- <choreographies description="Choreography flow for the ESBBroker process" name="ESBBrokerProcess" root="true">
- <enclosedChoreographies name="CompleteTransaction">
- <variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type="//@typeDefinitions/(a)channelTypes.0" free="true" roleTypes="//@typeDefinitions/(a)roleTypes.0 //@typeDefinitions/(a)roleTypes.1"/>
- <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type="//@typeDefinitions/(a)channelTypes.1"/>
- <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/(a)channelTypes.2"/>
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2">
- <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Buy" name="BuyRequestExchange" type="//@typeDefinitions/(a)informationTypes.1"/>
- </activities>
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCredit" operation="checkCredit" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0">
- <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CheckCredit" name="CheckCreditRequestExchange" type="//@typeDefinitions/(a)informationTypes.3"/>
- </activities>
- <activities xsi:type="org.pi4soa.cdl:Choice" description="Evaluate Credit Check Result">
- <activities xsi:type="org.pi4soa.cdl:Sequence" description="Sufficient Credit">
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCreditResponse" operation="checkCredit" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0">
- <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CheckCreditResponse" name="CheckCreditResponseRespondExchange" type="//@typeDefinitions/(a)informationTypes.5" action="Respond"/>
- </activities>
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="ConfirmBooking" operation="confirm" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.2" relationship="//@typeDefinitions/(a)relationshipTypes.1">
- <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type="//@typeDefinitions/(a)informationTypes.7"/>
- <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type="//@typeDefinitions/(a)informationTypes.0" action="Respond"/>
- </activities>
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2">
- <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type="//@typeDefinitions/(a)informationTypes.0" action="Respond" faultName=""/>
- </activities>
- </activities>
- <activities xsi:type="org.pi4soa.cdl:Sequence" description="Insufficient Credit">
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCreditFailed" operation="checkCredit" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0">
- <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CheckCreditFailed" name="CheckCreditFailedRespondExchange" type="//@typeDefinitions/(a)informationTypes.4" action="Respond" faultName="invalidCredit"/>
- </activities>
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2">
- <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type="//@typeDefinitions/(a)informationTypes.8" action="Respond" faultName="rejected"/>
- </activities>
- </activities>
- </activities>
- </enclosedChoreographies>
- <enclosedChoreographies name="RequestForQuote">
- <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/(a)channelTypes.2"/>
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="RFQ" operation="getQuote" channelVariable="//@choreographies.0/@enclosedChoreographies.1/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1">
- <exchangeDetails description="This is the exchange details for the request exchange associated with interaction RFQ" name="RFQRequestExchange" type="//@typeDefinitions/(a)informationTypes.11"/>
- <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction RFQ" name="RFQRespondExchange" type="//@typeDefinitions/(a)informationTypes.9" action="Respond"/>
- </activities>
- </enclosedChoreographies>
- <variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type="//@typeDefinitions/(a)channelTypes.0" roleTypes="//@typeDefinitions/(a)roleTypes.0 //@typeDefinitions/(a)roleTypes.1"/>
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2">
- <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Enquiry" name="EnquiryRequestExchange" type="//@typeDefinitions/(a)informationTypes.6"/>
- </activities>
- <activities xsi:type="org.pi4soa.cdl:While" name="SendRFQToSuppliers">
- <activities xsi:type="org.pi4soa.cdl:Perform" choreography="//@choreographies.0/(a)enclosedChoreographies.1" waitForCompletion="false"/>
- </activities>
- <activities xsi:type="org.pi4soa.cdl:When" name="WhenQuotesReceivedOrTimeout">
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2">
- <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Enquiry" name="EnquiryRespondExchange" type="//@typeDefinitions/(a)informationTypes.10" action="Respond"/>
- </activities>
- </activities>
- <activities xsi:type="org.pi4soa.cdl:Choice">
- <activities xsi:type="org.pi4soa.cdl:Sequence">
- <activities xsi:type="org.pi4soa.cdl:Perform" choreography="//@choreographies.0/(a)enclosedChoreographies.0">
- <bindDetails name="BindBrokerChannel" thisVariable="//@choreographies.0/(a)variableDefinitions.0" thisRole="//@typeDefinitions/(a)roleTypes.1" freeVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" freeRole="//@typeDefinitions/(a)roleTypes.1"/>
- <bindDetails name="BindBrokerChannel" thisVariable="//@choreographies.0/(a)variableDefinitions.0" thisRole="//@typeDefinitions/(a)roleTypes.0" freeVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" freeRole="//@typeDefinitions/(a)roleTypes.0"/>
- </activities>
- </activities>
- <activities xsi:type="org.pi4soa.cdl:Sequence">
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="Cancel" operation="cancel" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2">
- <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Cancel" name="CancelRequestExchange" type="//@typeDefinitions/(a)informationTypes.2"/>
- </activities>
- </activities>
- </activities>
- </choreographies>
-</org.pi4soa.cdl:Package>
+<?xml version="1.0" encoding="Cp1252"?>
+<org.pi4soa.cdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.pi4soa.cdl="http:///org/pi4soa/cdl.ecore" description="The choreography description for ESBBroker" name="ESBBroker" author="gary" version="0.2" targetNamespace="http://www.pi4soa.org/ESBBroker">
+ <typeDefinitions>
+ <nameSpaces description="Target Namespace for ESBBroker" prefix="tns" uRI="http://www.pi4soa.org/ESBBroker"/>
+ <nameSpaces description="XML Schema Namespace" prefix="xsd" uRI="http://www.w3.org/2001/XMLSchema"/>
+ <informationTypes description="This is the information type BookingReference" name="BookingReference" elementName="bookingReference"/>
+ <informationTypes description="This is the information type Buy" name="Buy" elementName="buy"/>
+ <informationTypes description="This is the information type Cancel" name="Cancel" elementName="cancel"/>
+ <informationTypes description="This is the information type CreditInformation" name="CreditInformation" elementName="creditInformation"/>
+ <informationTypes description="This is the information type CreditInvalid" name="CreditInvalid" elementName="creditInvalid"/>
+ <informationTypes description="This is the information type CreditValid" name="CreditValid" elementName="creditValid"/>
+ <informationTypes description="This is the information type Enquiry" name="Enquiry" typeName="" elementName="enquiry"/>
+ <informationTypes description="This is the information type OrderConfirmed" name="OrderConfirmed" elementName="orderConfirmed"/>
+ <informationTypes description="This is the information type OrderRejected" name="OrderRejected" elementName="orderRejected"/>
+ <informationTypes description="This is the information type Quote" name="Quote" elementName="quote"/>
+ <informationTypes description="This is the information type QuoteList" name="QuoteList" elementName="quoteList"/>
+ <informationTypes description="This is the information type RequestForQuote" name="RequestForQuote" elementName="requestForQuote"/>
+ <informationTypes description="This is the information type URIType" name="URIType"/>
+ <tokens description="This is the token URI" name="URI" informationType="//@typeDefinitions/(a)informationTypes.12"/>
+ <roleTypes description="This is the role type Broker" name="Broker">
+ <behaviors description="This is the behavior BrokerBehavior" name="BrokerBehavior"/>
+ </roleTypes>
+ <roleTypes description="This is the role type Buyer" name="Buyer">
+ <behaviors description="This is the behavior BuyerBehavior" name="BuyerBehavior"/>
+ </roleTypes>
+ <roleTypes description="This is the role type CreditAgency" name="CreditAgency">
+ <behaviors description="This is the behavior CreditAgencyBehavior" name="CreditAgencyBehavior"/>
+ </roleTypes>
+ <roleTypes description="This is the role type Supplier" name="Supplier">
+ <behaviors description="This is the behavior SupplierBehavior" name="SupplierBehavior"/>
+ </roleTypes>
+ <relationshipTypes description="Relationship between Broker and CreditAgency" name="BrokerToCreditAgencyRel" firstRoleType="//@typeDefinitions/(a)roleTypes.0" secondRoleType="//@typeDefinitions/(a)roleTypes.2"/>
+ <relationshipTypes description="Relationship between Broker and Supplier" name="BrokerToSupplierRel" firstRoleType="//@typeDefinitions/(a)roleTypes.0" secondRoleType="//@typeDefinitions/(a)roleTypes.3"/>
+ <relationshipTypes description="Relationship between Buyer and Broker" name="BuyerToBrokerRel" firstRoleType="//@typeDefinitions/(a)roleTypes.1" secondRoleType="//@typeDefinitions/(a)roleTypes.0"/>
+ <participantTypes description="This is the participant type Broker" name="Broker" roleTypes="//@typeDefinitions/(a)roleTypes.0">
+ <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker@Broker" name="conversationType"/>
+ </participantTypes>
+ <participantTypes description="This is the participant type Buyer" name="Buyer" roleTypes="//@typeDefinitions/(a)roleTypes.1">
+ <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker@Buyer" name="conversationType"/>
+ </participantTypes>
+ <participantTypes description="This is the participant type CreditAgency" name="CreditAgency" roleTypes="//@typeDefinitions/(a)roleTypes.2">
+ <semanticAnnotations annotation="overlord.cdl.samples.Common@CreditAgency" name="conversationType"/>
+ </participantTypes>
+ <participantTypes description="This is the participant type Supplier" name="Supplier" roleTypes="//@typeDefinitions/(a)roleTypes.3">
+ <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker@Supplier" name="conversationType"/>
+ </participantTypes>
+ <channelTypes description="This is the channel type BrokerChannelType" name="BrokerChannelType" referenceToken="//@typeDefinitions/(a)tokens.0" roleType="//@typeDefinitions/(a)roleTypes.0"/>
+ <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken="//@typeDefinitions/(a)tokens.0" roleType="//@typeDefinitions/(a)roleTypes.2"/>
+ <channelTypes description="This is the channel type SupplierChannelType" name="SupplierChannelType" referenceToken="//@typeDefinitions/(a)tokens.0" roleType="//@typeDefinitions/(a)roleTypes.3"/>
+ </typeDefinitions>
+ <choreographies description="Choreography flow for the ESBBroker process" name="ESBBrokerProcess" root="true">
+ <enclosedChoreographies name="CompleteTransaction">
+ <variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type="//@typeDefinitions/(a)channelTypes.0" free="true" roleTypes="//@typeDefinitions/(a)roleTypes.0 //@typeDefinitions/(a)roleTypes.1"/>
+ <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type="//@typeDefinitions/(a)channelTypes.1"/>
+ <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/(a)channelTypes.2"/>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2">
+ <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Buy" name="BuyRequestExchange" type="//@typeDefinitions/(a)informationTypes.1"/>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCredit" operation="checkCredit" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0">
+ <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CheckCredit" name="CheckCreditRequestExchange" type="//@typeDefinitions/(a)informationTypes.3"/>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Choice" description="Evaluate Credit Check Result">
+ <activities xsi:type="org.pi4soa.cdl:Sequence" description="Sufficient Credit">
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCreditResponse" operation="checkCredit" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0">
+ <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CheckCreditResponse" name="CheckCreditResponseRespondExchange" type="//@typeDefinitions/(a)informationTypes.5" action="Respond"/>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="ConfirmBooking" operation="confirm" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.2" relationship="//@typeDefinitions/(a)relationshipTypes.1">
+ <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type="//@typeDefinitions/(a)informationTypes.7"/>
+ <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type="//@typeDefinitions/(a)informationTypes.0" action="Respond"/>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2">
+ <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type="//@typeDefinitions/(a)informationTypes.0" action="Respond" faultName=""/>
+ </activities>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Sequence" description="Insufficient Credit">
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCreditFailed" operation="checkCredit" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0">
+ <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CheckCreditFailed" name="CheckCreditFailedRespondExchange" type="//@typeDefinitions/(a)informationTypes.4" action="Respond" faultName="invalidCredit"/>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2">
+ <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type="//@typeDefinitions/(a)informationTypes.8" action="Respond" faultName="rejected"/>
+ </activities>
+ </activities>
+ </activities>
+ </enclosedChoreographies>
+ <enclosedChoreographies name="RequestForQuote">
+ <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/(a)channelTypes.2"/>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="RFQ" operation="getQuote" channelVariable="//@choreographies.0/@enclosedChoreographies.1/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1">
+ <exchangeDetails description="This is the exchange details for the request exchange associated with interaction RFQ" name="RFQRequestExchange" type="//@typeDefinitions/(a)informationTypes.11"/>
+ <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction RFQ" name="RFQRespondExchange" type="//@typeDefinitions/(a)informationTypes.9" action="Respond"/>
+ </activities>
+ </enclosedChoreographies>
+ <variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type="//@typeDefinitions/(a)channelTypes.0" roleTypes="//@typeDefinitions/(a)roleTypes.0 //@typeDefinitions/(a)roleTypes.1"/>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2">
+ <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Enquiry" name="EnquiryRequestExchange" type="//@typeDefinitions/(a)informationTypes.6"/>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:While" name="SendRFQToSuppliers">
+ <activities xsi:type="org.pi4soa.cdl:Perform" choreography="//@choreographies.0/(a)enclosedChoreographies.1" waitForCompletion="false"/>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:When" name="WhenQuotesReceivedOrTimeout">
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2">
+ <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Enquiry" name="EnquiryRespondExchange" type="//@typeDefinitions/(a)informationTypes.10" action="Respond"/>
+ </activities>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Choice">
+ <activities xsi:type="org.pi4soa.cdl:Sequence">
+ <activities xsi:type="org.pi4soa.cdl:Perform" choreography="//@choreographies.0/(a)enclosedChoreographies.0">
+ <bindDetails name="BindBrokerChannel" thisVariable="//@choreographies.0/(a)variableDefinitions.0" thisRole="//@typeDefinitions/(a)roleTypes.1" freeVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" freeRole="//@typeDefinitions/(a)roleTypes.1"/>
+ <bindDetails name="BindBrokerChannel" thisVariable="//@choreographies.0/(a)variableDefinitions.0" thisRole="//@typeDefinitions/(a)roleTypes.0" freeVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" freeRole="//@typeDefinitions/(a)roleTypes.0"/>
+ </activities>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Sequence">
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="Cancel" operation="cancel" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2">
+ <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Cancel" name="CancelRequestExchange" type="//@typeDefinitions/(a)informationTypes.2"/>
+ </activities>
+ </activities>
+ </activities>
+ </choreographies>
+</org.pi4soa.cdl:Package>
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java 2008-09-10 10:33:15 UTC (rev 320)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java 2008-09-10 16:17:21 UTC (rev 321)
@@ -23,7 +23,7 @@
import org.jboss.soa.overlord.jbossesb.actions.Service;
-@Service(name="{http://www.jboss.org/overlord/purchase}CreditAgency", conversationType="overlord.cdl.samples.purchasing@CreditAgency",root=true)
+@Service(name="{http://www.jboss.org/overlord/purchase}CreditAgency", conversationType="overlord.cdl.samples.Common@CreditAgency",root=true)
public class CreditAgencyPurchase implements Serializable {
private long id;
Modified: cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm 2008-09-10 10:33:15 UTC (rev 320)
+++ cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm 2008-09-10 16:17:21 UTC (rev 321)
@@ -31,13 +31,13 @@
<relationshipTypes description="Relationship between Buyer and Store" name="BuyerToStoreRel" firstRoleType="//@typeDefinitions/(a)roleTypes.0" secondRoleType="//@typeDefinitions/(a)roleTypes.2"/>
<relationshipTypes description="Relationship between Store and CreditAgency" name="StoreToCreditAgencyRel" firstRoleType="//@typeDefinitions/(a)roleTypes.2" secondRoleType="//@typeDefinitions/(a)roleTypes.1"/>
<participantTypes description="This is the participant type Buyer" name="Buyer" roleTypes="//@typeDefinitions/(a)roleTypes.0">
- <semanticAnnotations annotation="jboss.overlord.samples.Purchasing@Buyer" name="conversationType"/>
+ <semanticAnnotations annotation="overlord.cdl.samples.Purchasing@Buyer" name="conversationType"/>
</participantTypes>
<participantTypes description="This is the participant type CreditAgency" name="CreditAgency" roleTypes="//@typeDefinitions/(a)roleTypes.1">
- <semanticAnnotations annotation="jboss.overlord.samples.Purchasing@CreditAgency" name="conversationType"/>
+ <semanticAnnotations annotation="overlord.cdl.samples.Common@CreditAgency" name="conversationType"/>
</participantTypes>
<participantTypes description="This is the participant type Store" name="Store" roleTypes="//@typeDefinitions/(a)roleTypes.2">
- <semanticAnnotations annotation="jboss.overlord.samples.Purchasing@Store" name="conversationType"/>
+ <semanticAnnotations annotation="overlord.cdl.samples.Purchasing@Store" name="conversationType"/>
</participantTypes>
<channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken="//@typeDefinitions/(a)tokens.1" roleType="//@typeDefinitions/(a)roleTypes.1">
<identities description="ID" tokens="//@typeDefinitions/(a)tokens.0"/>
Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/PurchaseGoods.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/PurchaseGoods.java 2008-09-10 10:33:15 UTC (rev 320)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/PurchaseGoods.java 2008-09-10 16:17:21 UTC (rev 321)
@@ -23,7 +23,7 @@
import org.jboss.soa.overlord.jbossesb.actions.Service;
-@Service(name="{http://www.jboss.org/overlord/purchase}Store", conversationType="overlord.cdl.samples.purchasing@Store", root=true)
+@Service(name="{http://www.jboss.org/overlord/purchase}Store", conversationType="overlord.cdl.samples.Purchasing@Store", root=true)
public class PurchaseGoods implements Serializable{
private long id;
Modified: cdl/trunk/samples/jbossesb/trailblazer/readme.txt
===================================================================
--- cdl/trunk/samples/jbossesb/trailblazer/readme.txt 2008-09-10 10:33:15 UTC (rev 320)
+++ cdl/trunk/samples/jbossesb/trailblazer/readme.txt 2008-09-10 16:17:21 UTC (rev 321)
@@ -7,6 +7,7 @@
- A mail server to send email notifications
- JBoss AS 4.2.1 or higher with EJB3 and JBossWS support. You can install the latest JBoss AS JEMS installer and select the "EJB3" install config to get the right one installed.
- JBoss AS 4.2.1 or higher with the JBoss ESB SAR deployment (jbossesb.sar).
+- JBossESB 4.3 or higher
Settings required to edit before running:
@@ -14,7 +15,7 @@
- Update the section titled "transports" and specify all of the SMTP mail server settings for your environment.
File : deployment.properties (install/deployment.properties)
-- Update the app server location settings.
+- Update the JBossAS and JBossESB location settings.
File : trailblazer.properties (TB_ROOT/trailblazer.properties)
- Update the file.bank.monitored.directory and file.output.directory properties' value properly.
15 years, 8 months
Overlord SVN: r320 - cdl/trunk/distribution/src/main/release/install.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2008-09-10 06:33:15 -0400 (Wed, 10 Sep 2008)
New Revision: 320
Modified:
cdl/trunk/distribution/src/main/release/install/build.xml
Log:
Updated to remove the 'jbossesb' from the ant deploy/undeploy targets
Modified: cdl/trunk/distribution/src/main/release/install/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/install/build.xml 2008-09-10 08:31:40 UTC (rev 319)
+++ cdl/trunk/distribution/src/main/release/install/build.xml 2008-09-10 10:33:15 UTC (rev 320)
@@ -1,57 +1,57 @@
-<project name="Overlord_CDL_Installer" default="deploy" basedir=".">
-
- <!-- Set deployment properties filename -->
- <property name="org.jboss.esb.deployment.properties" location="deployment.properties"/>
-
- <!-- Load Build Properties File -->
- <property file="${org.jboss.esb.deployment.properties}"/>
-
- <property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
- <property name="conf.dir" value="${server.dir}/conf"/>
- <property name="deploy.dir" value="${server.dir}/deploy"/>
- <property name="server.lib.dir" value="${server.dir}/lib"/>
-
- <property name="modules" value="../modules" />
-
- <target name="check.deploy.props">
- <condition property="esb.server.configured">
- <and>
- <isset property="org.jboss.esb.server.home"/>
- <isset property="org.jboss.esb.server.config"/>
- </and>
- </condition>
-
- <fail unless="esb.server.configured" message="Cannot determine target deployment, please check deployment.properties"/>
- </target>
-
- <target name="deploy-cdl-runtime-jbossesb" description="Deploys Overlord CDL JBossESB Runtime to the server">
- <echo message="unpack cdl-runtime-jbossesb runtime to JBoss ESB server" />
- <unzip src="${modules}/jbossesb-assembly-1.0-SNAPSHOT.esb" dest="${deploy.dir}/overlord-cdl-runtime.esb" />
- </target>
-
- <target name="undeploy-cdl-runtime-jbossesb" description="Undeploys Overlord CDL JBossESB Runtime">
- <echo message="Remove the overlord-cdl-runtime.esb from JBoss ESB server" />
- <delete dir="${deploy.dir}/overlord-cdl-runtime.esb" />
- </target>
-
- <target name="deploy-cdl-validator-jbossesb" depends="check.deploy.props" description="Deploys Overlord CDL JBossESB validator to the server">
- <echo message="Deploy Overlord CDL JBossESB validator" />
- <ant dir="${modules}/validator-jbossesb-1.0-SNAPSHOT" target="deploy">
- <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
- <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
- </ant>
- </target>
-
- <target name="undeploy-cdl-validator-jbossesb" depends="check.deploy.props" description="Undeploys Overlord CDL JBossESB validator to the server">
- <echo message="Undeploy Overlord CDL JBossESB validator" />
- <ant dir="${modules}/validator-jbossesb-1.0-SNAPSHOT" target="undeploy">
- <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
- <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
- </ant>
- </target>
-
- <target name="deploy" depends="deploy-cdl-runtime-jbossesb, deploy-cdl-validator-jbossesb" description="Deploy Overlord CDL components."/>
-
- <target name="undeploy" depends="undeploy-cdl-runtime-jbossesb, undeploy-cdl-validator-jbossesb" description="Undeploy Overlord CDL components."/>
-
-</project>
+<project name="Overlord_CDL_Installer" default="deploy" basedir=".">
+
+ <!-- Set deployment properties filename -->
+ <property name="org.jboss.esb.deployment.properties" location="deployment.properties"/>
+
+ <!-- Load Build Properties File -->
+ <property file="${org.jboss.esb.deployment.properties}"/>
+
+ <property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
+ <property name="conf.dir" value="${server.dir}/conf"/>
+ <property name="deploy.dir" value="${server.dir}/deploy"/>
+ <property name="server.lib.dir" value="${server.dir}/lib"/>
+
+ <property name="modules" value="../modules" />
+
+ <target name="check.deploy.props">
+ <condition property="esb.server.configured">
+ <and>
+ <isset property="org.jboss.esb.server.home"/>
+ <isset property="org.jboss.esb.server.config"/>
+ </and>
+ </condition>
+
+ <fail unless="esb.server.configured" message="Cannot determine target deployment, please check deployment.properties"/>
+ </target>
+
+ <target name="deploy-cdl-runtime" description="Deploys Overlord CDL Runtime to the server">
+ <echo message="unpack overlord cdl runtime to JBoss ESB server" />
+ <unzip src="${modules}/jbossesb-assembly-1.0-SNAPSHOT.esb" dest="${deploy.dir}/overlord-cdl-runtime.esb" />
+ </target>
+
+ <target name="undeploy-cdl-runtime" description="Undeploys Overlord CDL Runtime">
+ <echo message="Remove the overlord-cdl-runtime.esb from JBoss ESB server" />
+ <delete dir="${deploy.dir}/overlord-cdl-runtime.esb" />
+ </target>
+
+ <target name="deploy-cdl-validator" depends="check.deploy.props" description="Deploys Overlord CDL validator to the server">
+ <echo message="Deploy Overlord CDL validator" />
+ <ant dir="${modules}/validator-jbossesb-1.0-SNAPSHOT" target="deploy">
+ <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
+ <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
+ </ant>
+ </target>
+
+ <target name="undeploy-cdl-validator" depends="check.deploy.props" description="Undeploys Overlord CDL validator to the server">
+ <echo message="Undeploy Overlord CDL validator" />
+ <ant dir="${modules}/validator-jbossesb-1.0-SNAPSHOT" target="undeploy">
+ <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
+ <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
+ </ant>
+ </target>
+
+ <target name="deploy" depends="deploy-cdl-runtime, deploy-cdl-validator" description="Deploy Overlord CDL components."/>
+
+ <target name="undeploy" depends="undeploy-cdl-runtime, undeploy-cdl-validator" description="Undeploy Overlord CDL components."/>
+
+</project>
15 years, 8 months
Overlord SVN: r319 - cdl/trunk/distribution/src/main/release/install.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2008-09-10 04:31:40 -0400 (Wed, 10 Sep 2008)
New Revision: 319
Modified:
cdl/trunk/distribution/src/main/release/install/build.xml
Log:
* Take out the jbossesb when deploy to JBossESB server.
Modified: cdl/trunk/distribution/src/main/release/install/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/install/build.xml 2008-09-10 08:17:38 UTC (rev 318)
+++ cdl/trunk/distribution/src/main/release/install/build.xml 2008-09-10 08:31:40 UTC (rev 319)
@@ -26,12 +26,12 @@
<target name="deploy-cdl-runtime-jbossesb" description="Deploys Overlord CDL JBossESB Runtime to the server">
<echo message="unpack cdl-runtime-jbossesb runtime to JBoss ESB server" />
- <unzip src="${modules}/jbossesb-assembly-1.0-SNAPSHOT.esb" dest="${deploy.dir}/overlord-cdl-runtime-jbossesb.esb" />
+ <unzip src="${modules}/jbossesb-assembly-1.0-SNAPSHOT.esb" dest="${deploy.dir}/overlord-cdl-runtime.esb" />
</target>
<target name="undeploy-cdl-runtime-jbossesb" description="Undeploys Overlord CDL JBossESB Runtime">
- <echo message="Remove the overlord-cdl-runtime-jbossesb.esb from JBoss ESB server" />
- <delete dir="${deploy.dir}/overlord-cdl-runtime-jbossesb.esb" />
+ <echo message="Remove the overlord-cdl-runtime.esb from JBoss ESB server" />
+ <delete dir="${deploy.dir}/overlord-cdl-runtime.esb" />
</target>
<target name="deploy-cdl-validator-jbossesb" depends="check.deploy.props" description="Deploys Overlord CDL JBossESB validator to the server">
15 years, 8 months
Overlord SVN: r318 - cdl/trunk/samples/jbossesb/trailblazer/banks.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2008-09-10 04:17:38 -0400 (Wed, 10 Sep 2008)
New Revision: 318
Modified:
cdl/trunk/samples/jbossesb/trailblazer/banks/build.xml
Log:
* Update trailblazer banks build.xml to make it work.
Modified: cdl/trunk/samples/jbossesb/trailblazer/banks/build.xml
===================================================================
--- cdl/trunk/samples/jbossesb/trailblazer/banks/build.xml 2008-09-08 20:21:32 UTC (rev 317)
+++ cdl/trunk/samples/jbossesb/trailblazer/banks/build.xml 2008-09-10 08:17:38 UTC (rev 318)
@@ -1,9 +1,12 @@
<project name="BANKS" default="compile" basedir=".">
<property file="../trailblazer.properties"/>
+ <property name="install.dir" value="../../../install"/>
+ <property file="${install.dir}/deployment.properties"/>
+
<!-- Some default build locations -->
- <property name="org.jboss.esb.ext.lib.dir" value="../../../lib/ext"/>
+ <property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.home}/lib/ext"/>
<property name="org.jboss.esb.samples.loanbroker.banks.dest" value="${basedir}/build"/>
<property name="org.jboss.esb.samples.loanbroker.banks.classes.dir" value="${basedir}/build/classes/banks/"/>
<property name="org.jboss.esb.samples.loanbroker.banks.testclasses.dir" value="${basedir}/build/classes/tests/"/>
@@ -15,11 +18,11 @@
<path id="org.jboss.esb.samples.loanbroker.banks.classpath">
<fileset dir="${org.jboss.esb.samples.loanbroker.banks.lib.ext.dir}" includes="*.jar"/>
- <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="log4j.jar jbossall-client.jar xstream-1.1.3.jar junit-4.1.jar"/>
+ <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
</path>
<path id="org.jboss.esb.samples.loanbroker.banks.testclasspath">
<fileset dir="${org.jboss.esb.samples.loanbroker.banks.lib.ext.dir}" includes="*.jar"/>
- <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="log4j.jar jbossall-client.jar xstream-1.1.3.jar junit-4.1.jar"/>
+ <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
<pathelement location="${org.jboss.esb.samples.loanbroker.banks.classes.dir}"/>
<pathelement location="${org.jboss.esb.samples.loanbroker.banks.testclasses.dir}"/>
<pathelement location="."/>
15 years, 8 months
Overlord SVN: r317 - cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2008-09-08 16:21:32 -0400 (Mon, 08 Sep 2008)
New Revision: 317
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java
Log:
Record source reference with issue.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java 2008-09-07 22:14:18 UTC (rev 316)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java 2008-09-08 20:21:32 UTC (rev 317)
@@ -646,6 +646,7 @@
*/
ShowReferencedDescription res=new ShowReferencedDescription();
res.setModel(m_source);
+ res.setSourceReference(issue.getModelObject().getSource());
issue.getResolutions().add(res);
@@ -668,7 +669,8 @@
ShowReferencedDescription res=new ShowReferencedDescription();
res.setModel(m_source);
-
+ res.setSourceReference(issue.getModelObject().getSource());
+
issue.getResolutions().add(res);
m_listener.warning(issue);
15 years, 8 months
Overlord SVN: r316 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb: model and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2008-09-07 18:14:18 -0400 (Sun, 07 Sep 2008)
New Revision: 316
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/editor/JBossESBConfigEditorManager.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java
Log:
Updated to reflect change in resolution mechanism.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/editor/JBossESBConfigEditorManager.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/editor/JBossESBConfigEditorManager.java 2008-09-07 16:03:45 UTC (rev 315)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/editor/JBossESBConfigEditorManager.java 2008-09-07 22:14:18 UTC (rev 316)
@@ -20,6 +20,7 @@
package org.jboss.tools.overlord.cdl.jbossesb.editor;
import org.scribble.extensions.RegistryInfo;
+import org.scribble.model.ModelReference;
import org.scribble.model.SourceRef;
import org.scribble.editor.AbstractEditorManager;
import org.scribble.editor.EditorManager;
@@ -33,16 +34,26 @@
public class JBossESBConfigEditorManager extends AbstractEditorManager {
/**
- * This method focuses the editor on the specified source
- * file, associated with the supplied URI, and the component
- * within that file, identified by the source reference.
+ * This method focuses the editor on the specified source,
+ * identified by the model reference and source reference.
*
- * @param uri The source file URI
- * @param ref The component source reference
+ * @param mref The model reference
+ * @param sref The component source reference
* @param prop Additional properties
*/
- public void focus(String uri, SourceRef ref,
+ public void focus(ModelReference mref, SourceRef sref,
java.util.Map<String,Object> props) {
+ String uri=null;
+ org.eclipse.core.resources.IFile file=
+ org.scribble.osgi.model.OSGIModelRepository.getFile(mref);
+
+ if (file == null || file.exists() == false) {
+ file = org.scribble.osgi.model.OSGIModelRepository.getGlobalFile(mref);
+ }
+
+ if (file != null && file.exists()) {
+ uri = file.getFullPath().toPortableString();
+ }
if (uri != null) {
org.eclipse.ui.IWorkbenchPage page=
@@ -65,8 +76,8 @@
org.eclipse.ui.texteditor.ITextEditor editor=
(org.eclipse.ui.texteditor.ITextEditor)part;
- editor.selectAndReveal(ref.getStartPosition(),
- ref.getEndPosition()-ref.getStartPosition());
+ editor.selectAndReveal(sref.getStartPosition(),
+ sref.getEndPosition()-sref.getStartPosition());
}
} catch(Exception e) {
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java 2008-09-07 16:03:45 UTC (rev 315)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java 2008-09-07 22:14:18 UTC (rev 316)
@@ -22,6 +22,7 @@
import org.scribble.conversation.model.*;
import org.scribble.extensions.RegistryFactory;
import org.scribble.model.*;
+import org.scribble.model.resolutions.*;
/**
* This class represents an ESB model.
@@ -631,6 +632,7 @@
public void error(ModelIssue issue) {
+ /*
issue.getProperties().put(ModelListener.RESOLUTIONS, ModelListener.SHOW_REFERENCE_DESCRIPTION_RESOLUTION);
issue.getProperties().put(ModelListener.REFERENCE_MODEL, m_source);
issue.getProperties().put(ModelListener.REFERENCE_MODEL_START_POSITION,
@@ -641,11 +643,17 @@
issue.getProperties().put(ModelListener.REFERENCE_MODEL_COMPONENT,
issue.getModelObject().getSource().getComponentURI());
}
+ */
+ ShowReferencedDescription res=new ShowReferencedDescription();
+ res.setModel(m_source);
+ issue.getResolutions().add(res);
+
m_listener.error(issue);
}
public void warning(ModelIssue issue) {
+ /*
issue.getProperties().put(ModelListener.RESOLUTIONS, ModelListener.SHOW_REFERENCE_DESCRIPTION_RESOLUTION);
issue.getProperties().put(ModelListener.REFERENCE_MODEL, m_source);
issue.getProperties().put(ModelListener.REFERENCE_MODEL_START_POSITION,
@@ -656,7 +664,13 @@
issue.getProperties().put(ModelListener.REFERENCE_MODEL_COMPONENT,
issue.getModelObject().getSource().getComponentURI());
}
+ */
+ ShowReferencedDescription res=new ShowReferencedDescription();
+ res.setModel(m_source);
+
+ issue.getResolutions().add(res);
+
m_listener.warning(issue);
}
15 years, 8 months
Overlord SVN: r315 - in cdl/trunk: distribution/src/main/release/install and 6 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2008-09-07 12:03:45 -0400 (Sun, 07 Sep 2008)
New Revision: 315
Modified:
cdl/trunk/distribution/src/main/assembly/bin.xml
cdl/trunk/distribution/src/main/release/install/build.xml
cdl/trunk/distribution/src/main/release/install/deployment.properties
cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml
cdl/trunk/samples/jbossesb/trailblazer/build.xml
cdl/trunk/samples/pom.xml
Log:
* update bin.xml to take out jbossesb folder in samples.
* update deployment.properties, so that trailblazer can reuse the libraries that existed in JBossESB.
Modified: cdl/trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- cdl/trunk/distribution/src/main/assembly/bin.xml 2008-09-07 14:17:02 UTC (rev 314)
+++ cdl/trunk/distribution/src/main/assembly/bin.xml 2008-09-07 16:03:45 UTC (rev 315)
@@ -42,8 +42,16 @@
<fileSet>
<directory>src/main/release</directory>
<outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
</fileSet>
+ <fileSet>
+ <directory>src/main/release/install</directory>
+ <outputDirectory>/install</outputDirectory>
+ </fileSet>
+
<fileSet>
<directory>../docs/cdl/user</directory>
<outputDirectory>docs</outputDirectory>
@@ -52,8 +60,13 @@
</includes>
</fileSet>
+ <fileSet>
+ <directory>src/main/release/samples/jbossesb</directory>
+ <outputDirectory>samples</outputDirectory>
+ </fileSet>
+
<fileSet>
- <directory>../samples</directory>
+ <directory>../samples/jbossesb</directory>
<outputDirectory>samples</outputDirectory>
<includes>
<include>**/*</include>
@@ -68,13 +81,12 @@
<exclude>**/target/**/*</exclude>
</excludes>
</fileSet>
-
</fileSets>
<dependencySets>
<dependencySet>
- <outputDirectory>samples/jbossesb/libs</outputDirectory>
+ <outputDirectory>samples/libs</outputDirectory>
<includes>
<include>org.jboss.soa.overlord.cdl.runtime:jbossesb</include>
<include>org.jboss.jbossesb:rosetta</include>
Modified: cdl/trunk/distribution/src/main/release/install/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/install/build.xml 2008-09-07 14:17:02 UTC (rev 314)
+++ cdl/trunk/distribution/src/main/release/install/build.xml 2008-09-07 16:03:45 UTC (rev 315)
@@ -2,7 +2,6 @@
<!-- Set deployment properties filename -->
<property name="org.jboss.esb.deployment.properties" location="deployment.properties"/>
- <property name="org.jboss.esb.deployment.deploy" location="deploy"/>
<!-- Load Build Properties File -->
<property file="${org.jboss.esb.deployment.properties}"/>
Modified: cdl/trunk/distribution/src/main/release/install/deployment.properties
===================================================================
--- cdl/trunk/distribution/src/main/release/install/deployment.properties 2008-09-07 14:17:02 UTC (rev 314)
+++ cdl/trunk/distribution/src/main/release/install/deployment.properties 2008-09-07 16:03:45 UTC (rev 315)
@@ -12,4 +12,6 @@
# The Configuration of JBoss AS to Use
# (e.g. default)
org.jboss.esb.server.config=default
-
+# The directory for JBossESB home
+# (e.g. /var/local/jbossesb-4.3.GA)
+org.jboss.esb.home=/var/local/jbossesb-4.3.GA
Modified: cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/build.xml 2008-09-07 14:17:02 UTC (rev 314)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/broker/build.xml 2008-09-07 16:03:45 UTC (rev 315)
@@ -2,6 +2,6 @@
<project name="broker" default="esbjar" basedir=".">
- <import file="../common_build.xml"/>
+ <import file="../../common_build.xml"/>
</project>
Modified: cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/build.xml 2008-09-07 14:17:02 UTC (rev 314)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/supplier/build.xml 2008-09-07 16:03:45 UTC (rev 315)
@@ -2,6 +2,6 @@
<project name="supplier" default="esbjar" basedir=".">
- <import file="../common_build.xml"/>
+ <import file="../../common_build.xml"/>
</project>
Modified: cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/build.xml 2008-09-07 14:17:02 UTC (rev 314)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/common/creditAgency/build.xml 2008-09-07 16:03:45 UTC (rev 315)
@@ -2,6 +2,6 @@
<project name="creditAgency" default="esbjar" basedir=".">
- <import file="../common_build.xml"/>
+ <import file="../../common_build.xml"/>
</project>
Modified: cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml 2008-09-07 14:17:02 UTC (rev 314)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml 2008-09-07 16:03:45 UTC (rev 315)
@@ -1,9 +1,14 @@
<project name="base-build" basedir=".">
+
+ <property file="../../../install/deployment.properties" />
+
<property name="build.dir" value="${basedir}/target" />
<property name="classes" value="${build.dir}/classes" />
- <property name="libs" value="../libs" />
+ <property name="libs" value="../../libs" />
<property name="src" value="src" />
-
+
+ <property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
+
<path id="compile-classpath">
<fileset dir="${libs}" includes="*.jar" />
</path>
@@ -17,7 +22,7 @@
</target>
<target name="compile" depends="init">
- <mkdir dir="${classes}" />
+ <mkdir dir="${classes}" />
<javac srcdir="${src}" destdir="${classes}" debug="true" deprecation="true">
<classpath refid="compile-classpath" />
</javac>
@@ -38,7 +43,11 @@
</target>
<target name="deploy" depends="esbjar">
- <copy todir="${org.jboss.esb.server.deploy.dir}"
+ <copy todir="${server.dir}/deploy"
file="${build.dir}/${ant.project.name}.esb"/>
</target>
+
+ <target name="undeploy">
+ <delete file="${server.dir}/deploy/${ant.project.name}.esb" />
+ </target>
</project>
Modified: cdl/trunk/samples/jbossesb/trailblazer/build.xml
===================================================================
--- cdl/trunk/samples/jbossesb/trailblazer/build.xml 2008-09-07 14:17:02 UTC (rev 314)
+++ cdl/trunk/samples/jbossesb/trailblazer/build.xml 2008-09-07 16:03:45 UTC (rev 315)
@@ -2,14 +2,12 @@
<!-- UPDATE THIS WITH YOUR JBOSS_HOME AND SERVER -->
<property name="trailblazer.dir" location="."/>
- <property name="esb.home.dir" value="${trailblazer.dir}/../.."/>
-
- <property name="install.dir" value="${esb.home.dir}/install"/>
+ <property name="install.dir" value="../../install"/>
<property file="${install.dir}/deployment.properties"/>
- <property name="org.jboss.esb.server.home" value="/home/jeffyu/deploy/jboss-4.2.2.GA"/>
- <property name="org.jboss.esb.server.config" value="default"/>
- <property name="trailblazer.dir" value="."/>
+ <property name="esb.home.dir" value="${org.jboss.esb.home}"/>
+ <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
+ <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
<!-- properties for the esb part of the trailblazer -->
<property name="esb.dest" value="${basedir}/esb/build"/>
Modified: cdl/trunk/samples/pom.xml
===================================================================
--- cdl/trunk/samples/pom.xml 2008-09-07 14:17:02 UTC (rev 314)
+++ cdl/trunk/samples/pom.xml 2008-09-07 16:03:45 UTC (rev 315)
@@ -21,10 +21,10 @@
<modules>
- <module>purchasing/store</module>
- <module>common/creditAgency</module>
- <module>brokerage/broker</module>
- <module>brokerage/supplier</module>
+ <module>jbossesb/purchasing/store</module>
+ <module>jbossesb/common/creditAgency</module>
+ <module>jbossesb/brokerage/broker</module>
+ <module>jbossesb/brokerage/supplier</module>
</modules>
<build>
15 years, 8 months