[380581] Export always includes sources

9 files changed, 135 insertions, 14 deletions

diff --git a/releng/components/dali-sdk/tobeInstalled.properties b/releng/components/dali-sdk/tobeInstalled.properties
index 1b9300327..d075859a0 100644
--- a/releng/components/dali-sdk/tobeInstalled.properties
+++ b/releng/components/dali-sdk/tobeInstalled.properties
@@ -9,7 +9,7 @@ getprereq.emfvalidation=true
 getprereq.graphiti=true
 getprereq.gef=true
 getprereq.dtp=true
-#getprereq.wst=false
-#getprereq.jst=false
+getprereq.wst=true
+getprereq.jst=true
 #getprereq.wtp=false
 #getprereq.dltk=false
diff --git a/releng/components/dali.tests/tobeInstalled.properties b/releng/components/dali.tests/tobeInstalled.properties
index 76c5e16bb..f15ad8b59 100644
--- a/releng/components/dali.tests/tobeInstalled.properties
+++ b/releng/components/dali.tests/tobeInstalled.properties
@@ -9,7 +9,7 @@ getprereq.emfvalidation=true
 getprereq.graphiti=true
 getprereq.gef=true
 getprereq.dtp=true
-#getprereq.wst=false
-#getprereq.jst=false
+getprereq.wst=true
+getprereq.jst=true
 #getprereq.wtp=false
 #getprereq.dltk=false
\ No newline at end of file
diff --git a/releng/components/wtp-patches32x/category.xml b/releng/components/wtp-patches32x/category.xml
new file mode 100644
index 000000000..33cd8b939
--- /dev/null
+++ b/releng/components/wtp-patches32x/category.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+
+    <feature
+        id="org.eclipse.wst.common_core.feature.patch">
+        <category
+            name="Web Tools Platform (WTP) Patches @buildversionid@"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.common_ui.feature.patch">
+        <category
+            name="Web Tools Platform (WTP) Patches @buildversionid@"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.server_core.feature.patch">
+        <category
+            name="Web Tools Platform (WTP) Patches @buildversionid@"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.server_ui.feature.patch">
+        <category
+            name="Web Tools Platform (WTP) Patches @buildversionid@"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.jsdt.feature.patch">
+        <category
+            name="Web Tools Platform (WTP) Patches @buildversionid@"/>
+    </feature>
+    <feature
+        id="org.eclipse.wst.xml_core.feature.patch">
+        <category
+            name="Web Tools Platform (WTP) Patches @buildversionid@"/>
+    </feature>
+    <feature
+        id="org.eclipse.jst.common.fproj.enablement.jdt.feature.patch">
+        <category
+            name="Web Tools Platform (WTP) Patches @buildversionid@"/>
+    </feature>
+    <feature
+        id="org.eclipse.jst.web_core.feature.patch">
+        <category
+            name="Web Tools Platform (WTP) Patches @buildversionid@"/>
+    </feature>
+    <feature
+        id="org.eclipse.jst.enterprise_ui.feature.patch">
+        <category
+            name="Web Tools Platform (WTP) Patches @buildversionid@"/>
+    </feature>
+    <feature
+        id="org.eclipse.jpt.jpa.feature.patch">
+        <category
+            name="Web Tools Platform (WTP) Patches @buildversionid@"/>
+    </feature>
+    <category-def
+        name="Web Tools Platform (WTP) Patches @buildversionid@"
+        label="Web Tools Platform (WTP) Patches @buildversionid@">
+        <description>
+            These features provide functionality with the executable code only and are recommended for most users.
+        </description>
+    </category-def>
+</site>
diff --git a/releng/components/wtp-patches32x/tobeInstalled.properties b/releng/components/wtp-patches32x/tobeInstalled.properties
new file mode 100644
index 000000000..7fc7de49f
--- /dev/null
+++ b/releng/components/wtp-patches32x/tobeInstalled.properties
@@ -0,0 +1,11 @@
+getprereq.eclipse=true
+#getprereq.eclipseplatform=false
+#getprereq.eclipsetestframework=true
+getprereq.emfandxsd=true
+#getprereq.emfvalidation=false
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+getprereq.wtp=true
+#getprereq.dltk=false
\ No newline at end of file
diff --git a/releng/distribution/patches32x.site/prereqsToDisplay.php b/releng/distribution/patches32x.site/prereqsToDisplay.php
new file mode 100644
index 000000000..6643a4062
--- /dev/null
+++ b/releng/distribution/patches32x.site/prereqsToDisplay.php
@@ -0,0 +1,23 @@
+<?php
+
+$prereq_eclipse="true";
+$prereq_e4x="false";
+$prereq_eclipseplatform="false";
+$prereq_emfandxsd="true";
+$prereq_gef="true";
+$prereq_dtp="true";
+$prereq_emftransaction="false";
+$prereq_emfvalidation="false";
+$prereq_graphiti="false";
+
+$prereq_eclipsetestframework="true";
+$prereq_eclipsereleng="true";
+$prereq_orbitthirdpartyzip="true";
+
+// seldom used, but we try to always include all php $prereq variables to avoid 'unused variable' warnings from php
+$prereq_wst="false";
+$prereq_jst="false";
+$prereq_wtp="true";
+$prereq_wtptests="true";
+$prereq_dltk="false";
+?>
diff --git a/releng/distribution/patches32x.tests/tobeInstalled.properties b/releng/distribution/patches32x.tests/tobeInstalled.properties
new file mode 100644
index 000000000..d991803e6
--- /dev/null
+++ b/releng/distribution/patches32x.tests/tobeInstalled.properties
@@ -0,0 +1,19 @@
+# properties that control what is installed fur running unit tests
+getprereq.eclipse=true
+getprereq.eclipsetestframework=true
+#getprereq.eclipseplatform=false
+#getprereq.emf=false
+#getprereq.emfxsd=true
+getprereq.emfandxsd=true
+#getprereq.emftransaction=true
+#getprereq.emfvalidation=true
+#getprereq.graphiti=true
+getprereq.gef=true
+getprereq.dtp=true
+#getprereq.wst=false
+#getprereq.jst=false
+getprereq.wtp=true
+#getprereq.dltk=false
+getprereq.wtptests=true
+#getprereq.wtpandtests=true
+getprereq.testlibraries=true
diff --git a/releng/juno/dependencies.properties b/releng/juno/dependencies.properties
index 327a9e180..64244f6cd 100644
--- a/releng/juno/dependencies.properties
+++ b/releng/juno/dependencies.properties
@@ -423,10 +423,11 @@ jst.mirror.prefixuri=${wst.mirror.prefixuri}
 jst.url=${wst.url}
 
 # WTP 
