Overlord SVN: r389 - in cdl/trunk/docs/docbook: userguide and 1 other directory.
by overlord-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2008-10-18 10:10:48 -0400 (Sat, 18 Oct 2008)
New Revision: 389
Modified:
cdl/trunk/docs/docbook/samplesguide/pom.xml
cdl/trunk/docs/docbook/userguide/pom.xml
Log:
* Update pdf stylesheet, make it work under windows box.
Modified: cdl/trunk/docs/docbook/samplesguide/pom.xml
===================================================================
--- cdl/trunk/docs/docbook/samplesguide/pom.xml 2008-10-18 11:20:00 UTC (rev 388)
+++ cdl/trunk/docs/docbook/samplesguide/pom.xml 2008-10-18 14:10:48 UTC (rev 389)
@@ -59,7 +59,7 @@
<formats>
<format>
<formatName>pdf</formatName>
- <stylesheetResource>file://${basedir}/src/main/xslt/pdf.xsl</stylesheetResource>
+ <stylesheetResource>file:///${basedir}/src/main/xslt/pdf.xsl</stylesheetResource>
<finalName>SamplesGuide.pdf</finalName>
</format>
<format>
Modified: cdl/trunk/docs/docbook/userguide/pom.xml
===================================================================
--- cdl/trunk/docs/docbook/userguide/pom.xml 2008-10-18 11:20:00 UTC (rev 388)
+++ cdl/trunk/docs/docbook/userguide/pom.xml 2008-10-18 14:10:48 UTC (rev 389)
@@ -59,7 +59,7 @@
<formats>
<format>
<formatName>pdf</formatName>
- <stylesheetResource>file://${basedir}/src/main/xslt/pdf.xsl</stylesheetResource>
+ <stylesheetResource>file:///${basedir}/src/main/xslt/pdf.xsl</stylesheetResource>
<finalName>UserGuide.pdf</finalName>
</format>
<format>
15 years, 6 months
Overlord SVN: r388 - in cdl/trunk: docs/docbook/userguide/src/main/module and 7 other directories.
by overlord-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2008-10-18 07:20:00 -0400 (Sat, 18 Oct 2008)
New Revision: 388
Modified:
cdl/trunk/distribution/src/main/assembly/bin.xml
cdl/trunk/docs/docbook/userguide/src/main/module/conversation-aware-esb.xml
cdl/trunk/runtime/jbossesb/pom.xml
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/EPRWrapper.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/HibernateObject.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Identity.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/JoinState.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/ScheduleItem.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Session.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/SessionManager.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/CreateSessionAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/IfAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageProperties.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ParallelAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ScheduleStateAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SendMessageAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetMessageAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SwitchAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhenAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhileAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/ClassLoaderUtil.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/HibernateUtil.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/MessageUtil.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/NameSpaceUtil.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/XMLUtils.java
cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/soa/overlord/jbossesb/util/MVELUsageTest.java
cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/soa/overlord/jbossesb/util/XMLUtilsTest.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml
Log:
* Update the 'decision-method' to use 'expression' globally.
* Add javadoc for jbossesb actions module.
* Include the generated javadoc in distribution.
* Update the MessageRouterAction sample in the userguide.
Modified: cdl/trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- cdl/trunk/distribution/src/main/assembly/bin.xml 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/distribution/src/main/assembly/bin.xml 2008-10-18 11:20:00 UTC (rev 388)
@@ -58,14 +58,6 @@
<outputDirectory>/install</outputDirectory>
</fileSet>
- <fileSet>
- <directory>../docs/cdl/user</directory>
- <outputDirectory>docs</outputDirectory>
- <includes>
- <include>**/*.pdf</include>
- </includes>
- </fileSet>
-
<!-- Copy docbook generated documents -->
<fileSet>
<directory>../docs/docbook/userguide/target/docbook/publish/en-US</directory>
@@ -77,6 +69,10 @@
<outputDirectory>docs/samplesguide</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>../runtime/jbossesb/target/javadoc</directory>
+ <outputDirectory>docs/jbossesb-javadoc</outputDirectory>
+ </fileSet>
<!-- Copy samples -->
<fileSet>
<directory>src/main/release/samples/jbossesb</directory>
Modified: cdl/trunk/docs/docbook/userguide/src/main/module/conversation-aware-esb.xml
===================================================================
--- cdl/trunk/docs/docbook/userguide/src/main/module/conversation-aware-esb.xml 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/docs/docbook/userguide/src/main/module/conversation-aware-esb.xml 2008-10-18 11:20:00 UTC (rev 388)
@@ -82,18 +82,24 @@
<route service-category="ESBBroker.BrokerParticipant"
service-name="ESBBrokerProcess.main"
initiate="true">
- <identity type="primary" >
- <token name="id" locator="//@id" />
- </identity>
- <message type="enquiry" />
+ <message type="enquiry">
+ <identity type="primary" >
+ <token name="id" locator="//@id" />
+ </identity>
+ </message>
</route>
<route service-category="ESBBroker.BrokerParticipant"
service-name="ESBBrokerProcess.main.5" >
- <identity type="primary" >
- <token name="id" locator="//@id" />
- </identity>
- <message type="buy" />
- <message type="cancel" />
+ <message type="buy">
+ <identity type="primary" >
+ <token name="id" locator="//@id" />
+ </identity>
+ </message>
+ <message type="cancel">
+ <identity type="primary" >
+ <token name="id" locator="//@id" />
+ </identity>
+ </message>
</route>
</property>
</action>
Modified: cdl/trunk/runtime/jbossesb/pom.xml
===================================================================
--- cdl/trunk/runtime/jbossesb/pom.xml 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/pom.xml 2008-10-18 11:20:00 UTC (rev 388)
@@ -70,14 +70,47 @@
</dependency>
</dependencies>
- <reporting>
+ <build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doclet>org.jboss.apiviz.APIviz</doclet>
+ <docletArtifact>
+ <groupId>org.jboss.apiviz</groupId>
+ <artifactId>apiviz</artifactId>
+ <version>1.2.4.GA</version>
+ </docletArtifact>
+ <aggregate>true</aggregate>
+ <attach>false</attach>
+ <additionalparam>
+ -d ${project.build.directory}/javadoc
+ -charset UTF-8
+ -docencoding UTF-8
+ -version
+ -author
+ -breakiterator
+ -windowtitle "${project.name} ${project.version} API Reference"
+ -doctitle "${project.name} ${project.version} API Reference"
+ -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
+ -link http://java.sun.com/javase/6/docs/api/
+ -sourceclasspath ${project.build.outputDirectory}
+ </additionalparam>
+ <encoding>UTF-8</encoding>
+ <locale>en_US</locale>
+ </configuration>
+ </plugin>
</plugins>
- </reporting>
+ </build>
</project>
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/EPRWrapper.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/EPRWrapper.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/EPRWrapper.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -32,7 +32,7 @@
/**
*
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*
*/
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/HibernateObject.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/HibernateObject.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/HibernateObject.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -23,7 +23,7 @@
/**
*
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*
*/
public interface HibernateObject extends Serializable {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Identity.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Identity.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Identity.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -36,7 +36,7 @@
/**
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*/
@Entity
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/JoinState.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/JoinState.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/JoinState.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -30,7 +30,7 @@
/**
*
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*/
@Entity
@Table(name="CDL_JOIN_STATES")
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/ScheduleItem.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/ScheduleItem.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/ScheduleItem.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -30,7 +30,7 @@
/**
*
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*
*/
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Session.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Session.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Session.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -54,7 +54,7 @@
/**
*
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*/
@Entity
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/SessionManager.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/SessionManager.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/SessionManager.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -37,7 +37,7 @@
* of sessions.
*
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*/
public class SessionManager {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ActionProperties.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -24,7 +24,7 @@
* It defines the property name in the jboss-esb.xml.
*
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*/
public class ActionProperties {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ConversationAction.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -61,7 +61,7 @@
* </pre>
*
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*/
public abstract class ConversationAction extends AbstractActionLifecycle {
@@ -292,12 +292,6 @@
}
-
- protected String getMvelMethodName(String method) {
- return method + "()";
- }
-
-
protected void addScheduleItemToDeliver(String category, String name) {
for (ScheduleItem si : scheduleItems) {
if (category.equals(si.getCategory()) && name.equals(si.getName())) {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/CreateSessionAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/CreateSessionAction.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/CreateSessionAction.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -29,7 +29,7 @@
* This action creates a new session.
*
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*
*/
public class CreateSessionAction extends ConversationAction {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/IfAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/IfAction.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/IfAction.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -29,12 +29,13 @@
* based on the message that has occurred.
*
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*/
public class IfAction extends ConversationAction {
public static final String IF_STATEMENT = "if";
public static final String ELSE_STATEMENT = "else";
+ public static final String EXPRESSION = "expression";
private static Logger logger = Logger.getLogger(IfAction.class);
@@ -59,10 +60,10 @@
}
}
- String decisionMethod = ifConfig.getAttribute("decision-method");
- logger.debug("decision method is : " + decisionMethod);
- if (decisionMethod != null) {
- Object response = MVEL.eval(getMvelMethodName(decisionMethod), session.getBusinessObject());
+ String expression = ifConfig.getAttribute(EXPRESSION);
+ logger.debug("decision method is : " + expression);
+ if (expression != null) {
+ Object response = MVEL.eval(expression, session.getBusinessObject());
if (response instanceof Boolean) {
Boolean flag = (Boolean) response;
logger.info("The result of decision method is: " + flag);
@@ -71,13 +72,13 @@
String name = ifConfig.getAttribute(ActionProperties.SERVICE_NAME);
session.schedule(category, name, message);
addScheduleItemToDeliver(category, name);
- logger.info("Scheduled items of " + category + "/" + name + ".");
+ logger.info("Scheduled items of [" + category + "/" + name + "].");
} else if (elseConfig != null){
String category = elseConfig.getAttribute(ActionProperties.SERVICE_CATEGORY);
String name = elseConfig.getAttribute(ActionProperties.SERVICE_NAME);
session.schedule(category, name, message);
addScheduleItemToDeliver(category, name);
- logger.info("Scheduled items of " + category + "/" + name + ".");
+ logger.info("Scheduled items of [" + category + "/" + name + "].");
}
} else {
throw new Exception("method return value is not Boolean.");
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageProperties.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageProperties.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageProperties.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -23,7 +23,7 @@
* Define message constants.
*
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*
*/
public class MessageProperties {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/MessageRouterAction.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -30,9 +30,9 @@
import org.jboss.soa.overlord.jbossesb.ScheduleItem;
/**
- * Route message to different services according to the 'MessageType'.
+ * The action is used to perform routing of the inbound requests.
*
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*/
public class MessageRouterAction extends ConversationAction {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ParallelAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ParallelAction.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ParallelAction.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -27,7 +27,7 @@
* This action represents a parallel construct.
*
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*/
public class ParallelAction extends ConversationAction {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/PerformAction.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -30,7 +30,7 @@
/**
*
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*
*/
public class PerformAction extends ConversationAction {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ReceiveMessageAction.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -26,10 +26,13 @@
import org.jboss.soa.overlord.jbossesb.Identity;
/**
- * Receive activity.
+ * <p>
+ * The ReceiveMessageAction is used to explicitly define the message type that should be received.
+ * If an RPC style has been used, then the optional operation name can also be defined.
+ * </p>
*
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*/
public class ReceiveMessageAction extends ConversationAction {
@@ -45,7 +48,7 @@
String serviceName = getConfig().getAttribute(ActionProperties.SERVICE_DESCRIPTION_NAME);
if (requiredMType == null) {
- throw new Exception("Message type not defined");
+ throw new Exception("Message type is not defined");
}
String mesgMType=getMessageType(message);
@@ -57,26 +60,22 @@
session=getSession(message, ids);
session.assimulateIdentities(ids);
- logger.info("MESSAGE TYPE ["+mesgMType+"] RECEIVED.");
+ logger.info("MESSAGE TYPE [ "+ mesgMType +" ] RECEIVED.");
if (unscheduledServiceItem == false && isFirstOrLastConversationAction(message, true)) {
String category=getConfig().getParent().getAttribute(ActionProperties.SERVICE_CATEGORY);
String name=getConfig().getParent().getAttribute(ActionProperties.SERVICE_NAME);
session.unschedule(category, name);
- logger.info("Finished unscheduling of " + category + "/" + name);
+ logger.debug("Finished unscheduling of [" + category + "/" + name + "]");
}
EPR replyTo = message.getHeader().getCall().getReplyTo();
- // Store any response EPR
if (clientEPR != null && replyTo != null) {
session.setEPR(clientEPR, replyTo);
}
} else {
-
- // Unexpected message
- throw new Exception("Unexpected message type="+mesgMType+
- ", but expecting type="+requiredMType);
+ throw new Exception("Unexpected message type= "+ mesgMType + ", but expecting type="+requiredMType);
}
return(message);
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/RetrieveSessionAction.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -30,7 +30,7 @@
* This action gets an existed session.
*
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*/
public class RetrieveSessionAction extends ConversationAction {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ScheduleStateAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ScheduleStateAction.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/ScheduleStateAction.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -27,7 +27,7 @@
* Schedule state activity.
*
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*/
public class ScheduleStateAction extends ConversationAction {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SendMessageAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SendMessageAction.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SendMessageAction.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -40,7 +40,7 @@
* Send message activity.
*
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*/
public class SendMessageAction extends ConversationAction {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetMessageAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetMessageAction.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetMessageAction.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -27,7 +27,7 @@
/**
* Set object into the 'ESB Message' Object.
*
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*
*/
public class SetMessageAction extends ConversationAction {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SetStateAction.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -28,7 +28,7 @@
/**
*
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*/
public class SetStateAction extends ConversationAction {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SwitchAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SwitchAction.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/SwitchAction.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -28,7 +28,7 @@
* based on the message that has occurred.
*
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*/
public class SwitchAction extends ConversationAction {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhenAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhenAction.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhenAction.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -26,7 +26,7 @@
/**
*
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*
*/
public class WhenAction extends ConversationAction {
@@ -45,25 +45,23 @@
public Message handle(Message message) throws Exception {
for(ConfigTree ct : getConfig().getAllChildren()) {
- if (WHEN_STATEMENT.equals(ct.getName())) {
- //TODO: make the expression as an method name temporarily
- String decision = ct.getAttribute(EXPRESSION);
+ if (WHEN_STATEMENT.equals(ct.getName())) {
+ String expression = ct.getAttribute(EXPRESSION);
String category = ct.getAttribute(ActionProperties.SERVICE_CATEGORY);
String name = ct.getAttribute(ActionProperties.SERVICE_NAME);
- if (decision != null) {
- Object res = MVEL.eval(getMvelMethodName(decision), session.getBusinessObject());
- logger.debug("The result of expression of " + decision + " is " + res);
+ if (expression != null) {
+ Object res = MVEL.eval(expression, session.getBusinessObject());
if (res instanceof Boolean) {
Boolean ret = (Boolean)res;
if (ret.booleanValue()) {
session.schedule(category, name, message);
addScheduleItemToDeliver(category, name);
- logger.info("Scheduled: " + category + '/' + name);
+ logger.info("Scheduled item of [" + category + '/' + name + "]");
break;
}
} else {
- logger.error("currently doesn't support the return value other than Boolean");
+ logger.error("currently doesn't support the return value other than Boolean " + expression);
}
}
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhileAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhileAction.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/actions/WhileAction.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -26,13 +26,13 @@
/**
*
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*/
public class WhileAction extends ConversationAction {
public static final String WHILE_BRANCH = "while";
public static final String EXIT_BRANCH = "exit";
- public static final String DECISION_METHOD = "decision-method";
+ public static final String EXPRESSION = "expression";
private Logger logger = Logger.getLogger(WhileAction.class);
@@ -57,11 +57,10 @@
}
}
- //TODO: Need to think about the expression.
- String decisionMethod = whileConfig.getAttribute(DECISION_METHOD);
- logger.debug("decision method is : " + decisionMethod);
- if (decisionMethod != null) {
- Object response = MVEL.eval(getMvelMethodName(decisionMethod), session.getBusinessObject());
+ String expression = whileConfig.getAttribute(EXPRESSION);
+
+ if (expression != null) {
+ Object response = MVEL.eval(expression, session.getBusinessObject());
if ((response instanceof Boolean) && (response != null) ) {
Boolean flag = (Boolean) response;
logger.info("The result of decision method is: " + flag);
@@ -70,13 +69,13 @@
String name = whileConfig.getAttribute(ActionProperties.SERVICE_NAME);
session.schedule(category, name, message);
addScheduleItemToDeliver(category, name);
- logger.info("Scheduled items of " + category + "/" + name + ".");
+ logger.info("Scheduled items of [" + category + "/" + name + "].");
} else {
String category = exitConfig.getAttribute(ActionProperties.SERVICE_CATEGORY);
String name = exitConfig.getAttribute(ActionProperties.SERVICE_NAME);
session.schedule(category, name, message);
addScheduleItemToDeliver(category, name);
- logger.info("Scheduled items of " + category + "/" + name + ".");
+ logger.info("Scheduled items of [" + category + "/" + name + "].");
}
} else {
throw new Exception("method return value type is not Boolean Or is Null.");
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/ClassLoaderUtil.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/ClassLoaderUtil.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/ClassLoaderUtil.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -21,7 +21,7 @@
/**
*
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*
*/
public class ClassLoaderUtil {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/HibernateUtil.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/HibernateUtil.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/HibernateUtil.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -26,7 +26,7 @@
/**
*
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*
*/
public class HibernateUtil {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/MessageUtil.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/MessageUtil.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/MessageUtil.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -29,7 +29,7 @@
* messages.
*
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*/
public class MessageUtil {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/NameSpaceUtil.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/NameSpaceUtil.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/NameSpaceUtil.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -24,7 +24,7 @@
* qualified names (with local parts and namespaces).
*
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*/
public class NameSpaceUtil {
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/XMLUtils.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/XMLUtils.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/util/XMLUtils.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -33,7 +33,7 @@
/**
*
* @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*/
public class XMLUtils {
Modified: cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/soa/overlord/jbossesb/util/MVELUsageTest.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/soa/overlord/jbossesb/util/MVELUsageTest.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/soa/overlord/jbossesb/util/MVELUsageTest.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -27,7 +27,7 @@
/**
*
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*
*/
public class MVELUsageTest extends Assert {
Modified: cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/soa/overlord/jbossesb/util/XMLUtilsTest.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/soa/overlord/jbossesb/util/XMLUtilsTest.java 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/runtime/jbossesb/src/test/java/org/jboss/soa/overlord/jbossesb/util/XMLUtilsTest.java 2008-10-18 11:20:00 UTC (rev 388)
@@ -26,7 +26,7 @@
/**
*
- * @author <a href="mailto:cyu@redhat.com>Jeff Yu</a>
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*
*/
public class XMLUtilsTest extends Assert{
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml 2008-10-18 11:20:00 UTC (rev 388)
@@ -147,7 +147,7 @@
process="process" name="s2-1">
<property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" />
<property name="paths">
- <while decision-method="hasSuppliers"
+ <while expression="hasSuppliers()"
service-category="ESBBroker.BrokerParticipant"
service-name="ESBBrokerProcess.main.2"
immediate="true" />
@@ -193,7 +193,7 @@
process="process" name="s4-1">
<property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" />
<property name="paths">
- <when expression="receivedAllQuotes"
+ <when expression="receivedAllQuotes()"
service-category="ESBBroker.BrokerParticipant"
service-name="ESBBrokerProcess.main.4" />
</property>
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2008-10-17 16:26:27 UTC (rev 387)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2008-10-18 11:20:00 UTC (rev 388)
@@ -33,7 +33,7 @@
</action>
<action class="org.jboss.soa.overlord.jbossesb.actions.IfAction" name="c3" process="process">
<property name="paths">
- <if decision-method="isCreditValid" immediate="true" service-category="PurchaseGoods.CreditAgency" service-name="CreditAgency.decision1"/>
+ <if expression="isCreditValid()" immediate="true" service-category="PurchaseGoods.CreditAgency" service-name="CreditAgency.decision1"/>
<else immediate="true" service-category="PurchaseGoods.CreditAgency" service-name="CreditAgency.decision2"/>
</property>
</action>
15 years, 6 months
Overlord SVN: r387 - cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions.
by overlord-commits@lists.jboss.org
Author: objectiser
Date: 2008-10-17 12:26:27 -0400 (Fri, 17 Oct 2008)
New Revision: 387
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/PerformActionTest.java
Log:
Fixed test related to parentReference property validation.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/PerformActionTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/PerformActionTest.java 2008-10-17 16:12:23 UTC (rev 386)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/test/org/jboss/tools/overlord/cdl/jbossesb/model/actions/PerformActionTest.java 2008-10-17 16:26:27 UTC (rev 387)
@@ -376,6 +376,43 @@
}
}
+ public void testValidateParentReferenceCorrectType2() {
+ TestESBService service=new TestESBService();
+ service.setSessionClass(ParentPojo.class);
+
+ java.util.Map<String,String> props=new java.util.Hashtable<String,String>();
+ props.put(PerformAction.SERVICE_CATEGORY, "cat1");
+ props.put(PerformAction.SERVICE_NAME, "name1");
+ props.put(PerformAction.PARENT_REFERENCE, "validParentView");
+
+ org.w3c.dom.Element elem=ESBActionTestUtil.getAction(null, props, null);
+
+ TestESBService other1=new TestESBService();
+ other1.setCategory("cat1");
+ other1.setName("name1");
+ other1.setCreateSession(true);
+ other1.setSessionClass(ChildPojo.class);
+
+ TestESBLanguageModel model=new TestESBLanguageModel();
+ model.addService(other1);
+ model.addService(service);
+
+ service.setModel(model);
+
+ PerformAction action=new PerformAction(service, elem);
+ action.initializeLinks();
+
+ service.getActions().add(action);
+
+ TestModelListener l=new TestModelListener();
+
+ action.validate(l);
+
+ if (l.isValid() == false) {
+ fail(l.invalidMessage());
+ }
+ }
+
public void testValidateBindDetailsNotFound() {
TestESBService service=new TestESBService();
@@ -720,16 +757,23 @@
}
}
- public class ParentPojo {
+ public interface ParentView {
}
+ public class ParentPojo implements ParentView {
+
+ }
+
public class ChildPojo {
public void setValidParent(ParentPojo p) {
}
- public void setInvalidParent(Object p) {
+ public void setValidParentView(ParentView p) {
}
+
+ public void setInvalidParent(String p) {
+ }
}
}
15 years, 6 months
Overlord SVN: r386 - in cdl/trunk/distribution/eclipse: features and 1 other directories.
by overlord-commits@lists.jboss.org
Author: objectiser
Date: 2008-10-17 12:12:23 -0400 (Fri, 17 Oct 2008)
New Revision: 386
Added:
cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810171703.jar
cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.jbossesb_1.0.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200810171703.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200810171703.jar
Removed:
cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810120039.jar
cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.jbossesb_1.0.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200810120039.jar
cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200810120039.jar
Modified:
cdl/trunk/distribution/eclipse/site.xml
Log:
Updated plugins to reflect change in model retrieval.
Deleted: cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.scribble.conversation.feature_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.scribble.experimental.feature_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.scribble.feature_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/features/org.scribble.protocol.feature_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.jbossesb_1.0.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.jbossesb_1.0.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.jboss.tools.overlord.cdl.jbossesb_1.0.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conformance_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.comparator_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.export.text_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.model_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.parser_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.projector_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.conversation.validation_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.core_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.designer_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.comparator_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.java.parser_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.lang.model_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.osgi_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.comparator_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.export.text_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.model_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.parser_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.projector_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200810120039.jar
===================================================================
(Binary files differ)
Added: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200810171703.jar
===================================================================
(Binary files differ)
Property changes on: cdl/trunk/distribution/eclipse/plugins/org.scribble.protocol.validation_0.1.0.200810171703.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: cdl/trunk/distribution/eclipse/site.xml
===================================================================
--- cdl/trunk/distribution/eclipse/site.xml 2008-10-17 16:03:16 UTC (rev 385)
+++ cdl/trunk/distribution/eclipse/site.xml 2008-10-17 16:12:23 UTC (rev 386)
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810120039.jar" id="org.jboss.tools.overlord.cdl.jbossesb.feature" version="1.0.0.200810120039">
+ <feature url="features/org.jboss.tools.overlord.cdl.jbossesb.feature_1.0.0.200810171703.jar" id="org.jboss.tools.overlord.cdl.jbossesb.feature" version="1.0.0.200810171703">
<category name="JBossESB"/>
</feature>
- <feature url="features/org.scribble.conversation.feature_0.1.0.200810120039.jar" id="org.scribble.conversation.feature" version="0.1.0.200810120039">
+ <feature url="features/org.scribble.conversation.feature_0.1.0.200810171703.jar" id="org.scribble.conversation.feature" version="0.1.0.200810171703">
<category name="Common"/>
</feature>
- <feature url="features/org.scribble.experimental.feature_0.1.0.200810120039.jar" id="org.scribble.experimental.feature" version="0.1.0.200810120039">
+ <feature url="features/org.scribble.experimental.feature_0.1.0.200810171703.jar" id="org.scribble.experimental.feature" version="0.1.0.200810171703">
<category name="Common"/>
</feature>
- <feature url="features/org.scribble.feature_0.1.0.200810120039.jar" id="org.scribble.feature" version="0.1.0.200810120039">
+ <feature url="features/org.scribble.feature_0.1.0.200810171703.jar" id="org.scribble.feature" version="0.1.0.200810171703">
<category name="Common"/>
</feature>
- <feature url="features/org.scribble.protocol.feature_0.1.0.200810120039.jar" id="org.scribble.protocol.feature" version="0.1.0.200810120039">
+ <feature url="features/org.scribble.protocol.feature_0.1.0.200810171703.jar" id="org.scribble.protocol.feature" version="0.1.0.200810171703">
<category name="Common"/>
</feature>
<category-def name="JBossESB" label="JBossESB">
15 years, 6 months
Overlord SVN: r385 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb: generator and 1 other directory.
by overlord-commits@lists.jboss.org
Author: objectiser
Date: 2008-10-17 12:03:16 -0400 (Fri, 17 Oct 2008)
New Revision: 385
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/dialogs/GenerateDialog.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/Generator.java
Log:
Updated to reflect different approach to retrieving models.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/dialogs/GenerateDialog.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/dialogs/GenerateDialog.java 2008-10-17 09:14:53 UTC (rev 384)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/dialogs/GenerateDialog.java 2008-10-17 16:03:16 UTC (rev 385)
@@ -68,13 +68,14 @@
ModelRepository.class, null);
if (mrep != null) {
- java.util.List<Model> models=mrep.getModels(ref,
+ java.util.List<ModelInfo> models=mrep.getModels(ref,
new DefaultModelListener());
for (int i=0; m_conversationModel == null &&
i < models.size(); i++) {
- if (models.get(i) instanceof ConversationModel) {
- m_conversationModel = (ConversationModel)models.get(i);
+ if (models.get(i).getModel() instanceof ConversationModel) {
+ m_conversationModel = (ConversationModel)
+ models.get(i).getModel();
m_roles = m_conversationModel.getRoles();
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/Generator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/Generator.java 2008-10-17 09:14:53 UTC (rev 384)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/Generator.java 2008-10-17 16:03:16 UTC (rev 385)
@@ -83,13 +83,14 @@
ModelRepository.class, null);
if (mrep != null) {
- java.util.List<Model> models=mrep.getModels(ref,
+ java.util.List<ModelInfo> models=mrep.getModels(ref,
new DefaultModelListener());
for (int i=0; m_conversationModel == null &&
i < models.size(); i++) {
- if (models.get(i) instanceof ConversationModel) {
- m_conversationModel = (ConversationModel)models.get(i);
+ if (models.get(i).getModel() instanceof ConversationModel) {
+ m_conversationModel = (ConversationModel)
+ models.get(i).getModel();
m_roles = m_conversationModel.getRoles();
}
15 years, 6 months
Overlord SVN: r384 - cdl/trunk/distribution/src/main/release.
by overlord-commits@lists.jboss.org
Author: objectiser
Date: 2008-10-17 05:14:53 -0400 (Fri, 17 Oct 2008)
New Revision: 384
Modified:
cdl/trunk/distribution/src/main/release/ReleaseNotes.txt
Log:
Updated release note to include URL to list of open issues for Overlord CDL.
Modified: cdl/trunk/distribution/src/main/release/ReleaseNotes.txt
===================================================================
--- cdl/trunk/distribution/src/main/release/ReleaseNotes.txt 2008-10-15 18:04:42 UTC (rev 383)
+++ cdl/trunk/distribution/src/main/release/ReleaseNotes.txt 2008-10-17 09:14:53 UTC (rev 384)
@@ -1,5 +1,5 @@
-Overlord CDL 1.0-SNAPSHOT
-=========================
+Overlord CDL 1.0-CR1
+====================
See the README.txt for more information about the Overlord CDL release.
@@ -13,14 +13,6 @@
------------------------------------------------------------------------
-Current list of items outstanding for 1.0.GA:
+Current list of items outstanding:
-SOAG-68 Async Perform
-SOAG-67 Conformance checking for CDL Exception Handling mechanism against 'conversation aware' ESB actions
-SOAG-66 Represent the CDL Exception Handling concept with the 'conversation aware' ESB actions
-SOAG-65 Blocking/waiting behaviour for WhenAction
-SOAG-64 Deletion of grouping constructs
-SOAG-48 Web service support in conversation based actions
-SOAG-36 Add support in WhileAction for decision based on received message type
-SOAG-33 Timeout functionality for WhenAction
-SOAG-20 Minimise requirement to specify 'session' property on all conversation based service descriptors.
+https://jira.jboss.org/jira/secure/IssueNavigator.jspa?mode=hide&requestId=12312174
\ No newline at end of file
15 years, 6 months
Overlord SVN: r383 - cdl/trunk/distribution/src/main/release.
by overlord-commits@lists.jboss.org
Author: objectiser
Date: 2008-10-15 14:04:42 -0400 (Wed, 15 Oct 2008)
New Revision: 383
Modified:
cdl/trunk/distribution/src/main/release/ReleaseNotes.txt
Log:
Found another duplicate issue.
Modified: cdl/trunk/distribution/src/main/release/ReleaseNotes.txt
===================================================================
--- cdl/trunk/distribution/src/main/release/ReleaseNotes.txt 2008-10-15 18:00:29 UTC (rev 382)
+++ cdl/trunk/distribution/src/main/release/ReleaseNotes.txt 2008-10-15 18:04:42 UTC (rev 383)
@@ -15,7 +15,6 @@
Current list of items outstanding for 1.0.GA:
-SOAG-69 Delete grouping construct when behaviour no longer required
SOAG-68 Async Perform
SOAG-67 Conformance checking for CDL Exception Handling mechanism against 'conversation aware' ESB actions
SOAG-66 Represent the CDL Exception Handling concept with the 'conversation aware' ESB actions
15 years, 6 months
Overlord SVN: r382 - cdl/trunk/distribution/src/main/release.
by overlord-commits@lists.jboss.org
Author: objectiser
Date: 2008-10-15 14:00:29 -0400 (Wed, 15 Oct 2008)
New Revision: 382
Modified:
cdl/trunk/distribution/src/main/release/ReleaseNotes.txt
Log:
Added list of jira references for outstanding features.
Modified: cdl/trunk/distribution/src/main/release/ReleaseNotes.txt
===================================================================
--- cdl/trunk/distribution/src/main/release/ReleaseNotes.txt 2008-10-15 17:37:33 UTC (rev 381)
+++ cdl/trunk/distribution/src/main/release/ReleaseNotes.txt 2008-10-15 18:00:29 UTC (rev 382)
@@ -9,4 +9,19 @@
questions to the User forum, or raise issues against the SOAG component
in Jira issue tracker.
-Overlord-CDL Development Team
\ No newline at end of file
+Overlord-CDL Development Team
+
+------------------------------------------------------------------------
+
+Current list of items outstanding for 1.0.GA:
+
+SOAG-69 Delete grouping construct when behaviour no longer required
+SOAG-68 Async Perform
+SOAG-67 Conformance checking for CDL Exception Handling mechanism against 'conversation aware' ESB actions
+SOAG-66 Represent the CDL Exception Handling concept with the 'conversation aware' ESB actions
+SOAG-65 Blocking/waiting behaviour for WhenAction
+SOAG-64 Deletion of grouping constructs
+SOAG-48 Web service support in conversation based actions
+SOAG-36 Add support in WhileAction for decision based on received message type
+SOAG-33 Timeout functionality for WhenAction
+SOAG-20 Minimise requirement to specify 'session' property on all conversation based service descriptors.
15 years, 6 months
Overlord SVN: r381 - in cdl/trunk/distribution: validator/jbossesb and 1 other directories.
by overlord-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2008-10-15 13:37:33 -0400 (Wed, 15 Oct 2008)
New Revision: 381
Added:
cdl/trunk/distribution/src/main/release/install/readme.txt
cdl/trunk/distribution/validator/jbossesb/overlord-cdl-validator.esb/
Removed:
cdl/trunk/distribution/validator/jbossesb/overlord-cdl-validator-jbossesb.esb/
Modified:
cdl/trunk/distribution/src/main/release/install/deployment.properties
cdl/trunk/distribution/validator/jbossesb/build.xml
cdl/trunk/distribution/validator/jbossesb/conf/jbossesb-properties-validator.xml
cdl/trunk/distribution/validator/jbossesb/readme.txt
Log:
* Rename the overlord-cdl-validator-jbossesb.esb to take out the '-jbossesb'.
* Add a readme.txt in install folder.
Modified: cdl/trunk/distribution/src/main/release/install/deployment.properties
===================================================================
--- cdl/trunk/distribution/src/main/release/install/deployment.properties 2008-10-15 15:46:11 UTC (rev 380)
+++ cdl/trunk/distribution/src/main/release/install/deployment.properties 2008-10-15 17:37:33 UTC (rev 381)
@@ -7,11 +7,11 @@
# This path should not include spaces.
# Use of relative paths or paths with spaces will cause runtime errors
# when deploying and executing the quickstart and the trailblazers.
-# (e.g. /home/pbennett/jboss-4.0.5.GA-ejb3)
-org.jboss.esb.server.home=/var/local/jboss
+# (e.g. /var/local/jboss-4.2.2.GA)
+org.jboss.esb.server.home=/var/local/jboss-4.2.2.GA
# 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
+# (e.g. /var/local/jbossesb-4.4.GA)
+org.jboss.esb.home=/var/local/jbossesb-4.4.GA
Added: cdl/trunk/distribution/src/main/release/install/readme.txt
===================================================================
--- cdl/trunk/distribution/src/main/release/install/readme.txt (rev 0)
+++ cdl/trunk/distribution/src/main/release/install/readme.txt 2008-10-15 17:37:33 UTC (rev 381)
@@ -0,0 +1,13 @@
+The build.xml script in this directory is responsible for deploying the validator and conversational runtime for JBoss ESB.
+
+Deployment into JBoss ESB 4.4.GA
+=================================
+ - Install JBoss 4.2.2.GA into an appropriate location.
+ - Install JBoss ESB 4.4.GA into a location. Then follow the instructions in the JBossESB installation (install/readme.txt) to deploy
+ JBossESb into the JBossAS environment.
+ - Edit the deployment.properties file to update the JBossAS and JBossESB location settings.
+ - Run 'ant deploy' to deploy both the Overlord CDL conversational ESB actions and service validation capabilities.
+ OR Run 'ant deploy-overlord-cdl-runtime' to deploy just the conversational ESB actions support.
+ OR Run 'ant deploy-overlord-cdl-validator' to deploy just the service validation capability.
+
+For more detail, please refer to $doc/userguide GettingStarted chapter.
Modified: cdl/trunk/distribution/validator/jbossesb/build.xml
===================================================================
--- cdl/trunk/distribution/validator/jbossesb/build.xml 2008-10-15 15:46:11 UTC (rev 380)
+++ cdl/trunk/distribution/validator/jbossesb/build.xml 2008-10-15 17:37:33 UTC (rev 381)
@@ -8,7 +8,7 @@
<fileset dir="${basedir}/pi4soa.sar"/>
</copy>
<copy todir="${target-server}/deploy/overlord-cdl-validator.esb">
- <fileset dir="${basedir}/overlord-cdl-validator-jbossesb.esb" />
+ <fileset dir="${basedir}/overlord-cdl-validator.esb" />
</copy>
</target>
@@ -20,13 +20,13 @@
<target name="register-validator-filter">
<echo message="register the validator filter in the jbossesb-properties file" />
- <delete file="${target-server}/deploy/jbossesb.sar/jbossesb-properties.xml" />
+ <delete file="${target-server}/deploy/jbossesb.sar/jbossesb-properties.xml" />
<copy file="${basedir}/conf/jbossesb-properties-validator.xml" tofile="${target-server}/deploy/jbossesb.sar/jbossesb-properties.xml" />
</target>
<target name="unregister-validator-filter">
<echo message="unregister the validator filter from the jbossesb-properties file" />
- <delete file="${target-server}/deploy/jbossesb.sar/jbossesb-properties.xml" />
+ <delete file="${target-server}/deploy/jbossesb.sar/jbossesb-properties.xml" />
<copy file="${basedir}/conf/jbossesb-properties.xml" tofile="${target-server}/deploy/jbossesb.sar/jbossesb-properties.xml" />
</target>
Modified: cdl/trunk/distribution/validator/jbossesb/conf/jbossesb-properties-validator.xml
===================================================================
--- cdl/trunk/distribution/validator/jbossesb/conf/jbossesb-properties-validator.xml 2008-10-15 15:46:11 UTC (rev 380)
+++ cdl/trunk/distribution/validator/jbossesb/conf/jbossesb-properties-validator.xml 2008-10-15 17:37:33 UTC (rev 381)
@@ -90,6 +90,6 @@
<properties name="filters">
<property name="org.jboss.soa.esb.filter.1" value="org.jboss.internal.soa.esb.message.filter.MetaDataFilter"/>
<property name="org.jboss.soa.esb.filter.2" value="org.jboss.internal.soa.esb.message.filter.GatewayFilter"/>
- <property name="org.jboss.soa.esb.filter.10" value="org.pi4soa.jbossesb.validator.ValidatorFilter" />
+ <property name="org.jboss.soa.esb.filter.10" value="org.pi4soa.jbossesb.validator.ValidatorFilter" />
</properties>
</esb>
Copied: cdl/trunk/distribution/validator/jbossesb/overlord-cdl-validator.esb (from rev 379, cdl/trunk/distribution/validator/jbossesb/overlord-cdl-validator-jbossesb.esb)
Modified: cdl/trunk/distribution/validator/jbossesb/readme.txt
===================================================================
--- cdl/trunk/distribution/validator/jbossesb/readme.txt 2008-10-15 15:46:11 UTC (rev 380)
+++ cdl/trunk/distribution/validator/jbossesb/readme.txt 2008-10-15 17:37:33 UTC (rev 381)
@@ -1,12 +1,11 @@
-
-Required to deploy the governance libraries.
+Required to deploy the validator libraries.
- ANT
Folder structures
-----------------------
1 - pi4soa.sar
-2 - overlord-cdl-validator-jbossesb.esb It contains the monitor config file (WS-CDL file) that will be used by the Filter.
+2 - overlord-cdl-validator.esb It contains the monitor config file (WS-CDL file) that will be used by the Filter.
3 - conf/ It contains the proper configuration for governance deployment.
@@ -14,20 +13,20 @@
-Instructions for deploying/undeploying governance libraries
------------------------------------------------------------
-1 - Put the "governance" folder is under the $JBossESB/install folder.
+Instructions for deploying/undeploying by using ANT (recommended)
+------------------------------------------------------------------
+1 - Go to $overlord-cdl/install directory.
-2 - Run "ant deploy" to deploy the governance libraries.
+2 - Run "ant deploy-cdl-validator" to deploy the validator libraries.
-3 - Run "ant undeploy" to undeploy the governance libraries.
+3 - Run "ant undeploy-cdl-validator" to undeploy the validator libraries.
-Deploying governance libraries manually
+Deploying validator libraries manually
-----------------------------------------------------------
-1 - Copy the "pi4soa.sar", "monitor.esb" two libraries to the $JBossESB/server/$domain/deploy folder.
+1 - Copy the "pi4soa.sar", "monitor.esb" two libraries to the $JBossESB/server/config (e.g. default)/deploy folder.
2 - Open up the "jbossesb-properties.xml", which is loated in the $JBossESB/server/$domain/deploy/jbossesb.sar folder.
15 years, 6 months
Overlord SVN: r380 - in cdl/trunk/docs/docbook: samplesguide/src/main and 4 other directories.
by overlord-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2008-10-15 11:46:11 -0400 (Wed, 15 Oct 2008)
New Revision: 380
Added:
cdl/trunk/docs/docbook/samplesguide/src/main/xslt/
cdl/trunk/docs/docbook/samplesguide/src/main/xslt/pdf.xsl
cdl/trunk/docs/docbook/userguide/src/main/xslt/
cdl/trunk/docs/docbook/userguide/src/main/xslt/pdf.xsl
Modified:
cdl/trunk/docs/docbook/samplesguide/pom.xml
cdl/trunk/docs/docbook/userguide/pom.xml
Log:
* Add custom pdf xsl, override some attributes, like remove the blank pages between chapter.
Modified: cdl/trunk/docs/docbook/samplesguide/pom.xml
===================================================================
--- cdl/trunk/docs/docbook/samplesguide/pom.xml 2008-10-14 17:58:04 UTC (rev 379)
+++ cdl/trunk/docs/docbook/samplesguide/pom.xml 2008-10-15 15:46:11 UTC (rev 380)
@@ -59,7 +59,7 @@
<formats>
<format>
<formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <stylesheetResource>file://${basedir}/src/main/xslt/pdf.xsl</stylesheetResource>
<finalName>SamplesGuide.pdf</finalName>
</format>
<format>
Added: cdl/trunk/docs/docbook/samplesguide/src/main/xslt/pdf.xsl
===================================================================
--- cdl/trunk/docs/docbook/samplesguide/src/main/xslt/pdf.xsl (rev 0)
+++ cdl/trunk/docs/docbook/samplesguide/src/main/xslt/pdf.xsl 2008-10-15 15:46:11 UTC (rev 380)
@@ -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 <= $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>
+
Modified: cdl/trunk/docs/docbook/userguide/pom.xml
===================================================================
--- cdl/trunk/docs/docbook/userguide/pom.xml 2008-10-14 17:58:04 UTC (rev 379)
+++ cdl/trunk/docs/docbook/userguide/pom.xml 2008-10-15 15:46:11 UTC (rev 380)
@@ -59,7 +59,7 @@
<formats>
<format>
<formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <stylesheetResource>file://${basedir}/src/main/xslt/pdf.xsl</stylesheetResource>
<finalName>UserGuide.pdf</finalName>
</format>
<format>
Added: cdl/trunk/docs/docbook/userguide/src/main/xslt/pdf.xsl
===================================================================
--- cdl/trunk/docs/docbook/userguide/src/main/xslt/pdf.xsl (rev 0)
+++ cdl/trunk/docs/docbook/userguide/src/main/xslt/pdf.xsl 2008-10-15 15:46:11 UTC (rev 380)
@@ -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 <= $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>
+
15 years, 6 months