Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Anderson2013-10-18 01:49:41 -0400
committerCarl Anderson2013-10-18 01:49:41 -0400
commitca7a8b7cda77a9232ca789a1ce7037de179a1f0b (patch)
tree4936bfec423ee2c2eba1b8d6f58dcc2d7ca77f43
parentc288c0606e4e53ad27ff37375ff289e02dd0d97a (diff)
downloadwebtools.maps-ca7a8b7cda77a9232ca789a1ce7037de179a1f0b.tar.gz
webtools.maps-ca7a8b7cda77a9232ca789a1ce7037de179a1f0b.tar.xz
webtools.maps-ca7a8b7cda77a9232ca789a1ce7037de179a1f0b.zip
[419804] [regression] Servlets should not be disabled by default
-rw-r--r--releng.jeetools/maps/jst-j2ee-basic.map2
-rw-r--r--releng.jeetools/maps/jst-web-component-features.map2
-rw-r--r--releng/components/wtp-patches32x/category.xml16
-rw-r--r--releng/components/wtp-patches32x/tobeInstalled.properties11
-rw-r--r--releng/distribution/patches32x.site/prereqsToDisplay.php23
-rw-r--r--releng/distribution/patches32x.tests/tobeInstalled.properties19
-rw-r--r--releng/kepler/dependencies.properties16
-rw-r--r--releng/maps/build.cfg18
-rw-r--r--releng/maps/wtp-releng.map4
9 files changed, 94 insertions, 17 deletions
diff --git a/releng.jeetools/maps/jst-j2ee-basic.map b/releng.jeetools/maps/jst-j2ee-basic.map
index c10f63110..279d91f1b 100644
--- a/releng.jeetools/maps/jst-j2ee-basic.map
+++ b/releng.jeetools/maps/jst-j2ee-basic.map
@@ -9,7 +9,7 @@ plugin@org.eclipse.jst.j2ee.navigator.ui=GIT,tag=v201203142300,repo=git://git.ec
plugin@org.eclipse.jst.j2ee.ui=GIT,tag=v201304172200,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=plugins/org.eclipse.jst.j2ee.ui
plugin@org.eclipse.jst.j2ee=GIT,tag=v201308301800,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=plugins/org.eclipse.jst.j2ee
-plugin@org.eclipse.jst.j2ee.core=GIT,tag=v201306042200,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=plugins/org.eclipse.jst.j2ee.core
+plugin@org.eclipse.jst.j2ee.core=GIT,tag=v201310180700,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=plugins/org.eclipse.jst.j2ee.core
plugin@org.eclipse.jst.j2ee.web=GIT,tag=v201305311500,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=plugins/org.eclipse.jst.j2ee.web
plugin@org.eclipse.jst.servlet.ui=GIT,tag=v201303151600,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=plugins/org.eclipse.jst.servlet.ui
diff --git a/releng.jeetools/maps/jst-web-component-features.map b/releng.jeetools/maps/jst-web-component-features.map
index 9b6b9f00d..84b270c53 100644
--- a/releng.jeetools/maps/jst-web-component-features.map
+++ b/releng.jeetools/maps/jst-web-component-features.map
@@ -12,4 +12,6 @@ feature@org.eclipse.jst.web_ui.feature=GIT,tag=v201307171500,repo=git://git.ecli
feature@org.eclipse.jst.web_userdoc.feature=GIT,tag=v201303142300,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=features/org.eclipse.jst.web_userdoc.feature
+feature@org.eclipse.jst.web_core.feature.patch=GIT,tag=v201310180700,repo=git://git.eclipse.org/gitroot/jeetools/webtools.javaee.git,path=features/org.eclipse.jst.web_core.feature.patch
+
!*************** \ 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..84cda2fab
--- /dev/null
+++ b/releng/components/wtp-patches32x/category.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+
+ <feature
+ id="org.eclipse.jst.web_core.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/kepler/dependencies.properties b/releng/kepler/dependencies.properties
index 0e2ef5371..cd2c1911f 100644
--- a/releng/kepler/dependencies.properties
+++ b/releng/kepler/dependencies.properties
@@ -457,10 +457,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.file=wtp-sdk-${wtp.id}.zip
-wtp.name=WTP
+wtp.id=R-3.5.1-20130913223750
+wtp.dir.id=R3.5.1/R-3.5.1-20130913223750
+wtp.file=wtp4x-sdk-${wtp.id}.zip
+wtp.repo=wtp4x-repo-${wtp.id}.zip
+wtp.name=WTP 3.5.1
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}
@@ -469,9 +470,10 @@ wtp.url=http://download.eclipse.org${wtp.mirror.prefixuri}
# WTP tests, for patch builds
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.file = wtp4x-tests-${wtptests.id}.zip
+wtptests.repo = wtp4x-tests-repo-${wtptests.id}.zip
+wtptests.name = WTP Tests 3.5.1
+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 79e5d0cc8..14df84f90 100644
--- a/releng/maps/build.cfg
+++ b/releng/maps/build.cfg
@@ -1,6 +1,5 @@
-builderVersion=v201309101959
-#builderVersion=v201305202300
-#builderVersion=v201302132030
+builderVersion=v201310071900
+#builderVersion=v201309101959
# old signing method
#builderVersion=v201106202122
@@ -15,7 +14,7 @@ compilerArg=-showversion -encoding ISO-8859-1 -warn:-serial,-raw,-typeHiding,-un
#############################################################
-# eclipse.builder.location.name should be empty, if using tranditional basebuilder from eclipse releng (e.g. our patch builds still do)
+# eclipse.builder.location.name should be empty, if using traditional basebuilder from eclipse releng (e.g. our patch builds still do)
eclipse.builder.location.name=eclipse
# These last two are use in other scripts, the eclipse.builder.location.name above is not (at least, should not be).
eclipse.builder.base.install.dir=${env.BASE_BUILDERS}/${projectname}
@@ -41,16 +40,19 @@ doCreateFprojZips=yes
# omit qualifierArgValue to not flag a unit test error for "warnings"
qualifierArgValue=-countQualifierIncreaseOnlyAsError
#qualifierArgValue=
-referenceIDArgValue=R-3.5.0-20130610150119
-referenceURLArgValue=http://download.eclipse.org/webtools/downloads/drops/R3.5.0/R-3.5.0-20130610150119/versioningReference_R-3.5.0-20130610150119.xml
+referenceIDArgValue=R-3.5.1-20130913223750
+referenceURLArgValue=http://download.eclipse.org/webtools/downloads/drops/R3.5.1/R-3.5.1-20130913223750/versioningReference_R-3.5.1-20130913223750.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.jpt.jpadiagrameditor.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,org.eclipse.jpt.jpadiagrameditor_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.jpt.jpadiagrameditor.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,org.eclipse.jpt.jpadiagrameditor_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 86479b28e..970ead193 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=GIT,tag=v201102200505,repo=git://git.eclipse.org/gitroot/webtools/webtools.releng.git,path=features/org.eclipse.wtp.releng.tests.feature
plugin@org.eclipse.wtp.releng.versionchecker=GIT,tag=v201102240440,repo=git://git.eclipse.org/gitroot/webtools/webtools.releng.git,path=org.eclipse.wtp.releng.versionchecker
-plugin@org.eclipse.wtp.releng.tests=GIT,tag=v201105030345,repo=git://git.eclipse.org/gitroot/webtools/webtools.releng.git,path=tests/org.eclipse.wtp.releng.tests \ No newline at end of file
+plugin@org.eclipse.wtp.releng.tests=GIT,tag=v201105030345,repo=git://git.eclipse.org/gitroot/webtools/webtools.releng.git,path=tests/org.eclipse.wtp.releng.tests
+
+feature@org.eclipse.wtp.patch.assembly.feature=GIT,tag=v201310180700,repo=git://git.eclipse.org/gitroot/webtools/webtools.releng.git,path=assembly/features/org.eclipse.wtp.patch.assembly.feature \ No newline at end of file

Back to the top