-wtp.id=R-3.2.2-20100915173744
-wtp.dir.id=R3.2.2/R-3.2.2-20100915173744
+wtp.id=R-3.4.0-20120612174739
+wtp.dir.id=R3.4.0/R-3.4.0-20120612174739
 wtp.file=wtp-sdk-${wtp.id}.zip
-wtp.name=WTP
+wtp.repo=wtp-repo-${wtp.id}.zip
+wtp.name=WTP 3.4.0
 wtp.description=Release used for Patch Builds
 wtp.build.home=http://download.eclipse.org/webtools/downloads/
 wtp.mirror.prefixuri=/webtools/downloads/drops/${wtp.dir.id}
@@ -436,8 +437,9 @@ wtp.url=http://download.eclipse.org${wtp.mirror.prefixuri}
 wtptests.id=${wtp.id}
 wtptests.dir.id=${wtp.dir.id}
 wtptests.file = wtp-tests-${wtptests.id}.zip
-wtptests.name = WTP Tests 3.2.2
-wtptests.description = WTP Tests 3.2.2 for Patch Builds
+wtptests.repo = wtp-tests-repo-${wtptests.id}.zip
+wtptests.name = WTP Tests 3.4.0
+wtptests.description = WTP Tests for Patch Builds
 wtptests.build.home=http://download.eclipse.org/webtools/downloads/
 wtptests.mirror.prefixuri=/webtools/downloads/drops/${wtptests.dir.id}
 wtptests.url=http://download.eclipse.org${wtptests.mirror.prefixuri}
diff --git a/releng/maps/build.cfg b/releng/maps/build.cfg
index 55c247477..61daab636 100644
--- a/releng/maps/build.cfg
+++ b/releng/maps/build.cfg
@@ -44,16 +44,19 @@ doCreateFprojZips=yes
 # omit qualifierArgValue to not flag a unit test error for "warnings"
 qualifierArgValue=-countQualifierIncreaseOnlyAsError
 #qualifierArgValue=
