Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVioleta Georgieva2012-10-06 17:17:26 +0000
committerVioleta Georgieva2012-10-06 17:17:26 +0000
commit84515f88f14bc4515e1c1828ff940f724b64fe38 (patch)
tree8bf79b915de1ba569ae45810b7eead1c1c69d5e9 /test-bundles
parent04c3ed647c5a0145ea18c23ae55db0510f3adc48 (diff)
downloadorg.eclipse.gemini.web.gemini-web-container-84515f88f14bc4515e1c1828ff940f724b64fe38.tar.gz
org.eclipse.gemini.web.gemini-web-container-84515f88f14bc4515e1c1828ff940f724b64fe38.tar.xz
org.eclipse.gemini.web.gemini-web-container-84515f88f14bc4515e1c1828ff940f724b64fe38.zip
bug 391297: Update virgo-build to 2.32 version and VBT to 1.4.1.RELEASE
Diffstat (limited to 'test-bundles')
-rw-r--r--test-bundles/build.properties15
-rwxr-xr-xtest-bundles/customizer-bundle/build.xml3
-rwxr-xr-xtest-bundles/fragment-provides-web-xml/build.xml3
-rw-r--r--test-bundles/simple-manifest-only/build.xml3
-rw-r--r--test-bundles/simple-war/build.xml3
-rwxr-xr-xtest-bundles/war-with-annotations/build.xml3
-rw-r--r--test-bundles/war-with-another-servlet/build.xml3
-rwxr-xr-xtest-bundles/war-with-context-xml-cross-context/build.xml3
-rwxr-xr-xtest-bundles/war-with-context-xml-custom-classloader/build.xml3
-rw-r--r--test-bundles/war-with-jsp/build.xml3
-rw-r--r--test-bundles/war-with-resource-references/build.xml3
-rw-r--r--test-bundles/war-with-servlet/build.xml3
-rw-r--r--test-bundles/war-with-tld/build.xml3
-rwxr-xr-xtest-bundles/war-with-web-xml-from-fragment/build.xml3
14 files changed, 26 insertions, 28 deletions
diff --git a/test-bundles/build.properties b/test-bundles/build.properties
deleted file mode 100644
index 6c4d378..0000000
--- a/test-bundles/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-version=1.0.0
-release.type=integration
-javadoc.exclude.package.names=**/internal/**,**/internal
-ivy.cache=ivy-cache
-ivy.cache.dir=${basedir}/../../${ivy.cache}
-integration.repo.dir=${basedir}/../../integration-repo
-disable.bundlor=true
-source.version=1.6
-test.vm.args= -Xmx1024M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError
-findbugs.enforce=true
-clover.enforce=true
-clover.coverage=70%
-local.repository.dir=${basedir}/../../../ivy-repository
-
-#debug string to append to test.vm.args= -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y
diff --git a/test-bundles/customizer-bundle/build.xml b/test-bundles/customizer-bundle/build.xml
index be1464e..cce367d 100755
--- a/test-bundles/customizer-bundle/build.xml
+++ b/test-bundles/customizer-bundle/build.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="customizer-bundle">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../build.versions"/>
<property name="jar.output.dir" value="${basedir}/../../org.eclipse.gemini.web.test/target/resources"/>
+ <property name="disable.bundlor" value="true"/>
<import file="${basedir}/../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-bundles/fragment-provides-web-xml/build.xml b/test-bundles/fragment-provides-web-xml/build.xml
index ff11bb5..4a0b8f3 100755
--- a/test-bundles/fragment-provides-web-xml/build.xml
+++ b/test-bundles/fragment-provides-web-xml/build.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="fragment-provides-web-xml">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../build.versions"/>
<property name="jar.output.dir" value="${basedir}/../../org.eclipse.gemini.web.test/target/resources"/>
+ <property name="disable.bundlor" value="true"/>
<import file="${basedir}/../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-bundles/simple-manifest-only/build.xml b/test-bundles/simple-manifest-only/build.xml
index 0d52ce5..6eae0ce 100644
--- a/test-bundles/simple-manifest-only/build.xml
+++ b/test-bundles/simple-manifest-only/build.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="simple-manifest-only">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../build.versions"/>
<property name="jar.output.dir" value="${basedir}/../../org.eclipse.gemini.web.core/target/resources"/>
+ <property name="disable.bundlor" value="true"/>
<import file="${basedir}/../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-bundles/simple-war/build.xml b/test-bundles/simple-war/build.xml
index b60c9fe..b07c750 100644
--- a/test-bundles/simple-war/build.xml
+++ b/test-bundles/simple-war/build.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="simple-war">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../build.versions"/>
<property name="war.output.dir" value="${basedir}/../../org.eclipse.gemini.web.core/target/resources"/>
+ <property name="disable.bundlor" value="true"/>
<import file="${basedir}/../../virgo-build/war/default.xml"/>
</project>
diff --git a/test-bundles/war-with-annotations/build.xml b/test-bundles/war-with-annotations/build.xml
index 399bef4..519b001 100755
--- a/test-bundles/war-with-annotations/build.xml
+++ b/test-bundles/war-with-annotations/build.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="war-with-annotations">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../build.versions"/>
<property name="war.output.dir" value="${basedir}/../../org.eclipse.gemini.web.test/target/resources"/>
+ <property name="disable.bundlor" value="true"/>
<import file="${basedir}/../../virgo-build/war/default.xml"/>
</project>
diff --git a/test-bundles/war-with-another-servlet/build.xml b/test-bundles/war-with-another-servlet/build.xml
index 091bafa..e91706a 100644
--- a/test-bundles/war-with-another-servlet/build.xml
+++ b/test-bundles/war-with-another-servlet/build.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="war-with-another-servlet">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../build.versions"/>
<property name="war.output.dir" value="${basedir}/../../org.eclipse.gemini.web.test/target/resources"/>
+ <property name="disable.bundlor" value="true"/>
<import file="${basedir}/../../virgo-build/war/default.xml"/>
</project>
diff --git a/test-bundles/war-with-context-xml-cross-context/build.xml b/test-bundles/war-with-context-xml-cross-context/build.xml
index f17d0f0..45b7953 100755
--- a/test-bundles/war-with-context-xml-cross-context/build.xml
+++ b/test-bundles/war-with-context-xml-cross-context/build.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="war-with-context-xml-cross-context">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../build.versions"/>
<property name="war.output.dir" value="${basedir}/../../org.eclipse.gemini.web.test/target/resources"/>
+ <property name="disable.bundlor" value="true"/>
<import file="${basedir}/../../virgo-build/war/default.xml"/>
</project>
diff --git a/test-bundles/war-with-context-xml-custom-classloader/build.xml b/test-bundles/war-with-context-xml-custom-classloader/build.xml
index 3bb0dc2..9f1212e 100755
--- a/test-bundles/war-with-context-xml-custom-classloader/build.xml
+++ b/test-bundles/war-with-context-xml-custom-classloader/build.xml
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="war-with-context-xml-custom-classloader">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../build.versions"/>
<property name="war.output.dir" value="${basedir}/../../org.eclipse.gemini.web.test/target/resources"/>
<property name="target.dir" value="${basedir}/target"/>
<property name="war.staging.dir" value="${target.dir}/war-expanded"/>
<property name="war.classes.dir" value="${war.staging.dir}/WEB-INF"/>
+ <property name="disable.bundlor" value="true"/>
<import file="${basedir}/../../virgo-build/war/default.xml"/>
</project>
diff --git a/test-bundles/war-with-jsp/build.xml b/test-bundles/war-with-jsp/build.xml
index 817ad49..fd1180e 100644
--- a/test-bundles/war-with-jsp/build.xml
+++ b/test-bundles/war-with-jsp/build.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="war-with-jsp">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../build.versions"/>
<property name="war.output.dir" value="${basedir}/../../org.eclipse.gemini.web.test/target/resources"/>
+ <property name="disable.bundlor" value="true"/>
<import file="${basedir}/../../virgo-build/war/default.xml"/>
</project>
diff --git a/test-bundles/war-with-resource-references/build.xml b/test-bundles/war-with-resource-references/build.xml
index eddaf23..96fc3ff 100644
--- a/test-bundles/war-with-resource-references/build.xml
+++ b/test-bundles/war-with-resource-references/build.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="war-with-resource-references">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../build.versions"/>
<property name="war.output.dir" value="${basedir}/../../org.eclipse.gemini.web.test/target/resources"/>
+ <property name="disable.bundlor" value="true"/>
<import file="${basedir}/../../virgo-build/war/default.xml"/>
</project>
diff --git a/test-bundles/war-with-servlet/build.xml b/test-bundles/war-with-servlet/build.xml
index b223e05..fa9ff29 100644
--- a/test-bundles/war-with-servlet/build.xml
+++ b/test-bundles/war-with-servlet/build.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="war-with-servlet">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../build.versions"/>
<property name="war.output.dir" value="${basedir}/../../org.eclipse.gemini.web.test/target/resources"/>
+ <property name="disable.bundlor" value="true"/>
<import file="${basedir}/../../virgo-build/war/default.xml"/>
</project>
diff --git a/test-bundles/war-with-tld/build.xml b/test-bundles/war-with-tld/build.xml
index 892626f..b5a7ff8 100644
--- a/test-bundles/war-with-tld/build.xml
+++ b/test-bundles/war-with-tld/build.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="war-with-tld">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../build.versions"/>
<property name="war.output.dir" value="${basedir}/../../org.eclipse.gemini.web.test/target/resources"/>
+ <property name="disable.bundlor" value="true"/>
<import file="${basedir}/../../virgo-build/war/default.xml"/>
</project>
diff --git a/test-bundles/war-with-web-xml-from-fragment/build.xml b/test-bundles/war-with-web-xml-from-fragment/build.xml
index 3112703..34dbaa7 100755
--- a/test-bundles/war-with-web-xml-from-fragment/build.xml
+++ b/test-bundles/war-with-web-xml-from-fragment/build.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="war-with-web-xml-from-fragment">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../build.versions"/>
<property name="war.output.dir" value="${basedir}/../../org.eclipse.gemini.web.test/target/resources"/>
+ <property name="disable.bundlor" value="true"/>
<import file="${basedir}/../../virgo-build/war/default.xml"/>
</project>

Back to the top