bpel-obj needs to be included to make cmd tools work.
git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@949189 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/Rakefile b/Rakefile
index 4be8b7d..f9bc934 100644
--- a/Rakefile
+++ b/Rakefile
@@ -126,7 +126,7 @@
end
test.setup unzip("#{webapp_dir}/WEB-INF"=>project("dao-jpa-ojpa-derby").package(:zip))
test.setup unzip("#{webapp_dir}/WEB-INF"=>project("dao-hibernate-db").package(:zip))
- test.exclude('*') if Buildr.environment == 'hudson'
+ test.exclude('*') if Buildr.environment == 'hudson' || ENV["notestng"]
NativeDB.prepare_configs test, _(".")
diff --git a/distro/src/main/assembly/jbi.xml b/distro/src/main/assembly/jbi.xml
index 112430a..6b21b8f 100644
--- a/distro/src/main/assembly/jbi.xml
+++ b/distro/src/main/assembly/jbi.xml
@@ -45,10 +45,10 @@
<directory>${basedir}/../dao-jpa-ojpa-derby/target/</directory>
<outputDirectory>/sql</outputDirectory>
<includes>
- <include>*.sql</include>
+ <include>*.sql</include>
</includes>
<excludes>
- <exclude>*partial*.sql</exclude>
+ <exclude>*partial*.sql</exclude>
</excludes>
</fileSet>
@@ -56,10 +56,10 @@
<directory>${basedir}/../</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>LICENSE</include>
- <include>README</include>
- <include>NOTICE</include>
- <include>RELEASE_NOTES</include>
+ <include>LICENSE</include>
+ <include>README</include>
+ <include>NOTICE</include>
+ <include>RELEASE_NOTES</include>
</includes>
</fileSet>
@@ -67,7 +67,7 @@
<directory>${basedir}/license</directory>
<outputDirectory>/lib</outputDirectory>
<includes>
- <include>*LICENSE</include>
+ <include>*LICENSE</include>
</includes>
</fileSet>
</fileSets>
@@ -85,26 +85,27 @@
<dependencySet>
<outputDirectory>/lib</outputDirectory>
<includes>
- <include>org.apache.ode:ode-utils</include>
- <include>org.apache.ode:ode-tools</include>
- <include>org.apache.ode:ode-bpel-compiler</include>
- <include>org.apache.ode:ode-bpel-api</include>
- <include>org.apache.ode:ode-bpel-schemas</include>
- <include>commons-logging:commons-logging</include>
- <include>org.apache.ode:ode-utils</include>
- <include>commons-codec:commons-codec</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-httpclient:commons-httpclient</include>
- <include>commons-pool:commons-pool</include>
- <include>net.sf.saxon:saxon</include>
- <include>net.sf.saxon:saxon-xpath</include>
- <include>net.sf.saxon:saxon-dom</include>
- <include>net.sf.saxon:saxon-xqj</include>
- <include>jaxen:jaxen</include>
- <include>log4j:log4j</include>
- <include>wsdl4j:wsdl4j</include>
- <include>xalan:xalan</include>
- <include>xerces:xercesImpl</include>
+ <include>org.apache.ode:ode-utils</include>
+ <include>org.apache.ode:ode-tools</include>
+ <include>org.apache.ode:ode-bpel-compiler</include>
+ <include>org.apache.ode:ode-bpel-api</include>
+ <include>org.apache.ode:ode-bpel-schemas</include>
+ <include>org.apache.ode:ode-bpel-obj</include>
+ <include>commons-logging:commons-logging</include>
+ <include>org.apache.ode:ode-utils</include>
+ <include>commons-codec:commons-codec</include>
+ <include>commons-collections:commons-collections</include>
+ <include>commons-httpclient:commons-httpclient</include>
+ <include>commons-pool:commons-pool</include>
+ <include>net.sf.saxon:saxon</include>
+ <include>net.sf.saxon:saxon-xpath</include>
+ <include>net.sf.saxon:saxon-dom</include>
+ <include>net.sf.saxon:saxon-xqj</include>
+ <include>jaxen:jaxen</include>
+ <include>log4j:log4j</include>
+ <include>wsdl4j:wsdl4j</include>
+ <include>xalan:xalan</include>
+ <include>xerces:xercesImpl</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/distro/src/main/assembly/war.xml b/distro/src/main/assembly/war.xml
index 03a0972..4fd2fd9 100644
--- a/distro/src/main/assembly/war.xml
+++ b/distro/src/main/assembly/war.xml
@@ -83,26 +83,27 @@
<dependencySet>
<outputDirectory>/lib</outputDirectory>
<includes>
- <include>org.apache.ode:ode-utils</include>
- <include>org.apache.ode:ode-tools</include>
- <include>org.apache.ode:ode-bpel-compiler</include>
- <include>org.apache.ode:ode-bpel-api</include>
- <include>org.apache.ode:ode-bpel-schemas</include>
- <include>commons-logging:commons-logging</include>
- <include>org.apache.ode:ode-utils</include>
- <include>commons-codec:commons-codec</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-httpclient:commons-httpclient</include>
- <include>commons-pool:commons-pool</include>
- <include>net.sf.saxon:saxon</include>
- <include>net.sf.saxon:saxon-xpath</include>
- <include>net.sf.saxon:saxon-dom</include>
- <include>net.sf.saxon:saxon-xqj</include>
- <include>jaxen:jaxen</include>
- <include>log4j:log4j</include>
- <include>wsdl4j:wsdl4j</include>
- <include>xalan:xalan</include>
- <include>xerces:xercesImpl</include>
+ <include>org.apache.ode:ode-utils</include>
+ <include>org.apache.ode:ode-tools</include>
+ <include>org.apache.ode:ode-bpel-compiler</include>
+ <include>org.apache.ode:ode-bpel-api</include>
+ <include>org.apache.ode:ode-bpel-obj</include>
+ <include>org.apache.ode:ode-bpel-schemas</include>
+ <include>commons-logging:commons-logging</include>
+ <include>org.apache.ode:ode-utils</include>
+ <include>commons-codec:commons-codec</include>
+ <include>commons-collections:commons-collections</include>
+ <include>commons-httpclient:commons-httpclient</include>
+ <include>commons-pool:commons-pool</include>
+ <include>net.sf.saxon:saxon</include>
+ <include>net.sf.saxon:saxon-xpath</include>
+ <include>net.sf.saxon:saxon-dom</include>
+ <include>net.sf.saxon:saxon-xqj</include>
+ <include>jaxen:jaxen</include>
+ <include>log4j:log4j</include>
+ <include>wsdl4j:wsdl4j</include>
+ <include>xalan:xalan</include>
+ <include>xerces:xercesImpl</include>
</includes>
</dependencySet>
</dependencySets>