-referenceIDArgValue=R-3.3.2-20120210195245
-referenceURLArgValue=http://download.eclipse.org/webtools/downloads/drops/R3.3.2/R-3.3.2-20120210195245/versioningReference_R-3.3.2-20120210195245.xml
+referenceIDArgValue=R-3.4.0-20120612174739
+referenceURLArgValue=http://download.eclipse.org/webtools/downloads/drops/R3.4.0/R-3.4.0-20120612174739/versioningReference_R-3.4.0-20120612174739.xml
 
 # omit to not test
 testToReferenceArgValue=-testToReference
 # omit to not list
 listToReferenceFileArgValue=-listToReferenceFile
 
-testFeatureIUs=org.eclipse.jpt.common.tests.feature.feature.group,org.eclipse.jpt.jpa.tests.feature.feature.group,org.eclipse.jpt.jpa.eclipselink.tests.feature.feature.group,org.eclipse.jpt.jaxb.tests.feature.feature.group,org.eclipse.jpt.jaxb.eclipselink.tests.feature.feature.group,org.eclipse.jst.enterprise_tests.feature.feature.group,org.eclipse.jst.jsf.tests.feature.feature.group,org.eclipse.jst.server_adapters.ext_tests.feature.feature.group,org.eclipse.jst.server_tests.feature.feature.group,org.eclipse.jst.web_tests.feature.feature.group,org.eclipse.jst.ws.cxf_tests.feature.feature.group,org.eclipse.jst.ws.jaxws.dom_tests.feature.feature.group,org.eclipse.jst.ws.jaxws_tests.feature.feature.group,org.eclipse.wst.common_tests.feature.feature.group,org.eclipse.wst.jsdt_tests.feature.feature.group,org.eclipse.wst.server_tests.feature.feature.group,org.eclipse.wst.web_tests.feature.feature.group,org.eclipse.wst.ws_tests.feature.feature.group,org.eclipse.wst.xml_tests.feature.feature.group,org.eclipse.wst.xsl_tests.feature.feature.group,org.eclipse.wtp.releng.tests.feature.feature.group
-wtpFeatureIUs=org.eclipse.wst.common.fproj.sdk.feature.group,org.eclipse.wst.jsdt_sdk.feature.feature.group,org.eclipse.wst.xml_sdk.feature.feature.group,org.eclipse.wst.web_sdk.feature.feature.group,org.eclipse.wst.xsl_sdk.feature.feature.group,org.eclipse.wst.server_adapters.sdk.feature.feature.group,org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group,org.eclipse.jst.server_sdk.feature.feature.group,org.eclipse.jst.web_sdk.feature.feature.group,org.eclipse.jst.enterprise_sdk.feature.feature.group,org.eclipse.jst.server_adapters.sdk.feature.feature.group,org.eclipse.jst.server_adapters.ext.sdk.feature.feature.group,org.eclipse.jst.ws.axis2tools_sdk.feature.feature.group,org.eclipse.jst.ws.jaxws_sdk.feature.feature.group,org.eclipse.jst.ws.cxf_sdk.feature.feature.group,org.eclipse.jst.ws.jaxws.dom_sdk.feature.feature.group,org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature.feature.group,org.eclipse.jst.webpageeditor_sdk.feature.feature.group,org.eclipse.jsf_sdk.feature.feature.group,org.eclipse.jpt.common_sdk.feature.feature.group,org.eclipse.jpt.common.eclipselink_sdk.feature.feature.group,org.eclipse.jpt.jpa_sdk.feature.feature.group,org.eclipse.jpt.jpa.eclipselink_sdk.feature.feature.group,org.eclipse.jpt.jaxb_sdk.feature.feature.group,org.eclipse.jpt.jaxb.eclipselink_sdk.feature.feature.group,org.eclipse.jpt.dbws.eclipselink_sdk.feature.feature.group
+wtpFeatureIUs=org.eclipse.jst.web_core.feature.patch.feature.group
+testFeatureIUs=
+
+#testFeatureIUs=org.eclipse.jpt.common.tests.feature.feature.group,org.eclipse.jpt.jpa.tests.feature.feature.group,org.eclipse.jpt.jpa.eclipselink.tests.feature.feature.group,org.eclipse.jpt.jaxb.tests.feature.feature.group,org.eclipse.jpt.jaxb.eclipselink.tests.feature.feature.group,org.eclipse.jst.enterprise_tests.feature.feature.group,org.eclipse.jst.jsf.tests.feature.feature.group,org.eclipse.jst.server_adapters.ext_tests.feature.feature.group,org.eclipse.jst.server_tests.feature.feature.group,org.eclipse.jst.web_tests.feature.feature.group,org.eclipse.jst.ws.cxf_tests.feature.feature.group,org.eclipse.jst.ws.jaxws.dom_tests.feature.feature.group,org.eclipse.jst.ws.jaxws_tests.feature.feature.group,org.eclipse.wst.common_tests.feature.feature.group,org.eclipse.wst.jsdt_tests.feature.feature.group,org.eclipse.wst.server_tests.feature.feature.group,org.eclipse.wst.web_tests.feature.feature.group,org.eclipse.wst.ws_tests.feature.feature.group,org.eclipse.wst.xml_tests.feature.feature.group,org.eclipse.wst.xsl_tests.feature.feature.group,org.eclipse.wtp.releng.tests.feature.feature.group
+#wtpFeatureIUs=org.eclipse.wst.common.fproj.sdk.feature.group,org.eclipse.wst.jsdt_sdk.feature.feature.group,org.eclipse.wst.xml_sdk.feature.feature.group,org.eclipse.wst.web_sdk.feature.feature.group,org.eclipse.wst.xsl_sdk.feature.feature.group,org.eclipse.wst.server_adapters.sdk.feature.feature.group,org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group,org.eclipse.jst.server_sdk.feature.feature.group,org.eclipse.jst.web_sdk.feature.feature.group,org.eclipse.jst.enterprise_sdk.feature.feature.group,org.eclipse.jst.server_adapters.sdk.feature.feature.group,org.eclipse.jst.server_adapters.ext.sdk.feature.feature.group,org.eclipse.jst.ws.axis2tools_sdk.feature.feature.group,org.eclipse.jst.ws.jaxws_sdk.feature.feature.group,org.eclipse.jst.ws.cxf_sdk.feature.feature.group,org.eclipse.jst.ws.jaxws.dom_sdk.feature.feature.group,org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature.feature.group,org.eclipse.jst.webpageeditor_sdk.feature.feature.group,org.eclipse.jsf_sdk.feature.feature.group,org.eclipse.jpt.common_sdk.feature.feature.group,org.eclipse.jpt.common.eclipselink_sdk.feature.feature.group,org.eclipse.jpt.jpa_sdk.feature.feature.group,org.eclipse.jpt.jpa.eclipselink_sdk.feature.feature.group,org.eclipse.jpt.jaxb_sdk.feature.feature.group,org.eclipse.jpt.jaxb.eclipselink_sdk.feature.feature.group,org.eclipse.jpt.dbws.eclipselink_sdk.feature.feature.group
 
 jsdtTestFeatureIUs=org.eclipse.wst.jsdt_tests.feature.feature.group
 jsdtFeatureIUs=org.eclipse.wst.jsdt.feature.feature.group,org.eclipse.wst.jsdt.feature.source.feature.group,org.eclipse.wst.jsdt_sdk.feature.feature.group
diff --git a/releng/maps/wtp-releng.map b/releng/maps/wtp-releng.map
index 0e3c0532a..7e7ed1293 100644
--- a/releng/maps/wtp-releng.map
+++ b/releng/maps/wtp-releng.map
@@ -4,4 +4,6 @@
 !* used in our releng tests, when JUnits run
 feature@org.eclipse.wtp.releng.tests.feature=v201102200505,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/features/org.eclipse.wtp.releng.tests.feature
 plugin@org.eclipse.wtp.releng.versionchecker=v201102240440,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/org.eclipse.wtp.releng.versionchecker
-plugin@org.eclipse.wtp.releng.tests=v201105030345,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/tests/org.eclipse.wtp.releng.tests
\ No newline at end of file
+plugin@org.eclipse.wtp.releng.tests=v201105030345,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/tests/org.eclipse.wtp.releng.tests
+
+feature@org.eclipse.wtp.patch.assembly.feature=v201207092000,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/assembly/features/org.eclipse.wtp.patch.assembly.feature
\ No newline at end of file