[TAVERNA-1041] cxf-xjc-plugin for taverna-scufl2-t2flow
Note that some jaxb Boolean bean properties that before
were get*() are now is*()
diff --git a/taverna-scufl2-t2flow/pom.xml b/taverna-scufl2-t2flow/pom.xml
index 396b41c..3dde3d9 100644
--- a/taverna-scufl2-t2flow/pom.xml
+++ b/taverna-scufl2-t2flow/pom.xml
@@ -40,21 +40,26 @@
-->
</plugin>
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <generatePackage>org.apache.taverna.scufl2.xml.t2flow.jaxb</generatePackage>
- <schemaDirectory>src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/</schemaDirectory>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>xsdtojava</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <xsdOptions combine.self="override">
+ <!-- We don't use src/main/xsd as in ../pom.xml, as our XSDs go into the final JAR -->
+ <xsdOption>
+ <xsdDir>${project.basedir}/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/</xsdDir>
+ <packagename>org.apache.taverna.scufl2.xml.t2flow.jaxb</packagename>
+ </xsdOption>
+ </xsdOptions>
+ </configuration>
+ </plugin>
<plugin>
<!-- So that Eclipse m2e (with the buildhelper m2e connector) can find
diff --git a/taverna-scufl2-t2flow/src/main/java/org/apache/taverna/scufl2/translator/t2flow/defaultactivities/InteractionActivityParser.java b/taverna-scufl2-t2flow/src/main/java/org/apache/taverna/scufl2/translator/t2flow/defaultactivities/InteractionActivityParser.java
index 73a3a22..a6fd5b0 100644
--- a/taverna-scufl2-t2flow/src/main/java/org/apache/taverna/scufl2/translator/t2flow/defaultactivities/InteractionActivityParser.java
+++ b/taverna-scufl2-t2flow/src/main/java/org/apache/taverna/scufl2/translator/t2flow/defaultactivities/InteractionActivityParser.java
@@ -75,7 +75,7 @@
String interactionActivityType = interactionConfig.getInteractionActivityType();
json.put("interactionActivityType", interactionActivityType);
- boolean progressNotification = interactionConfig.getProgressNotification();
+ boolean progressNotification = interactionConfig.isProgressNotification();
json.put("progressNotification", progressNotification);
Activity activity = parserState.getCurrentActivity();
diff --git a/taverna-scufl2-t2flow/src/main/java/org/apache/taverna/scufl2/translator/t2flow/t23activities/RESTActivityParser.java b/taverna-scufl2-t2flow/src/main/java/org/apache/taverna/scufl2/translator/t2flow/t23activities/RESTActivityParser.java
index d119c89..27ce3f0 100644
--- a/taverna-scufl2-t2flow/src/main/java/org/apache/taverna/scufl2/translator/t2flow/t23activities/RESTActivityParser.java
+++ b/taverna-scufl2-t2flow/src/main/java/org/apache/taverna/scufl2/translator/t2flow/t23activities/RESTActivityParser.java
@@ -135,17 +135,17 @@
accept.put("header", fieldName);
accept.put("value", fieldValue);
}
- if (restConfig.getShowActualUrlPort() != null)
- json.put("showActualURLPort", restConfig.getShowActualUrlPort()
+ if (restConfig.isShowActualUrlPort() != null)
+ json.put("showActualURLPort", restConfig.isShowActualUrlPort()
.booleanValue());
- if (restConfig.getShowResponseHeadersPort() != null)
+ if (restConfig.isShowResponseHeadersPort() != null)
json.put("showResponseHeadersPort", restConfig
- .getShowResponseHeadersPort().booleanValue());
+ .isShowResponseHeadersPort().booleanValue());
if (restConfig.isShowRedirectionOutputPort())
json.put("showRedirectionOutputPort", true);
- if (restConfig.getEscapeParameters() != null
- && !restConfig.getEscapeParameters())
+ if (restConfig.isEscapeParameters() != null
+ && !restConfig.isEscapeParameters())
json.put("escapeParameters", false);
if (restConfig.getOutgoingDataFormat() != null)
json.put("outgoingDataFormat",
