JBoss Tools SVN: r44189 - trunk/build/publish.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-10-01 15:09:51 -0400 (Mon, 01 Oct 2012)
New Revision: 44189
Modified:
trunk/build/publish/promote.sh
Log:
fix example
Modified: trunk/build/publish/promote.sh
===================================================================
--- trunk/build/publish/promote.sh 2012-10-01 18:56:30 UTC (rev 44188)
+++ trunk/build/publish/promote.sh 2012-10-01 19:09:51 UTC (rev 44189)
@@ -6,7 +6,7 @@
OPERATION=COPY
if [[ $# -lt 1 ]]; then
- echo "Usage : $0 -BUILD_TYPE build_type -TARGET_PLATFORM target_platform -PROJECT_NAME project_name -TARGET_FOLDER target_folder -SOURCE_PATH SOURCE_PATH"
+ echo "Usage : $0 -BUILD_TYPE build_type -TARGET_PLATFORM target_platform -PROJECT_NAME project_name -TARGET_FOLDER target_folder -SOURCE_PATH source_path"
echo "Example: $0 -BUILD_TYPE integration -TARGET_PLATFORM juno -PROJECT_NAME base -TARGET_FOLDER as_4.0.juno -SOURCE_PATH jbosstools-4.0_stable_branch.component--as/all/repo"
echo "Example: $0 -BUILD_TYPE integration -TARGET_PLATFORM juno -PROJECT_NAME base -TARGET_FOLDER archives_4.0.juno -SOURCE_PATH jbosstools-4.0_stable_branch.component--archives/all/repo"
echo "Example: $0 -BUILD_TYPE integration -TARGET_PLATFORM juno -PROJECT_NAME base -TARGET_FOLDER jmx_4.0.juno -SOURCE_PATH jbosstools-4.0_stable_branch.component--jmx/all/repo"
12 years, 3 months
JBoss Tools SVN: r44188 - trunk/build/publish.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-10-01 14:56:30 -0400 (Mon, 01 Oct 2012)
New Revision: 44188
Modified:
trunk/build/publish/promote.sh
Log:
fix commandline args to use flags that match those in Jenkins
Modified: trunk/build/publish/promote.sh
===================================================================
--- trunk/build/publish/promote.sh 2012-10-01 18:01:28 UTC (rev 44187)
+++ trunk/build/publish/promote.sh 2012-10-01 18:56:30 UTC (rev 44188)
@@ -3,46 +3,48 @@
# these should not need to change
DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/
-PARENT_FOLDER=soa-tooling/
OPERATION=COPY
-# develoment or stable
-BUILD_TYPE=$1
+if [[ $# -lt 1 ]]; then
+ echo "Usage : $0 -BUILD_TYPE build_type -TARGET_PLATFORM target_platform -PROJECT_NAME project_name -TARGET_FOLDER target_folder -SOURCE_PATH SOURCE_PATH"
+ echo "Example: $0 -BUILD_TYPE integration -TARGET_PLATFORM juno -PROJECT_NAME base -TARGET_FOLDER as_4.0.juno -SOURCE_PATH jbosstools-4.0_stable_branch.component--as/all/repo"
+ echo "Example: $0 -BUILD_TYPE integration -TARGET_PLATFORM juno -PROJECT_NAME base -TARGET_FOLDER archives_4.0.juno -SOURCE_PATH jbosstools-4.0_stable_branch.component--archives/all/repo"
+ echo "Example: $0 -BUILD_TYPE integration -TARGET_PLATFORM juno -PROJECT_NAME base -TARGET_FOLDER jmx_4.0.juno -SOURCE_PATH jbosstools-4.0_stable_branch.component--jmx/all/repo"
+ echo "Example: $0 -BUILD_TYPE development -TARGET_PLATFORM juno -PROJECT_NAME modeshape -TARGET_FOLDER 3.3.0.Beta3 -SOURCE_PATH modeshape-tools-continuous/all/repo"
+ echo "Example: $0 -BUILD_TYPE stable -TARGET_PLATFORM indigo -PROJECT_NAME switchyard -TARGET_FOLDER 0.5.0.Final -SOURCE_PATH SwitchYard-Tools/eclipse"
+ exit 1
+fi
-# indigo, juno, kepler, ...
-TARGET_PLATFORM=$2
+# read commandline args
+while [[ "$#" -gt 0 ]]; do
+ case $1 in
+ '-SOURCE_PATH') SOURCE_PATH="$2"; shift 1;; # jbosstools-4.0_stable_branch.component--as/all/repo, modeshape-tools-continuous/all/repo, SwitchYard-Tools/eclipse
-# 0.5.0.Beta3, 0.6.0.Final, ...
-TARGET_FOLDER=$3
+ '-BUILD_TYPE') BUILD_TYPE="$2"; shift 1;; # integration, develoment or stable
+ '-TARGET_PLATFORM') TARGET_PLATFORM="$2"; shift 1;; # indigo, juno, kepler, ...
+ '-PARENT_FOLDER') PARENT_FOLDER="$2"; shift 1;; # soa-tooling, core
+ '-PROJECT_NAME') PROJECT_NAME="$2"; shift 1;; # switchyard, modeshape, droolsjbpm, ...
+ '-TARGET_FOLDER') TARGET_FOLDER="$2"; shift 1;; # 0.5.0.Beta3, 0.6.0.Final, ...
+ esac
+ shift 1
+done
-# switchyard, modeshape, droolsjbpm, ...
-PROJECT_NAME=$4
-
-# should be ${JOB_NAME}/all/repo, but may also be something else, eg., for SwitchYard-Tools, use ${JOB_NAME}/eclipse
-if [[ ${JOB_NAME} ]]; then PUBLISH_PATH=${JOB_NAME//-publish}; PUBLISH_PATH=${PUBLISH_PATH//-promote}/all/repo; fi
-if [[ $5 ]]; then PUBLISH_PATH=$5; fi
-
-if [[ $4 ]]; then
+if [[ ${PROJECT_NAME} ]]; then
echo "mkdir ${BUILD_TYPE}" | sftp tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/
echo "mkdir ${BUILD_TYPE}/${TARGET_PLATFORM}" | sftp tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/
echo "mkdir ${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}" | sftp tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/
- echo "mkdir ${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}${PROJECT_NAME}" | sftp tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/
+ echo "mkdir ${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}/${PROJECT_NAME}" | sftp tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/
if [[ ${OPERATION} == "MOVE" ]]; then
- echo -e "rename builds/staging/${PUBLISH_PATH} updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}${PROJECT_NAME}/${TARGET_FOLDER}" | sftp ${DESTINATION}
+ echo -e "rename builds/staging/${SOURCE_PATH} updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}/${PROJECT_NAME}/${TARGET_FOLDER}" | sftp ${DESTINATION}
else
- rsync -arzq --protocol=28 ${DESTINATION}/builds/staging/${PUBLISH_PATH}/* ${WORKSPACE}/${JOB_NAME}/
- rsync -arzq --protocol=28 --delete ${WORKSPACE}/${JOB_NAME}/* ${DESTINATION}/updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}${PROJECT_NAME}/${TARGET_FOLDER}/
+ rsync -arzq --protocol=28 ${DESTINATION}/builds/staging/${SOURCE_PATH}/* ${WORKSPACE}/${JOB_NAME}/
+ rsync -arzq --protocol=28 --delete ${WORKSPACE}/${JOB_NAME}/* ${DESTINATION}/updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}/${PROJECT_NAME}/${TARGET_FOLDER}/
fi
- echo "Site promoted by ${OPERATION} to: http://download.jboss.org/jbosstools/updates/${BUILD_TYPE}/${TARGET_PLATF..."
-else
- echo "Usage : $0 \${BUILD_TYPE} \${TARGET_PLATFORM} \${TARGET_FOLDER} \${PROJECT_NAME} [PUBLISH_PATH]"
- echo "Example: $0 development juno 3.3.0.Beta3 modeshape"
- echo "Example: $0 stable indigo 0.5.0.Final switchyard ${JOB_NAME}/eclipse"
- exit 1
+ echo "Site promoted by ${OPERATION} to: http://download.jboss.org/jbosstools/updates/${BUILD_TYPE}/${TARGET_PLATF..."
fi
-# JBIDE-12662: regenerate composite metadata in updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}${PROJECT_NAME} folder for all children
+# JBIDE-12662: regenerate composite metadata in updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}/${PROJECT_NAME} folder for all children
wget http://anonsvn.jboss.org/repos/jbosstools/trunk/build/util/cleanup/jbosst... --no-check-certificate
chmod +x jbosstools-cleanup.sh
-./jbosstools-cleanup.sh --dirs-to-scan "updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}${PROJECT_NAME}" --regen-metadata-only
+./jbosstools-cleanup.sh --dirs-to-scan "updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}/${PROJECT_NAME}" --regen-metadata-only
rm -f jbosstools-cleanup.sh
12 years, 3 months
JBoss Tools SVN: r44187 - trunk/build/publish.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-10-01 14:01:28 -0400 (Mon, 01 Oct 2012)
New Revision: 44187
Modified:
trunk/build/publish/promote.sh
Log:
JBIDE-12662: regenerate composite metadata in updates/// folder for all children
Modified: trunk/build/publish/promote.sh
===================================================================
--- trunk/build/publish/promote.sh 2012-10-01 18:01:21 UTC (rev 44186)
+++ trunk/build/publish/promote.sh 2012-10-01 18:01:28 UTC (rev 44187)
@@ -40,3 +40,9 @@
echo "Example: $0 stable indigo 0.5.0.Final switchyard ${JOB_NAME}/eclipse"
exit 1
fi
+
+# JBIDE-12662: regenerate composite metadata in updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}${PROJECT_NAME} folder for all children
+wget http://anonsvn.jboss.org/repos/jbosstools/trunk/build/util/cleanup/jbosst... --no-check-certificate
+chmod +x jbosstools-cleanup.sh
+./jbosstools-cleanup.sh --dirs-to-scan "updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}${PROJECT_NAME}" --regen-metadata-only
+rm -f jbosstools-cleanup.sh
12 years, 3 months
JBoss Tools SVN: r44186 - trunk/build/publish.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-10-01 14:01:21 -0400 (Mon, 01 Oct 2012)
New Revision: 44186
Modified:
trunk/build/publish/publish.sh
Log:
use new commandline args when calling jbosstools-cleanup.sh (JBIDE-12662)
Modified: trunk/build/publish/publish.sh
===================================================================
--- trunk/build/publish/publish.sh 2012-10-01 18:01:14 UTC (rev 44185)
+++ trunk/build/publish/publish.sh 2012-10-01 18:01:21 UTC (rev 44186)
@@ -482,7 +482,7 @@
# regenerate http://download.jboss.org/jbosstools/builds/nightly/*/*/composite*.xml files for up to 5 builds, cleaning anything older than 5 days old
wget http://anonsvn.jboss.org/repos/jbosstools/trunk/build/util/cleanup/jbosst... --no-check-certificate
chmod +x jbosstools-cleanup.sh
- ./jbosstools-cleanup.sh 5 5
+ ./jbosstools-cleanup.sh --keep 5 --age-to-delete 5
rm -f jbosstools-cleanup.sh
fi
12 years, 3 months
JBoss Tools SVN: r44185 - trunk/build/util/cleanup.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-10-01 14:01:14 -0400 (Mon, 01 Oct 2012)
New Revision: 44185
Modified:
trunk/build/util/cleanup/jbosstools-cleanup.sh
Log:
replace simple cmndline args with better flag processing; support optional override to NOT delete folders; set better defaults for folders to scan (JBIDE-12662)
Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-10-01 16:50:11 UTC (rev 44184)
+++ trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-10-01 18:01:14 UTC (rev 44185)
@@ -10,10 +10,36 @@
echo "Logfile: $log" | tee -a $log
echo "" | tee -a $log
-#commandline options so we can call this by itself using `jbosstools-cleanup.sh 1 2` or call it from within publish.sh using `jbosstools-cleanup.sh 5 5`
-if [[ $1 ]] && [[ $1 -gt 0 ]]; then numbuildstokeep=$1; else numbuildstokeep=1; fi # number of builds to keep per branch
-if [[ $2 ]] && [[ $2 -gt 0 ]]; then threshholdwhendelete=$2; else threshholdwhendelete=2; fi # age at which a build is available for delete
+#commandline options so we can call this by itself using
+# `jbosstools-cleanup.sh -k 1 -a 2`
+# or call it from within publish.sh using
+# `jbosstools-cleanup.sh -k 5 -a 5`
+#defauls
+numbuildstokeep=1000 # keep X builds per branch
+threshholdwhendelete=365 # purge builds more than X days old
+dirsToScan="builds/nightly/core builds/nightly/coretests builds/nightly/soa-tooling builds/nightly/soatests builds/nightly/webtools"
+delete=1 # if 1, files will be deleted. if 0, files will be listed for delete but not actually removed
+
+if [[ $# -lt 1 ]]; then
+ echo "Usage: $0 [-k num-builds-to-keep] [-a num-days-at-which-to-delete] [-d dirs-to-scan]"
+ echo "Example (Jenkins): $0 -k 1 -a 2"
+ echo "Example (publish.sh): $0 -k 5 -a 5"
+ echo "Example: $0 -d 'updates/development/indigo/soa-tooling/modeshape/' --regen-metadata-only"
+ exit 1;
+fi
+
+# read commandline args
+while [[ "$#" -gt 0 ]]; do
+ case $1 in
+ '-k'|'--keep') numbuildstokeep="$2"; shift 1;;
+ '-a'|'--age-to-delete') threshholdwhendelete="$2"; shift 1;;
+ '-d'|'--dirs-to-scan') dirsToScan="$2"; shift 1;;
+ '-M'|'--regen-metadata-only') delete=0; shift 0;;
+ esac
+ shift 1
+done
+
getSubDirs ()
{
getSubDirsReturn="";
@@ -43,12 +69,12 @@
# Check for $type builds more than $threshhold days old; keep minimum $numkeep builds per branch
clean ()
{
- type=$1 # nightly or release
+ type=$1 # builds/nightly or updates/development/juno/soa-tooling, etc.
numkeep=$2 # number of builds to keep per branch
- threshhold=$3 # age at which a build is available for delete
+ threshhold=$3 # purge builds more than $threshhold days old
echo "Check for $type builds more than $threshhold days old; keep minimum $numkeep builds per branch" | tee -a $log
- getSubDirs /downloads_htdocs/tools/builds/$type/ 0
+ getSubDirs /downloads_htdocs/tools/$type/ 0
subdirs=$getSubDirsReturn
for sd in $subdirs; do
getSubDirs $sd 1
@@ -77,14 +103,18 @@
done
if [[ $keep -eq 0 ]]; then
echo -n "- $sd/$dd (${day}d)... " | tee -a $log
- if [[ $USER == "hudson" ]]; then
- # can't delete the dir, but can at least purge its contents
- rm -fr /tmp/$dd; mkdir /tmp/$dd; pushd /tmp/$dd >/dev/null
- rsync --rsh=ssh --protocol=28 -r --delete . tools@filemgmt.jboss.org:$sd/$dd 2>&1 | tee -a $log
- echo -e "rmdir $dd" | sftp tools@filemgmt.jboss.org:$sd/
- popd >/dev/null; rm -fr /tmp/$dd
+ if [[ $delete -eq 1 ]]; then
+ if [[ $USER == "hudson" ]]; then
+ # can't delete the dir, but can at least purge its contents
+ rm -fr /tmp/$dd; mkdir /tmp/$dd; pushd /tmp/$dd >/dev/null
+ rsync --rsh=ssh --protocol=28 -r --delete . tools@filemgmt.jboss.org:$sd/$dd 2>&1 | tee -a $log
+ echo -e "rmdir $dd" | sftp tools@filemgmt.jboss.org:$sd/
+ popd >/dev/null; rm -fr /tmp/$dd
+ fi
+ echo "" | tee -a $log
+ else
+ echo " SKIPPED."
fi
- echo "" | tee -a $log
else
echo "+ $sd/$dd (${day}d)" | tee -a $log
fi
@@ -152,6 +182,6 @@
}
# now that we have all the methods and vars defined, let's do some cleaning!
-for dir in nightly/core nightly/coretests nightly/soa-tooling nightly/soatests nightly/webtools; do
+for dir in $dirsToScan; do
clean $dir $numbuildstokeep $threshholdwhendelete
done
12 years, 3 months
JBoss Tools SVN: r44184 - in trunk/maven/plugins: org.jboss.tools.maven.core/META-INF and 7 other directories.
by jbosstools-commits@lists.jboss.org
Author: fbricon
Date: 2012-10-01 12:50:11 -0400 (Mon, 01 Oct 2012)
New Revision: 44184
Added:
trunk/maven/plugins/org.jboss.tools.maven.hibernate/poms/
trunk/maven/plugins/org.jboss.tools.maven.hibernate/poms/hibernate332-template.xml
trunk/maven/plugins/org.jboss.tools.maven.hibernate/poms/hibernate36X-template.xml
trunk/maven/plugins/org.jboss.tools.maven.hibernate/poms/hibernate41X-template.xml
trunk/maven/plugins/org.jboss.tools.maven.hibernate/src/org/jboss/tools/maven/hibernate/libprov/
trunk/maven/plugins/org.jboss.tools.maven.hibernate/src/org/jboss/tools/maven/hibernate/libprov/HibernateLibValidator.java
trunk/maven/plugins/org.jboss.tools.maven.hibernate/src/org/jboss/tools/maven/hibernate/libprov/MavenHibernateLibraryProviderInstallOperationConfig.java
Removed:
trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-template.xml
trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate36X-template.xml
trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate41X-template.xml
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/HibernateLibValidator.java
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenHibernateLibraryProviderInstallOperationConfig.java
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF
trunk/maven/plugins/org.jboss.tools.maven.core/plugin.properties
trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml
trunk/maven/plugins/org.jboss.tools.maven.hibernate/META-INF/MANIFEST.MF
trunk/maven/plugins/org.jboss.tools.maven.hibernate/plugin.properties
trunk/maven/plugins/org.jboss.tools.maven.hibernate/plugin.xml
Log:
JBIDE-11997 Move the hibernate templates and library providers out of org.jboss.tools.maven.core into org.jboss.tools.maven.hibernate
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2012-10-01 16:13:01 UTC (rev 44183)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2012-10-01 16:50:11 UTC (rev 44184)
@@ -24,8 +24,6 @@
org.eclipse.m2e.model.edit;bundle-version="[1.0,2.0)";visibility:=reexport,
org.eclipse.core.expressions,
org.eclipse.jdt.ui;bundle-version="3.7.0",
- org.eclipse.jpt.common.core;bundle-version="1.0.0",
- org.eclipse.jpt.jpa.core,
org.eclipse.wst.common.emfworkbench.integration,
org.eclipse.m2e.wtp;bundle-version="0.16.0";resolution:=optional
Bundle-ActivationPolicy: lazy
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/plugin.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/plugin.properties 2012-10-01 16:13:01 UTC (rev 44183)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/plugin.properties 2012-10-01 16:50:11 UTC (rev 44184)
@@ -4,13 +4,9 @@
JBoss_Maven_Integration=JBoss Maven Integration
Adds_support_for_Maven=Adds support for Maven.
Maven_library_provider=Maven library provider
-Maven_Hibernate_library_provider=Maven Hibernate library provider
Maven_JSF_1_2_Libraries=Maven JSF 1.2 Libraries
Maven_JSF_1_1_Libraries=Maven JSF 1.1 Libraries
Maven_JSF_2_0_Libraries=Maven JSF 2.0 Libraries
-Hibernate_3_3_2_Libraries=Hibernate 3.3.2 Libraries
-Hibernate_3_6_X_Libraries=Hibernate 3.6.10 Libraries
-Hibernate_4_1_X_Libraries=Hibernate 4.1.0 Libraries
Maven_Portlet_1_0_Libraries=Maven Portlet 1.0 Libraries
Maven_Portlet_2_0_Libraries=Maven Portlet 2.0 Libraries
Maven_Portletbridge_2_0_0_ALPHA_Libraries=Maven Portletbridge 2.0.0 ALPHA Libraries
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml 2012-10-01 16:13:01 UTC (rev 44183)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml 2012-10-01 16:50:11 UTC (rev 44184)
@@ -73,17 +73,7 @@
<action type="UNINSTALL">
<operation class="org.jboss.tools.maven.core.libprov.MavenLibraryProviderUninstallOperation"/>
</action>
-
</provider>
-
- <provider id="maven-hibernate-library-provider" abstract="true" extends="maven-library-provider">
- <label>%Maven_Hibernate_library_provider</label>
- <priority>500</priority>
- <action type="INSTALL">
- <config class="org.jboss.tools.maven.core.libprov.MavenHibernateLibraryProviderInstallOperationConfig"/>
- <operation class="org.jboss.tools.maven.core.libprov.MavenLibraryProviderInstallOperation"/>
- </action>
- </provider>
</extension>
<extension point="org.eclipse.core.expressions.propertyTesters">
@@ -146,92 +136,7 @@
</enablement>
</provider>
</extension>
- <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders">
- <provider id="hibernate332-maven-library-provider" extends="maven-hibernate-library-provider">
- <label>%Hibernate_3_3_2_Libraries</label>
- <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/hibernate332-template.xml"/>
- <enablement>
- <and>
- <with variable="projectFacets">
- <test property="org.jboss.tools.maven.core.projectFacets" value="jpt.jpa,jboss.m2" forcePluginActivation="true"/>
- </with>
- <with variable="requestingProjectFacet">
- <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jpt.jpa:1.0" forcePluginActivation="true"/>
- </with>
- <with variable="jpaPlatform">
- <equals value="hibernate"/>
- </with>
- </and>
- </enablement>
- </provider>
- </extension>
- <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders">
- <provider id="hibernate41X-maven-library-provider" extends="maven-hibernate-library-provider">
- <label>%Hibernate_4_1_X_Libraries</label>
- <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/hibernate41X-template.xml"/>
- <enablement>
- <and>
- <with variable="projectFacets">
- <test property="org.jboss.tools.maven.core.projectFacets" value="jpt.jpa,jboss.m2" forcePluginActivation="true"/>
- </with>
- <with variable="requestingProjectFacet">
- <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jpt.jpa:2.0" forcePluginActivation="true"/>
- </with>
- </and>
- </enablement>
- </provider>
- </extension>
- <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders">
- <provider id="hibernate36X-maven-library-provider" extends="maven-hibernate-library-provider">
- <label>%Hibernate_3_6_X_Libraries</label>
- <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/hibernate36X-template.xml"/>
- <enablement>
- <or>
- <and>
- <with variable="projectFacets">
- <test property="org.jboss.tools.maven.core.projectFacets" value="jpt.jpa,jboss.m2" forcePluginActivation="true"/>
- </with>
- <with variable="requestingProjectFacet">
- <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jpt.jpa:2.0" forcePluginActivation="true"/>
- </with>
- </and>
- <and>
- <with variable="projectFacets">
- <test property="org.jboss.tools.maven.core.projectFacets" value="jpt.jpa,jboss.m2" forcePluginActivation="true"/>
- </with>
- <with variable="requestingProjectFacet">
- <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jpt.jpa:1.0" forcePluginActivation="true"/>
- </with>
- </and>
- </or>
- </enablement>
- </provider>
- </extension>
- <extension
- point="org.eclipse.jpt.common.core.libraryValidators">
- <!-- Using a noop validator to fix https://issues.jboss.org/browse/JBIDE-11624 -->
- <libraryValidator
- id="jpaMavenLibraryValidator"
- class="org.jboss.tools.maven.core.libprov.HibernateLibValidator">
- <enablement>
- <or>
- <with variable="libraryProvider">
- <test property="org.eclipse.jpt.common.core.extendsId" value="hibernate41X-maven-library-provider"/>
- </with>
- <with variable="libraryProvider">
- <test property="org.eclipse.jpt.common.core.extendsId" value="hibernate36X-maven-library-provider"/>
- </with>
- <with variable="libraryProvider">
- <test property="org.eclipse.jpt.common.core.extendsId" value="hibernate332-maven-library-provider"/>
- </with>
- </or>
- </enablement>
- </libraryValidator>
- </extension>
-
-
-
<extension point="org.eclipse.jst.common.project.facet.core.libraryProviders">
<provider id="portlet10-maven-library-provider" extends="maven-library-provider">
<label>%Maven_Portlet_1_0_Libraries</label>
@@ -265,8 +170,6 @@
</enablement>
</provider>
</extension>
-
-
<extension point="org.eclipse.jst.common.project.facet.core.libraryProviders">
<provider id="portletbridge200alpha-maven-library-provider" extends="maven-library-provider">
<label>%Maven_Portletbridge_2_0_0_ALPHA_Libraries</label>
Deleted: trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-template.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-template.xml 2012-10-01 16:13:01 UTC (rev 44183)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-template.xml 2012-10-01 16:50:11 UTC (rev 44184)
@@ -1,101 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>template</groupId>
- <artifactId>template</artifactId>
- <packaging>pom</packaging>
- <version>0.0.1-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>3.3.2.GA</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.4.0.GA</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>3.4.0.GA</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>3.1.0.GA</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-search</artifactId>
- <version>3.1.1.GA</version>
- <exclusions>
- <exclusion>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Deleted: trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate36X-template.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate36X-template.xml 2012-10-01 16:13:01 UTC (rev 44183)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate36X-template.xml 2012-10-01 16:50:11 UTC (rev 44184)
@@ -1,116 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>template</groupId>
- <artifactId>template</artifactId>
- <packaging>pom</packaging>
- <version>0.0.1-SNAPSHOT</version>
-
- <!-- inspired from https://raw.github.com/jbossas/quickstart/master/hibernate3/pom.xml -->
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>3.6.10.Final</version>
-
- <!-- Some transitive dependencies of Hibernate 3 are available
- in JBoss AS 7 as modules, so we don't include them in WEB-INF/lib, but instead
- depend on the modules -->
- <exclusions>
- <exclusion>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Define dependency version of hibernate-entitymanager -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>3.6.10.Final</version>
- <!-- Some transitive dependencies of Hibernate 3 are available
- in JBoss AS 7 as modules, so we don't include them in WEB-INF/lib, but instead
- depend on the modules -->
- <exclusions>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Define dependency version of hibernate-validator -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>3.1.0.GA</version>
- <!-- Some transitive dependencies of Hibernate 3 are available
- in JBoss AS 7 as modules, so we don't include them in WEB-INF/lib, but instead
- depend on the modules -->
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Define dependency version of hibernate-commons-annotations -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-commons-annotations</artifactId>
- <version>3.2.0.Final</version>
- <!-- Some transitive dependencies of Hibernate 3 are available
- in JBoss AS 7 as modules, so we don't include them in WEB-INF/lib, but instead
- depend on the modules -->
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-search</artifactId>
- <version>4.1.0.Final</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Deleted: trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate41X-template.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate41X-template.xml 2012-10-01 16:13:01 UTC (rev 44183)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate41X-template.xml 2012-10-01 16:50:11 UTC (rev 44184)
@@ -1,90 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>template</groupId>
- <artifactId>template</artifactId>
- <packaging>pom</packaging>
- <version>0.0.1-SNAPSHOT</version>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.bom</groupId>
- <artifactId>jboss-javaee-6.0-with-hibernate</artifactId>
- <version>1.0.0.M7</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-<dependencies>
- <!-- Hibernate ORM sub-modules -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <!-- this already part of JDK6 -->
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <scope>provided</scope>
- </dependency>
- <!--
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-envers</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-c3p0</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- </dependency>
- -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-search</artifactId>
- <version>4.1.0.Final</version>
- </dependency>
- <!--
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-search-analyzers</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-search-engine</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-search-orm</artifactId>
- </dependency>
- -->
- <!-- Tools
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator-annotation-processor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jpamodelgen</artifactId>
- </dependency>
- -->
-</dependencies>
-</project>
\ No newline at end of file
Deleted: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/HibernateLibValidator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/HibernateLibValidator.java 2012-10-01 16:13:01 UTC (rev 44183)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/HibernateLibValidator.java 2012-10-01 16:50:11 UTC (rev 44184)
@@ -1,34 +0,0 @@
-/*************************************************************************************
- * Copyright (c) 2012 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * JBoss by Red Hat - Initial implementation.
- ************************************************************************************/
-package org.jboss.tools.maven.core.libprov;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jpt.common.core.libprov.JptLibraryProviderInstallOperationConfig;
-import org.eclipse.jpt.common.core.libval.LibraryValidator;
-import org.eclipse.jpt.jpa.core.libprov.JpaLibraryProviderInstallOperationConfig;
-import org.jboss.tools.maven.core.MavenCoreActivator;
-
-public class HibernateLibValidator implements LibraryValidator {
-
- @SuppressWarnings("nls")
- public IStatus validate(JptLibraryProviderInstallOperationConfig config) {
- JpaLibraryProviderInstallOperationConfig jpaConfig = (JpaLibraryProviderInstallOperationConfig) config;
- IStatus status;
- if (jpaConfig.getJpaPlatform().getId().contains("hibernate")) {
- status = Status.OK_STATUS;
- } else {
- status = new Status(IStatus.ERROR, MavenCoreActivator.PLUGIN_ID, "This JPA implementation requires an Hibernate-based Platform");
- }
- return status;
- }
-
-}
Deleted: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenHibernateLibraryProviderInstallOperationConfig.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenHibernateLibraryProviderInstallOperationConfig.java 2012-10-01 16:13:01 UTC (rev 44183)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenHibernateLibraryProviderInstallOperationConfig.java 2012-10-01 16:50:11 UTC (rev 44184)
@@ -1,54 +0,0 @@
-/*************************************************************************************
- * Copyright (c) 2012 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * JBoss by Red Hat - Initial implementation.
- ************************************************************************************/
-package org.jboss.tools.maven.core.libprov;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jpt.common.core.JptCommonCorePlugin;
-import org.eclipse.jpt.common.core.libval.LibraryValidator;
-import org.eclipse.jpt.jpa.core.libprov.JpaLibraryProviderInstallOperationConfig;
-import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription;
-
-/**
- * @author Fred Bricon
- *
- */
-public class MavenHibernateLibraryProviderInstallOperationConfig extends MavenLibraryProviderInstallOperationConfig implements JpaLibraryProviderInstallOperationConfig {
-
- private JpaPlatformDescription jpaPlatformDescription;
-
- public JpaPlatformDescription getJpaPlatform() {
- return jpaPlatformDescription;
- }
-
- public void setJpaPlatform(JpaPlatformDescription jpaPlatform) {
- this.jpaPlatformDescription = jpaPlatform;
- }
-
- @Override
- public synchronized IStatus validate() {
- IStatus status = super.validate();
- if (! status.isOK()) {
- return status;
- }
- if (getJpaPlatform() != null) {
- for (LibraryValidator libraryValidator : JptCommonCorePlugin.getLibraryValidators(this)) {
- status = libraryValidator.validate(this);
- if (! status.isOK()) {
- return status;
- }
- }
- }
-
- return Status.OK_STATUS;
- }
-
-}
Modified: trunk/maven/plugins/org.jboss.tools.maven.hibernate/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.hibernate/META-INF/MANIFEST.MF 2012-10-01 16:13:01 UTC (rev 44183)
+++ trunk/maven/plugins/org.jboss.tools.maven.hibernate/META-INF/MANIFEST.MF 2012-10-01 16:50:11 UTC (rev 44184)
@@ -12,6 +12,8 @@
org.eclipse.jst.j2ee.core,
org.eclipse.jst.j2ee,
org.eclipse.wst.common.emfworkbench.integration,
+ org.eclipse.jpt.common.core;bundle-version="1.0.0",
+ org.eclipse.jpt.jpa.core,
org.hibernate.eclipse.console
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/maven/plugins/org.jboss.tools.maven.hibernate/plugin.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.hibernate/plugin.properties 2012-10-01 16:13:01 UTC (rev 44183)
+++ trunk/maven/plugins/org.jboss.tools.maven.hibernate/plugin.properties 2012-10-01 16:50:11 UTC (rev 44184)
@@ -1,4 +1,8 @@
Bundle-Vendor = JBoss by Red Hat
Bundle-Name = JBoss Maven Hibernate Configurator
Hibernate_Project_configurator = Hibernate
+Maven_Hibernate_library_provider=Maven Hibernate library provider
+Hibernate_3_3_2_Libraries=Hibernate 3.3.2 Libraries
+Hibernate_3_6_X_Libraries=Hibernate 3.6.10 Libraries
+Hibernate_4_1_X_Libraries=Hibernate 4.1.1 Libraries
Modified: trunk/maven/plugins/org.jboss.tools.maven.hibernate/plugin.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.hibernate/plugin.xml 2012-10-01 16:13:01 UTC (rev 44183)
+++ trunk/maven/plugins/org.jboss.tools.maven.hibernate/plugin.xml 2012-10-01 16:50:11 UTC (rev 44184)
@@ -22,5 +22,101 @@
name="%Hibernate_Project_configurator"
secondaryTo="org.eclipse.m2e.jdt.javaConfigurator"/>
</extension>
-
+
+ <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders">
+ <provider id="maven-hibernate-library-provider" abstract="true" extends="maven-library-provider">
+ <label>%Maven_Hibernate_library_provider</label>
+ <priority>500</priority>
+ <action type="INSTALL">
+ <config class="org.jboss.tools.maven.hibernate.libprov.MavenHibernateLibraryProviderInstallOperationConfig"/>
+ <operation class="org.jboss.tools.maven.core.libprov.MavenLibraryProviderInstallOperation"/>
+ </action>
+ </provider>
+ </extension>
+
+ <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders">
+ <provider id="hibernate332-maven-library-provider" extends="maven-hibernate-library-provider">
+ <label>%Hibernate_3_3_2_Libraries</label>
+ <param name="template" value="platform:/plugin/org.jboss.tools.maven.hibernate/poms/hibernate332-template.xml"/>
+ <enablement>
+ <and>
+ <with variable="projectFacets">
+ <test property="org.jboss.tools.maven.core.projectFacets" value="jpt.jpa,jboss.m2" forcePluginActivation="true"/>
+ </with>
+ <with variable="requestingProjectFacet">
+ <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jpt.jpa:1.0" forcePluginActivation="true"/>
+ </with>
+ <with variable="jpaPlatform">
+ <equals value="hibernate"/>
+ </with>
+ </and>
+ </enablement>
+ </provider>
+ </extension>
+ <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders">
+ <provider id="hibernate41X-maven-library-provider" extends="maven-hibernate-library-provider">
+ <label>%Hibernate_4_1_X_Libraries</label>
+ <param name="template" value="platform:/plugin/org.jboss.tools.maven.hibernate/poms/hibernate41X-template.xml"/>
+ <enablement>
+ <and>
+ <with variable="projectFacets">
+ <test property="org.jboss.tools.maven.core.projectFacets" value="jpt.jpa,jboss.m2" forcePluginActivation="true"/>
+ </with>
+ <with variable="requestingProjectFacet">
+ <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jpt.jpa:2.0" forcePluginActivation="true"/>
+ </with>
+ </and>
+ </enablement>
+ </provider>
+ </extension>
+ <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders">
+ <provider id="hibernate36X-maven-library-provider" extends="maven-hibernate-library-provider">
+ <label>%Hibernate_3_6_X_Libraries</label>
+ <param name="template" value="platform:/plugin/org.jboss.tools.maven.hibernate/poms/hibernate36X-template.xml"/>
+ <enablement>
+ <or>
+ <and>
+ <with variable="projectFacets">
+ <test property="org.jboss.tools.maven.core.projectFacets" value="jpt.jpa,jboss.m2" forcePluginActivation="true"/>
+ </with>
+ <with variable="requestingProjectFacet">
+ <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jpt.jpa:2.0" forcePluginActivation="true"/>
+ </with>
+ </and>
+ <and>
+ <with variable="projectFacets">
+ <test property="org.jboss.tools.maven.core.projectFacets" value="jpt.jpa,jboss.m2" forcePluginActivation="true"/>
+ </with>
+ <with variable="requestingProjectFacet">
+ <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jpt.jpa:1.0" forcePluginActivation="true"/>
+ </with>
+ </and>
+ </or>
+ </enablement>
+ </provider>
+ </extension>
+
+ <extension
+ point="org.eclipse.jpt.common.core.libraryValidators">
+ <!-- Using a noop validator to fix https://issues.jboss.org/browse/JBIDE-11624 -->
+ <libraryValidator
+ id="jpaMavenLibraryValidator"
+ class="org.jboss.tools.maven.hibernate.libprov.HibernateLibValidator">
+ <enablement>
+ <or>
+ <with variable="libraryProvider">
+ <test property="org.eclipse.jpt.common.core.extendsId" value="hibernate41X-maven-library-provider"/>
+ </with>
+ <with variable="libraryProvider">
+ <test property="org.eclipse.jpt.common.core.extendsId" value="hibernate36X-maven-library-provider"/>
+ </with>
+ <with variable="libraryProvider">
+ <test property="org.eclipse.jpt.common.core.extendsId" value="hibernate332-maven-library-provider"/>
+ </with>
+ </or>
+ </enablement>
+ </libraryValidator>
+ </extension>
+
+
</plugin>
Added: trunk/maven/plugins/org.jboss.tools.maven.hibernate/poms/hibernate332-template.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.hibernate/poms/hibernate332-template.xml (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.hibernate/poms/hibernate332-template.xml 2012-10-01 16:50:11 UTC (rev 44184)
@@ -0,0 +1,101 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>template</groupId>
+ <artifactId>template</artifactId>
+ <packaging>pom</packaging>
+ <version>0.0.1-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.3.2.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.4.0.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>3.4.0.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>3.1.0.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search</artifactId>
+ <version>3.1.1.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven/plugins/org.jboss.tools.maven.hibernate/poms/hibernate36X-template.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.hibernate/poms/hibernate36X-template.xml (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.hibernate/poms/hibernate36X-template.xml 2012-10-01 16:50:11 UTC (rev 44184)
@@ -0,0 +1,116 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>template</groupId>
+ <artifactId>template</artifactId>
+ <packaging>pom</packaging>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <!-- inspired from https://raw.github.com/jbossas/quickstart/master/hibernate3/pom.xml -->
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.6.10.Final</version>
+
+ <!-- Some transitive dependencies of Hibernate 3 are available
+ in JBoss AS 7 as modules, so we don't include them in WEB-INF/lib, but instead
+ depend on the modules -->
+ <exclusions>
+ <exclusion>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Define dependency version of hibernate-entitymanager -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>3.6.10.Final</version>
+ <!-- Some transitive dependencies of Hibernate 3 are available
+ in JBoss AS 7 as modules, so we don't include them in WEB-INF/lib, but instead
+ depend on the modules -->
+ <exclusions>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Define dependency version of hibernate-validator -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>3.1.0.GA</version>
+ <!-- Some transitive dependencies of Hibernate 3 are available
+ in JBoss AS 7 as modules, so we don't include them in WEB-INF/lib, but instead
+ depend on the modules -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Define dependency version of hibernate-commons-annotations -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <version>3.2.0.Final</version>
+ <!-- Some transitive dependencies of Hibernate 3 are available
+ in JBoss AS 7 as modules, so we don't include them in WEB-INF/lib, but instead
+ depend on the modules -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search</artifactId>
+ <version>4.1.0.Final</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven/plugins/org.jboss.tools.maven.hibernate/poms/hibernate41X-template.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.hibernate/poms/hibernate41X-template.xml (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.hibernate/poms/hibernate41X-template.xml 2012-10-01 16:50:11 UTC (rev 44184)
@@ -0,0 +1,89 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>template</groupId>
+ <artifactId>template</artifactId>
+ <packaging>pom</packaging>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.bom</groupId>
+ <artifactId>jboss-javaee-6.0-with-hibernate</artifactId>
+ <version>1.0.1.Final</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+<dependencies>
+ <!-- Hibernate ORM sub-modules -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <!-- this already part of JDK6 -->
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-envers</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-c3p0</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-ehcache</artifactId>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search</artifactId>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search-analyzers</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search-engine</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search-orm</artifactId>
+ </dependency>
+ -->
+ <!-- Tools
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator-annotation-processor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jpamodelgen</artifactId>
+ </dependency>
+ -->
+</dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven/plugins/org.jboss.tools.maven.hibernate/src/org/jboss/tools/maven/hibernate/libprov/HibernateLibValidator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.hibernate/src/org/jboss/tools/maven/hibernate/libprov/HibernateLibValidator.java (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.hibernate/src/org/jboss/tools/maven/hibernate/libprov/HibernateLibValidator.java 2012-10-01 16:50:11 UTC (rev 44184)
@@ -0,0 +1,34 @@
+/*************************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
+package org.jboss.tools.maven.hibernate.libprov;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jpt.common.core.libprov.JptLibraryProviderInstallOperationConfig;
+import org.eclipse.jpt.common.core.libval.LibraryValidator;
+import org.eclipse.jpt.jpa.core.libprov.JpaLibraryProviderInstallOperationConfig;
+import org.jboss.tools.maven.core.MavenCoreActivator;
+
+public class HibernateLibValidator implements LibraryValidator {
+
+ @SuppressWarnings("nls")
+ public IStatus validate(JptLibraryProviderInstallOperationConfig config) {
+ JpaLibraryProviderInstallOperationConfig jpaConfig = (JpaLibraryProviderInstallOperationConfig) config;
+ IStatus status;
+ if (jpaConfig.getJpaPlatform().getId().contains("hibernate")) {
+ status = Status.OK_STATUS;
+ } else {
+ status = new Status(IStatus.ERROR, MavenCoreActivator.PLUGIN_ID, "This JPA implementation requires an Hibernate-based Platform");
+ }
+ return status;
+ }
+
+}
Added: trunk/maven/plugins/org.jboss.tools.maven.hibernate/src/org/jboss/tools/maven/hibernate/libprov/MavenHibernateLibraryProviderInstallOperationConfig.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.hibernate/src/org/jboss/tools/maven/hibernate/libprov/MavenHibernateLibraryProviderInstallOperationConfig.java (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.hibernate/src/org/jboss/tools/maven/hibernate/libprov/MavenHibernateLibraryProviderInstallOperationConfig.java 2012-10-01 16:50:11 UTC (rev 44184)
@@ -0,0 +1,55 @@
+/*************************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
+package org.jboss.tools.maven.hibernate.libprov;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jpt.common.core.JptCommonCorePlugin;
+import org.eclipse.jpt.common.core.libval.LibraryValidator;
+import org.eclipse.jpt.jpa.core.libprov.JpaLibraryProviderInstallOperationConfig;
+import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription;
+import org.jboss.tools.maven.core.libprov.MavenLibraryProviderInstallOperationConfig;
+
+/**
+ * @author Fred Bricon
+ *
+ */
+public class MavenHibernateLibraryProviderInstallOperationConfig extends MavenLibraryProviderInstallOperationConfig implements JpaLibraryProviderInstallOperationConfig {
+
+ private JpaPlatformDescription jpaPlatformDescription;
+
+ public JpaPlatformDescription getJpaPlatform() {
+ return jpaPlatformDescription;
+ }
+
+ public void setJpaPlatform(JpaPlatformDescription jpaPlatform) {
+ this.jpaPlatformDescription = jpaPlatform;
+ }
+
+ @Override
+ public synchronized IStatus validate() {
+ IStatus status = super.validate();
+ if (! status.isOK()) {
+ return status;
+ }
+ if (getJpaPlatform() != null) {
+ for (LibraryValidator libraryValidator : JptCommonCorePlugin.getLibraryValidators(this)) {
+ status = libraryValidator.validate(this);
+ if (! status.isOK()) {
+ return status;
+ }
+ }
+ }
+
+ return Status.OK_STATUS;
+ }
+
+}
12 years, 3 months
JBoss Tools SVN: r44183 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-10-01 12:13:01 -0400 (Mon, 01 Oct 2012)
New Revision: 44183
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
reorder .target files to match mistria's ordering
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-10-01 16:03:12 UTC (rev 44182)
+++ trunk/build/target-platform/jbds.target 2012-10-01 16:13:01 UTC (rev 44183)
@@ -40,21 +40,6 @@
<unit id="org.junit" version="4.10.0.v4_10_0_v20120426-0900"/>
<unit id="org.junit" version="3.8.2.v3_8_2_v20100427-1100"/>
- <!-- m2e, m2e-wtp + deps -->
- <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/>
- <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120914-0945"/>
- <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125-signed-201209140800"/>
- <unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
- <unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
- <unit id="ch.qos.logback.slf4j" version="1.0.0.v20120123-1500"/>
- <unit id="org.slf4j.api" version="1.6.4.v20120130-2120"/>
- <unit id="com.ning.async-http-client" version="1.6.5.20120903-0645"/>
- <unit id="org.jboss.netty" version="3.2.5.Final-20120903-0645"/>
- <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.101.v20120524-1717"/>
- <unit id="org.eclipse.equinox.p2.discovery" version="1.0.200.v20120524-1717"/>
- <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110808-1657"/>
-
<!-- Orbit bundles -->
<unit id="javax.activation" version="1.1.0.v201108011116"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
@@ -75,6 +60,34 @@
<unit id="org.apache.lucene.snowball" version="2.9.1.v20100421-0704"/>
<unit id="org.apache.lucene.spellchecker" version="3.5.0.v20120319-2345"/>
+ <unit id="org.apache.axis" version="1.4.0.v201005080400"/>
+ <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
+ <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+ <unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
+ <unit id="org.apache.jasper" version="7.0.26.v201205030742"/>
+ <unit id="org.apache.catalina" version="7.0.26.v201205021508"/>
+ <unit id="javax.ejb" version="3.1.1.v201204261316"/>
+ <unit id="javax.transaction" version="1.1.1.v201105210645"/>
+ <unit id="javax.el" version="2.2.0.v201108011116"/>
+ <unit id="javax.xml.rpc" version="1.1.0.v201005080400"/>
+
+ <!-- m2e, m2e-wtp + deps -->
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/>
+ <unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
+ <unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
+ <unit id="ch.qos.logback.slf4j" version="1.0.0.v20120123-1500"/>
+ <unit id="org.slf4j.api" version="1.6.4.v20120130-2120"/>
+ <unit id="com.ning.async-http-client" version="1.6.5.20120903-0645"/>
+ <unit id="org.jboss.netty" version="3.2.5.Final-20120903-0645"/>
+ <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120914-0945"/>
+ <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125-signed-201209140800"/>
+
+
+ <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.101.v20120524-1717"/>
+ <unit id="org.eclipse.equinox.p2.discovery" version="1.0.200.v20120524-1717"/>
+ <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110808-1657"/>
+
<!-- EMF, XSD -->
<unit id="org.eclipse.emf.workspace.feature.group" version="1.6.0.v20120328-0001-37708s734E377I3B4C2"/>
<unit id="org.eclipse.emf.validation.feature.group" version="1.6.0.v20120328-0001-479-9oB56N5BBR6LCA6"/>
@@ -133,14 +146,6 @@
<unit id="org.eclipse.rcp.feature.group" version="4.2.1.v20120814-120134-7IAPA8BrHQicS-rjP0GbqK780kMy"/>
<unit id="org.eclipse.pde.feature.group" version="3.8.1.v20120814-104528-7c7vFixFFt6Zr5aC6KM6LGWSd"/>
<unit id="org.eclipse.help.feature.group" version="1.4.1.v20120726-051048-8R7xFOUFLWUl7MoSKV_RBXl27"/>
- <!-- update.ui is on the 3.8 site, not the 4.2 site -->
- <unit id="org.eclipse.update.ui" version="3.3.0.v20120523-1742"/>
- <!-- there are two versions of this IU -
- 4.2 has ./org.eclipse.update.core_3.2.600.v20120530-1204.jar and
- 3.8 has ./org.eclipse.update.core_3.2.600.v20120530-120908.jar
- -->
- <!-- <unit id="org.eclipse.update.core" version="3.2.600.v20120530-120908"/> -->
- <unit id="org.eclipse.update.core" version="3.2.600.v20120820-205746"/>
<!-- DTP -->
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.10.1.v201208161415-7707FCcNBHLCgLUEdUb"/>
@@ -177,6 +182,7 @@
<unit id="org.eclipse.datatools.common.doc.user.feature.group" version="1.10.1.v201208161415-26-311A16321A3557"/>
<unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.10.1.v201208161415-37D-7733L3D753L7BBF"/>
<unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.10.1.v201208161415-37D-7733L3D753L7BBF"/>
+ <unit id="org.eclipse.persistence.jpa.feature.group" version="2.4.0.v20120608-r11652"/>
<!-- RSE, TM -->
<unit id="org.eclipse.rse.feature.group" version="3.4.1.201209191030-7L7IFBY83omx__z0RFpKdWB-r5MS"/>
@@ -193,61 +199,6 @@
<unit id="org.eclipse.tm.terminal.feature.group" version="3.2.1.201209191030-41031231A2A2141"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.100.201209191030-308Z31231A2A2141"/>
- <!-- WTP -->
- <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.4.1.v201208241503-7E7JFBjF9JgLWgMhh4X6Ps"/>
- <unit id="org.eclipse.jst.jee" version="1.0.500.v201202020745"/>
- <unit id="org.eclipse.wst.common.frameworks" version="1.2.200.v201203141800"/>
- <unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.300.v201111030424"/>
- <unit id="org.eclipse.jst.jee.web" version="1.0.301.v201007070907"/>
- <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/>
- <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/>
- <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
- <unit id="org.eclipse.jpt.common.feature.feature.group" version="1.2.1.v201208222210-663AkF7BF7cFFFFB7"/>
- <unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.2.1.v201208222210-3318s73573J777753"/>
- <unit id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.2.1.v201208222210-7M7J78F7RZHQYJAQsS4SVFD7"/>
- <unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.2.1.v201208222210-7S7K8gFBBoPapQieUcW_TFD7"/>
- <unit id="org.eclipse.persistence.jpa.feature.group" version="2.4.0.v20120608-r11652"/>
- <unit id="org.eclipse.jsf.feature.feature.group" version="3.4.1.v201208241503-7E7JFBjF9JgLWgMhh4X6Ps"/>
- <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/>
- <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.4.0.v201108110300-52FShAkF7BA8O8J9OC8"/>
- <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.4.0.v201107072300-7b7JIM0FSK2WM1PS9Ar7AKUz0TrWn"/>
- <unit id="org.eclipse.jst.enterprise_userdoc.feature.feature.group" version="3.3.100.v201105122000-62FUGBgJ9EA9aEeHRHc"/>
- <unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.201.v201208241503-20A87w312319352614"/>
- <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.101.v20120821_1416-777HFL6CcNBDmBjKOFHIEB"/>
- <unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.200.v20120517_1442-20A77w31231628a2553"/>
- <unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.4.0.v20120503_1042-31FEe8s73554A4Fa2153"/>
- <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.4.0.v20120503_1042-7A77FHr9xFcC2CFLZBCJMHLg7D64"/>
- <unit id="org.eclipse.jst.server_userdoc.feature.feature.group" version="3.3.100.v20110303-2-Eo7w3121162A3329"/>
- <unit id="org.eclipse.jst.web_core.feature.feature.group" version="3.4.1.v201208160300-7Q7EGVxFE9LeAJKvylauQtyivz-0sSxz003877"/>
- <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.8.v201208241503-46DI9oB58B5TBH8K5E"/>
- <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.4.1.v201208231800-7F7DFSlC25UrkX5qvgnXz0LZDA6kiWwylC3uxsWk"/>
- <unit id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.4.1.v201208231800-2117w312319373364"/>
- <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/>
- <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
- <unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.200.v201109042201-5-F8NAkF7BB7U8PEK8K"/>
- <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.2.0.v201204151854-7E7AF70F8NcJS_KqT5TpXq"/>
- <unit id="org.eclipse.jst.ws.jaxws_userdoc.feature.feature.group" version="1.0.200.v201205012246-3-DF8s73573D795LAF"/>
- <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.4.1.v201208162200-7B7EFMTF7RZHOjIuOyR0QS"/>
- <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.4.0.v201202292300-377F8N8s735555393B7B"/>
- <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.4.1.v201208170300-7C7AFeEEdhOaweJhCnQfykJvPz-S1RT"/>
- <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.4.1.v201208171701-7H7DFg0FC7sReqSyfqesWi"/>
- <unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.201.v20120821_1517-51F9xAkF7AL8QDRl8GAT"/>
- <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.100.v20110810_1722-33Et8s73563B6Ha3113"/>
- <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.101.v20120817_1533-7B7AFJQAtMduXxeIc0IpSdC97A9"/>
- <unit id="org.eclipse.wst.server_userdoc.feature.feature.group" version="3.3.200.v20120830_2320-20Eo7w31231941a3363"/>
- <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.4.1.v201208170345-7E7HFSlAJz-mw9qA03HKTuLirZsDJyCao"/>
- <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.4.1.v201208170345-7O7MFsPEMkBJz0wtb-ccsarPSceUIHO9iKk6XVPV"/>
- <unit id="org.eclipse.wst.web_userdoc.feature.feature.group" version="3.3.0.v201102200555-31Eo8s734B3E4H7799"/>
- <unit id="org.eclipse.wst.ws_core.feature.feature.group" version="3.4.0.v201108230503-7L7RFoGFGtGd-xhuy-rRwz-2766"/>
- <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.4.1.v201208172041-7I7CFkXEtEoXHw684K6n3-z-F3stz0lKFx169q5z"/>
- <unit id="org.eclipse.wst.ws_userdoc.feature.feature.group" version="3.1.300.v201102200555-44FR79oB5855Q8IBD7G"/>
- <unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.301.v201102200555-2407w312123151655"/>
- <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.4.1.v201208170345-7C7OFm5F7RZHQRIsOz-Nz-_n"/>
- <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.4.1.v201208170345-7H7GFeFDxumUpsw5rgjWnKDrsz0p4ymwjQz00T2S"/>
- <unit id="org.eclipse.wst.xml_userdoc.feature.feature.group" version="3.3.0.v201102071641-50FYwAkF7B77UBZFDBL"/>
- <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="2.0.100.v201203131922-7A7K0CcNBGPCTJ_FUOb"/>
- <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.3.100.v201111021744-7T7ZFUaFIqUoJuvaKoCpQDKaGVPc"/>
-
<!-- JBIDE-9549, JBDS-1904 add egit/jgit and mylyn support to TP, including dependent plugins -->
<unit id="org.eclipse.jsch.ui" version="1.1.400.v20120522-1148"/>
<unit id="org.eclipse.jsch.core" version="1.1.400.v20120522-1148"/>
@@ -291,6 +242,29 @@
<unit id="org.eclipse.mylyn.tasks.ui" version="3.8.2.v20120916-1200"/>
<unit id="org.eclipse.mylyn.tasks.core" version="3.8.2.v20120916-1200"/>
<unit id="org.eclipse.mylyn.tasks.bugs" version="3.8.2.v20120916-1200"/>
+
+ <unit id="org.eclipse.ui" version="3.103.0.v20120705-114351"/>
+ <unit id="org.eclipse.core.runtime" version="3.8.0.v20120521-2346"/>
+ <unit id="org.eclipse.core.resources" version="3.8.1.v20120802-154922"/>
+ <unit id="org.eclipse.ui.ide" version="3.8.1.v20120828-165804"/>
+ <unit id="org.eclipse.ui.workbench.texteditor" version="3.8.0.v20120523-1310"/>
+ <unit id="org.eclipse.jface.text" version="3.8.1.v20120828-155502"/>
+ <unit id="org.eclipse.osgi" version="3.8.1.v20120830-144521"/>
+ <unit id="org.eclipse.core.filesystem" version="1.3.200.v20120522-2012"/>
+ <unit id="org.eclipse.ui.forms" version="3.5.200.v20120705-114351"/>
+ <unit id="org.eclipse.ui.editors" version="3.8.0.v20120523-1540"/>
+ <unit id="org.eclipse.team.core" version="3.6.100.v20120524-0627"/>
+ <unit id="org.eclipse.team.ui" version="3.6.200.v20120522-1148"/>
+ <unit id="org.eclipse.jface" version="3.8.101.v20120817-083647"/>
+ <unit id="org.eclipse.compare" version="3.5.300.v20120522-1148"/>
+ <!-- update.ui is on the 3.8 site, not the 4.2 site -->
+ <unit id="org.eclipse.update.ui" version="3.3.0.v20120523-1742"/>
+ <!-- there are two versions of this IU -
+ 4.2 has ./org.eclipse.update.core_3.2.600.v20120530-1204.jar and
+ 3.8 has ./org.eclipse.update.core_3.2.600.v20120530-120908.jar
+ -->
+ <!-- <unit id="org.eclipse.update.core" version="3.2.600.v20120530-120908"/> -->
+ <unit id="org.eclipse.update.core" version="3.2.600.v20120820-205746"/>
<unit id="com.atlassian.connector.commons" version="4.0.0.v20120628"/>
<unit id="com.atlassian.connector.eclipse.bamboo.core" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.bamboo.ui" version="3.0.6.v20120628"/>
@@ -316,35 +290,69 @@
<!-- dep for com.atlassian.connector.eclipse.directclickthrough.ui -->
<unit id="com.thoughtworks.xstream" version="1.3.1.v201111240924"/>
<unit id="org.xmlpull" version="1.1.3.4_v201201052148"/>
- <unit id="org.eclipse.ui" version="3.103.0.v20120705-114351"/>
- <unit id="org.eclipse.core.runtime" version="3.8.0.v20120521-2346"/>
- <unit id="org.eclipse.core.resources" version="3.8.1.v20120802-154922"/>
- <unit id="org.eclipse.ui.ide" version="3.8.1.v20120828-165804"/>
- <unit id="org.eclipse.ui.workbench.texteditor" version="3.8.0.v20120523-1310"/>
- <unit id="org.eclipse.jface.text" version="3.8.1.v20120828-155502"/>
- <unit id="org.eclipse.osgi" version="3.8.1.v20120830-144521"/>
- <unit id="org.eclipse.core.filesystem" version="1.3.200.v20120522-2012"/>
- <unit id="org.eclipse.ui.forms" version="3.5.200.v20120705-114351"/>
- <unit id="org.eclipse.ui.editors" version="3.8.0.v20120523-1540"/>
- <unit id="org.eclipse.team.core" version="3.6.100.v20120524-0627"/>
- <unit id="org.eclipse.team.ui" version="3.6.200.v20120522-1148"/>
- <unit id="org.eclipse.jface" version="3.8.101.v20120817-083647"/>
- <unit id="org.eclipse.compare" version="3.5.300.v20120522-1148"/>
- <unit id="org.apache.axis" version="1.4.0.v201005080400"/>
- <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
- <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
- <unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
+
<unit id="org.jdom_jaxen" version="1.0.0.20081203-1100"/>
<unit id="org.mortbay.jetty.server" version="6.1.23.v201012071420"/>
<unit id="org.mortbay.jetty.util" version="6.1.23.v201012071420"/>
- <unit id="org.apache.jasper" version="7.0.26.v201205030742"/>
- <unit id="org.apache.catalina" version="7.0.26.v201205021508"/>
- <unit id="javax.ejb" version="3.1.1.v201204261316"/>
- <unit id="javax.transaction" version="1.1.1.v201105210645"/>
+
<unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
- <unit id="javax.xml.rpc" version="1.1.0.v201005080400"/>
- <unit id="javax.el" version="2.2.0.v201108011116"/>
+ <!-- WTP -->
+ <unit id="org.eclipse.jst.jee" version="1.0.500.v201202020745"/>
+ <unit id="org.eclipse.jst.jee.web" version="1.0.301.v201007070907"/>
+ <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/>
+ <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/>
+ <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
+
+ <unit id="org.eclipse.jpt.common.feature.feature.group" version="1.2.1.v201208222210-663AkF7BF7cFFFFB7"/>
+ <unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.2.1.v201208222210-3318s73573J777753"/>
+ <unit id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.2.1.v201208222210-7M7J78F7RZHQYJAQsS4SVFD7"/>
+ <unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.2.1.v201208222210-7S7K8gFBBoPapQieUcW_TFD7"/>
+
+ <unit id="org.eclipse.jsf.feature.feature.group" version="3.4.1.v201208241503-7E7JFBjF9JgLWgMhh4X6Ps"/>
+ <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.4.1.v201208241503-7E7JFBjF9JgLWgMhh4X6Ps"/>
+ <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/>
+ <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.4.0.v201108110300-52FShAkF7BA8O8J9OC8"/>
+ <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.4.0.v201107072300-7b7JIM0FSK2WM1PS9Ar7AKUz0TrWn"/>
+ <unit id="org.eclipse.jst.enterprise_userdoc.feature.feature.group" version="3.3.100.v201105122000-62FUGBgJ9EA9aEeHRHc"/>
+ <unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.201.v201208241503-20A87w312319352614"/>
+ <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.101.v20120821_1416-777HFL6CcNBDmBjKOFHIEB"/>
+ <unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.200.v20120517_1442-20A77w31231628a2553"/>
+ <unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.4.0.v20120503_1042-31FEe8s73554A4Fa2153"/>
+ <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.4.0.v20120503_1042-7A77FHr9xFcC2CFLZBCJMHLg7D64"/>
+ <unit id="org.eclipse.jst.server_userdoc.feature.feature.group" version="3.3.100.v20110303-2-Eo7w3121162A3329"/>
+ <unit id="org.eclipse.jst.web_core.feature.feature.group" version="3.4.1.v201208160300-7Q7EGVxFE9LeAJKvylauQtyivz-0sSxz003877"/>
+ <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.8.v201208241503-46DI9oB58B5TBH8K5E"/>
+ <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.4.1.v201208231800-7F7DFSlC25UrkX5qvgnXz0LZDA6kiWwylC3uxsWk"/>
+ <unit id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.4.1.v201208231800-2117w312319373364"/>
+ <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/>
+ <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
+ <unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.200.v201109042201-5-F8NAkF7BB7U8PEK8K"/>
+ <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.2.0.v201204151854-7E7AF70F8NcJS_KqT5TpXq"/>
+ <unit id="org.eclipse.jst.ws.jaxws_userdoc.feature.feature.group" version="1.0.200.v201205012246-3-DF8s73573D795LAF"/>
+
+ <unit id="org.eclipse.wst.common.frameworks" version="1.2.200.v201203141800"/>
+ <unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.300.v201111030424"/>
+ <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.4.1.v201208162200-7B7EFMTF7RZHOjIuOyR0QS"/>
+ <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.4.0.v201202292300-377F8N8s735555393B7B"/>
+ <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.4.1.v201208170300-7C7AFeEEdhOaweJhCnQfykJvPz-S1RT"/>
+ <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.4.1.v201208171701-7H7DFg0FC7sReqSyfqesWi"/>
+ <unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.201.v20120821_1517-51F9xAkF7AL8QDRl8GAT"/>
+ <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.100.v20110810_1722-33Et8s73563B6Ha3113"/>
+ <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.101.v20120817_1533-7B7AFJQAtMduXxeIc0IpSdC97A9"/>
+ <unit id="org.eclipse.wst.server_userdoc.feature.feature.group" version="3.3.200.v20120830_2320-20Eo7w31231941a3363"/>
+ <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.4.1.v201208170345-7E7HFSlAJz-mw9qA03HKTuLirZsDJyCao"/>
+ <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.4.1.v201208170345-7O7MFsPEMkBJz0wtb-ccsarPSceUIHO9iKk6XVPV"/>
+ <unit id="org.eclipse.wst.web_userdoc.feature.feature.group" version="3.3.0.v201102200555-31Eo8s734B3E4H7799"/>
+ <unit id="org.eclipse.wst.ws_core.feature.feature.group" version="3.4.0.v201108230503-7L7RFoGFGtGd-xhuy-rRwz-2766"/>
+ <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.4.1.v201208172041-7I7CFkXEtEoXHw684K6n3-z-F3stz0lKFx169q5z"/>
+ <unit id="org.eclipse.wst.ws_userdoc.feature.feature.group" version="3.1.300.v201102200555-44FR79oB5855Q8IBD7G"/>
+ <unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.301.v201102200555-2407w312123151655"/>
+ <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.4.1.v201208170345-7C7OFm5F7RZHQRIsOz-Nz-_n"/>
+ <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.4.1.v201208170345-7H7GFeFDxumUpsw5rgjWnKDrsz0p4ymwjQz00T2S"/>
+ <unit id="org.eclipse.wst.xml_userdoc.feature.feature.group" version="3.3.0.v201102071641-50FYwAkF7B77UBZFDBL"/>
+ <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="2.0.100.v201203131922-7A7K0CcNBGPCTJ_FUOb"/>
+ <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.3.100.v201111021744-7T7ZFUaFIqUoJuvaKoCpQDKaGVPc"/>
<!-- only in JBT: SWTBot -->
<!--
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-10-01 16:03:12 UTC (rev 44182)
+++ trunk/build/target-platform/multiple.target 2012-10-01 16:13:01 UTC (rev 44183)
@@ -40,7 +40,6 @@
<unit id="org.junit" version="4.10.0.v4_10_0_v20120426-0900"/>
<unit id="org.junit" version="3.8.2.v3_8_2_v20100427-1100"/>
-
<!-- Orbit bundles -->
<unit id="javax.activation" version="1.1.0.v201108011116"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
@@ -60,6 +59,18 @@
<unit id="org.apache.lucene.queries" version="3.5.0.v20120319-2345"/>
<unit id="org.apache.lucene.snowball" version="2.9.1.v20100421-0704"/>
<unit id="org.apache.lucene.spellchecker" version="3.5.0.v20120319-2345"/>
+
+ <unit id="org.apache.axis" version="1.4.0.v201005080400"/>
+ <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
+ <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+ <unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
+ <unit id="org.apache.jasper" version="7.0.26.v201205030742"/>
+ <unit id="org.apache.catalina" version="7.0.26.v201205021508"/>
+ <unit id="javax.ejb" version="3.1.1.v201204261316"/>
+ <unit id="javax.transaction" version="1.1.1.v201105210645"/>
+ <unit id="javax.el" version="2.2.0.v201108011116"/>
+ <unit id="javax.xml.rpc" version="1.1.0.v201005080400"/>
+
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/>
@@ -71,6 +82,8 @@
<unit id="org.jboss.netty" version="3.2.5.Final-20120903-0645"/>
<unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120914-0945"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125-signed-201209140800"/>
+
+
<unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.101.v20120524-1717"/>
<unit id="org.eclipse.equinox.p2.discovery" version="1.0.200.v20120524-1717"/>
<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110808-1657"/>
@@ -133,14 +146,6 @@
<unit id="org.eclipse.rcp.feature.group" version="4.2.1.v20120814-120134-7IAPA8BrHQicS-rjP0GbqK780kMy"/>
<unit id="org.eclipse.pde.feature.group" version="3.8.1.v20120814-104528-7c7vFixFFt6Zr5aC6KM6LGWSd"/>
<unit id="org.eclipse.help.feature.group" version="1.4.1.v20120726-051048-8R7xFOUFLWUl7MoSKV_RBXl27"/>
- <!-- update.ui is on the 3.8 site, not the 4.2 site -->
- <unit id="org.eclipse.update.ui" version="3.3.0.v20120523-1742"/>
- <!-- there are two versions of this IU -
- 4.2 has ./org.eclipse.update.core_3.2.600.v20120530-1204.jar and
- 3.8 has ./org.eclipse.update.core_3.2.600.v20120530-120908.jar
- -->
- <!-- <unit id="org.eclipse.update.core" version="3.2.600.v20120530-120908"/> -->
- <unit id="org.eclipse.update.core" version="3.2.600.v20120820-205746"/>
<!-- DTP -->
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.10.1.v201208161415-7707FCcNBHLCgLUEdUb"/>
@@ -177,6 +182,7 @@
<unit id="org.eclipse.datatools.common.doc.user.feature.group" version="1.10.1.v201208161415-26-311A16321A3557"/>
<unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.10.1.v201208161415-37D-7733L3D753L7BBF"/>
<unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.10.1.v201208161415-37D-7733L3D753L7BBF"/>
+ <unit id="org.eclipse.persistence.jpa.feature.group" version="2.4.0.v20120608-r11652"/>
<!-- RSE, TM -->
<unit id="org.eclipse.rse.feature.group" version="3.4.1.201209191030-7L7IFBY83omx__z0RFpKdWB-r5MS"/>
@@ -193,61 +199,6 @@
<unit id="org.eclipse.tm.terminal.feature.group" version="3.2.1.201209191030-41031231A2A2141"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.100.201209191030-308Z31231A2A2141"/>
- <!-- WTP -->
- <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.4.1.v201208241503-7E7JFBjF9JgLWgMhh4X6Ps"/>
- <unit id="org.eclipse.jst.jee" version="1.0.500.v201202020745"/>
- <unit id="org.eclipse.wst.common.frameworks" version="1.2.200.v201203141800"/>
- <unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.300.v201111030424"/>
- <unit id="org.eclipse.jst.jee.web" version="1.0.301.v201007070907"/>
- <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/>
- <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/>
- <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
- <unit id="org.eclipse.jpt.common.feature.feature.group" version="1.2.1.v201208222210-663AkF7BF7cFFFFB7"/>
- <unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.2.1.v201208222210-3318s73573J777753"/>
- <unit id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.2.1.v201208222210-7M7J78F7RZHQYJAQsS4SVFD7"/>
- <unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.2.1.v201208222210-7S7K8gFBBoPapQieUcW_TFD7"/>
- <unit id="org.eclipse.persistence.jpa.feature.group" version="2.4.0.v20120608-r11652"/>
- <unit id="org.eclipse.jsf.feature.feature.group" version="3.4.1.v201208241503-7E7JFBjF9JgLWgMhh4X6Ps"/>
- <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/>
- <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.4.0.v201108110300-52FShAkF7BA8O8J9OC8"/>
- <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.4.0.v201107072300-7b7JIM0FSK2WM1PS9Ar7AKUz0TrWn"/>
- <unit id="org.eclipse.jst.enterprise_userdoc.feature.feature.group" version="3.3.100.v201105122000-62FUGBgJ9EA9aEeHRHc"/>
- <unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.201.v201208241503-20A87w312319352614"/>
- <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.101.v20120821_1416-777HFL6CcNBDmBjKOFHIEB"/>
- <unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.200.v20120517_1442-20A77w31231628a2553"/>
- <unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.4.0.v20120503_1042-31FEe8s73554A4Fa2153"/>
- <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.4.0.v20120503_1042-7A77FHr9xFcC2CFLZBCJMHLg7D64"/>
- <unit id="org.eclipse.jst.server_userdoc.feature.feature.group" version="3.3.100.v20110303-2-Eo7w3121162A3329"/>
- <unit id="org.eclipse.jst.web_core.feature.feature.group" version="3.4.1.v201208160300-7Q7EGVxFE9LeAJKvylauQtyivz-0sSxz003877"/>
- <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.8.v201208241503-46DI9oB58B5TBH8K5E"/>
- <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.4.1.v201208231800-7F7DFSlC25UrkX5qvgnXz0LZDA6kiWwylC3uxsWk"/>
- <unit id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.4.1.v201208231800-2117w312319373364"/>
- <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/>
- <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
- <unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.200.v201109042201-5-F8NAkF7BB7U8PEK8K"/>
- <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.2.0.v201204151854-7E7AF70F8NcJS_KqT5TpXq"/>
- <unit id="org.eclipse.jst.ws.jaxws_userdoc.feature.feature.group" version="1.0.200.v201205012246-3-DF8s73573D795LAF"/>
- <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.4.1.v201208162200-7B7EFMTF7RZHOjIuOyR0QS"/>
- <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.4.0.v201202292300-377F8N8s735555393B7B"/>
- <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.4.1.v201208170300-7C7AFeEEdhOaweJhCnQfykJvPz-S1RT"/>
- <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.4.1.v201208171701-7H7DFg0FC7sReqSyfqesWi"/>
- <unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.201.v20120821_1517-51F9xAkF7AL8QDRl8GAT"/>
- <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.100.v20110810_1722-33Et8s73563B6Ha3113"/>
- <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.101.v20120817_1533-7B7AFJQAtMduXxeIc0IpSdC97A9"/>
- <unit id="org.eclipse.wst.server_userdoc.feature.feature.group" version="3.3.200.v20120830_2320-20Eo7w31231941a3363"/>
- <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.4.1.v201208170345-7E7HFSlAJz-mw9qA03HKTuLirZsDJyCao"/>
- <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.4.1.v201208170345-7O7MFsPEMkBJz0wtb-ccsarPSceUIHO9iKk6XVPV"/>
- <unit id="org.eclipse.wst.web_userdoc.feature.feature.group" version="3.3.0.v201102200555-31Eo8s734B3E4H7799"/>
- <unit id="org.eclipse.wst.ws_core.feature.feature.group" version="3.4.0.v201108230503-7L7RFoGFGtGd-xhuy-rRwz-2766"/>
- <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.4.1.v201208172041-7I7CFkXEtEoXHw684K6n3-z-F3stz0lKFx169q5z"/>
- <unit id="org.eclipse.wst.ws_userdoc.feature.feature.group" version="3.1.300.v201102200555-44FR79oB5855Q8IBD7G"/>
- <unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.301.v201102200555-2407w312123151655"/>
- <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.4.1.v201208170345-7C7OFm5F7RZHQRIsOz-Nz-_n"/>
- <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.4.1.v201208170345-7H7GFeFDxumUpsw5rgjWnKDrsz0p4ymwjQz00T2S"/>
- <unit id="org.eclipse.wst.xml_userdoc.feature.feature.group" version="3.3.0.v201102071641-50FYwAkF7B77UBZFDBL"/>
- <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="2.0.100.v201203131922-7A7K0CcNBGPCTJ_FUOb"/>
- <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.3.100.v201111021744-7T7ZFUaFIqUoJuvaKoCpQDKaGVPc"/>
-
<!-- JBIDE-9549, JBDS-1904 add egit/jgit and mylyn support to TP, including dependent plugins -->
<unit id="org.eclipse.jsch.ui" version="1.1.400.v20120522-1148"/>
<unit id="org.eclipse.jsch.core" version="1.1.400.v20120522-1148"/>
@@ -291,6 +242,29 @@
<unit id="org.eclipse.mylyn.tasks.ui" version="3.8.2.v20120916-1200"/>
<unit id="org.eclipse.mylyn.tasks.core" version="3.8.2.v20120916-1200"/>
<unit id="org.eclipse.mylyn.tasks.bugs" version="3.8.2.v20120916-1200"/>
+
+ <unit id="org.eclipse.ui" version="3.103.0.v20120705-114351"/>
+ <unit id="org.eclipse.core.runtime" version="3.8.0.v20120521-2346"/>
+ <unit id="org.eclipse.core.resources" version="3.8.1.v20120802-154922"/>
+ <unit id="org.eclipse.ui.ide" version="3.8.1.v20120828-165804"/>
+ <unit id="org.eclipse.ui.workbench.texteditor" version="3.8.0.v20120523-1310"/>
+ <unit id="org.eclipse.jface.text" version="3.8.1.v20120828-155502"/>
+ <unit id="org.eclipse.osgi" version="3.8.1.v20120830-144521"/>
+ <unit id="org.eclipse.core.filesystem" version="1.3.200.v20120522-2012"/>
+ <unit id="org.eclipse.ui.forms" version="3.5.200.v20120705-114351"/>
+ <unit id="org.eclipse.ui.editors" version="3.8.0.v20120523-1540"/>
+ <unit id="org.eclipse.team.core" version="3.6.100.v20120524-0627"/>
+ <unit id="org.eclipse.team.ui" version="3.6.200.v20120522-1148"/>
+ <unit id="org.eclipse.jface" version="3.8.101.v20120817-083647"/>
+ <unit id="org.eclipse.compare" version="3.5.300.v20120522-1148"/>
+ <!-- update.ui is on the 3.8 site, not the 4.2 site -->
+ <unit id="org.eclipse.update.ui" version="3.3.0.v20120523-1742"/>
+ <!-- there are two versions of this IU -
+ 4.2 has ./org.eclipse.update.core_3.2.600.v20120530-1204.jar and
+ 3.8 has ./org.eclipse.update.core_3.2.600.v20120530-120908.jar
+ -->
+ <!-- <unit id="org.eclipse.update.core" version="3.2.600.v20120530-120908"/> -->
+ <unit id="org.eclipse.update.core" version="3.2.600.v20120820-205746"/>
<unit id="com.atlassian.connector.commons" version="4.0.0.v20120628"/>
<unit id="com.atlassian.connector.eclipse.bamboo.core" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.bamboo.ui" version="3.0.6.v20120628"/>
@@ -316,35 +290,69 @@
<!-- dep for com.atlassian.connector.eclipse.directclickthrough.ui -->
<unit id="com.thoughtworks.xstream" version="1.3.1.v201111240924"/>
<unit id="org.xmlpull" version="1.1.3.4_v201201052148"/>
- <unit id="org.eclipse.ui" version="3.103.0.v20120705-114351"/>
- <unit id="org.eclipse.core.runtime" version="3.8.0.v20120521-2346"/>
- <unit id="org.eclipse.core.resources" version="3.8.1.v20120802-154922"/>
- <unit id="org.eclipse.ui.ide" version="3.8.1.v20120828-165804"/>
- <unit id="org.eclipse.ui.workbench.texteditor" version="3.8.0.v20120523-1310"/>
- <unit id="org.eclipse.jface.text" version="3.8.1.v20120828-155502"/>
- <unit id="org.eclipse.osgi" version="3.8.1.v20120830-144521"/>
- <unit id="org.eclipse.core.filesystem" version="1.3.200.v20120522-2012"/>
- <unit id="org.eclipse.ui.forms" version="3.5.200.v20120705-114351"/>
- <unit id="org.eclipse.ui.editors" version="3.8.0.v20120523-1540"/>
- <unit id="org.eclipse.team.core" version="3.6.100.v20120524-0627"/>
- <unit id="org.eclipse.team.ui" version="3.6.200.v20120522-1148"/>
- <unit id="org.eclipse.jface" version="3.8.101.v20120817-083647"/>
- <unit id="org.eclipse.compare" version="3.5.300.v20120522-1148"/>
- <unit id="org.apache.axis" version="1.4.0.v201005080400"/>
- <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
- <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
- <unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
+
<unit id="org.jdom_jaxen" version="1.0.0.20081203-1100"/>
<unit id="org.mortbay.jetty.server" version="6.1.23.v201012071420"/>
<unit id="org.mortbay.jetty.util" version="6.1.23.v201012071420"/>
- <unit id="org.apache.jasper" version="7.0.26.v201205030742"/>
- <unit id="org.apache.catalina" version="7.0.26.v201205021508"/>
- <unit id="javax.ejb" version="3.1.1.v201204261316"/>
- <unit id="javax.transaction" version="1.1.1.v201105210645"/>
+
<unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
- <unit id="javax.xml.rpc" version="1.1.0.v201005080400"/>
- <unit id="javax.el" version="2.2.0.v201108011116"/>
+ <!-- WTP -->
+ <unit id="org.eclipse.jst.jee" version="1.0.500.v201202020745"/>
+ <unit id="org.eclipse.jst.jee.web" version="1.0.301.v201007070907"/>
+ <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/>
+ <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/>
+ <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
+
+ <unit id="org.eclipse.jpt.common.feature.feature.group" version="1.2.1.v201208222210-663AkF7BF7cFFFFB7"/>
+ <unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.2.1.v201208222210-3318s73573J777753"/>
+ <unit id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.2.1.v201208222210-7M7J78F7RZHQYJAQsS4SVFD7"/>
+ <unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.2.1.v201208222210-7S7K8gFBBoPapQieUcW_TFD7"/>
+
+ <unit id="org.eclipse.jsf.feature.feature.group" version="3.4.1.v201208241503-7E7JFBjF9JgLWgMhh4X6Ps"/>
+ <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.4.1.v201208241503-7E7JFBjF9JgLWgMhh4X6Ps"/>
+ <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/>
+ <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.4.0.v201108110300-52FShAkF7BA8O8J9OC8"/>
+ <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.4.0.v201107072300-7b7JIM0FSK2WM1PS9Ar7AKUz0TrWn"/>
+ <unit id="org.eclipse.jst.enterprise_userdoc.feature.feature.group" version="3.3.100.v201105122000-62FUGBgJ9EA9aEeHRHc"/>
+ <unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.201.v201208241503-20A87w312319352614"/>
+ <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.101.v20120821_1416-777HFL6CcNBDmBjKOFHIEB"/>
+ <unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.200.v20120517_1442-20A77w31231628a2553"/>
+ <unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.4.0.v20120503_1042-31FEe8s73554A4Fa2153"/>
+ <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.4.0.v20120503_1042-7A77FHr9xFcC2CFLZBCJMHLg7D64"/>
+ <unit id="org.eclipse.jst.server_userdoc.feature.feature.group" version="3.3.100.v20110303-2-Eo7w3121162A3329"/>
+ <unit id="org.eclipse.jst.web_core.feature.feature.group" version="3.4.1.v201208160300-7Q7EGVxFE9LeAJKvylauQtyivz-0sSxz003877"/>
+ <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.8.v201208241503-46DI9oB58B5TBH8K5E"/>
+ <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.4.1.v201208231800-7F7DFSlC25UrkX5qvgnXz0LZDA6kiWwylC3uxsWk"/>
+ <unit id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.4.1.v201208231800-2117w312319373364"/>
+ <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/>
+ <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
+ <unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.200.v201109042201-5-F8NAkF7BB7U8PEK8K"/>
+ <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.2.0.v201204151854-7E7AF70F8NcJS_KqT5TpXq"/>
+ <unit id="org.eclipse.jst.ws.jaxws_userdoc.feature.feature.group" version="1.0.200.v201205012246-3-DF8s73573D795LAF"/>
+
+ <unit id="org.eclipse.wst.common.frameworks" version="1.2.200.v201203141800"/>
+ <unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.300.v201111030424"/>
+ <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.4.1.v201208162200-7B7EFMTF7RZHOjIuOyR0QS"/>
+ <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.4.0.v201202292300-377F8N8s735555393B7B"/>
+ <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.4.1.v201208170300-7C7AFeEEdhOaweJhCnQfykJvPz-S1RT"/>
+ <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.4.1.v201208171701-7H7DFg0FC7sReqSyfqesWi"/>
+ <unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.201.v20120821_1517-51F9xAkF7AL8QDRl8GAT"/>
+ <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.100.v20110810_1722-33Et8s73563B6Ha3113"/>
+ <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.101.v20120817_1533-7B7AFJQAtMduXxeIc0IpSdC97A9"/>
+ <unit id="org.eclipse.wst.server_userdoc.feature.feature.group" version="3.3.200.v20120830_2320-20Eo7w31231941a3363"/>
+ <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.4.1.v201208170345-7E7HFSlAJz-mw9qA03HKTuLirZsDJyCao"/>
+ <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.4.1.v201208170345-7O7MFsPEMkBJz0wtb-ccsarPSceUIHO9iKk6XVPV"/>
+ <unit id="org.eclipse.wst.web_userdoc.feature.feature.group" version="3.3.0.v201102200555-31Eo8s734B3E4H7799"/>
+ <unit id="org.eclipse.wst.ws_core.feature.feature.group" version="3.4.0.v201108230503-7L7RFoGFGtGd-xhuy-rRwz-2766"/>
+ <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.4.1.v201208172041-7I7CFkXEtEoXHw684K6n3-z-F3stz0lKFx169q5z"/>
+ <unit id="org.eclipse.wst.ws_userdoc.feature.feature.group" version="3.1.300.v201102200555-44FR79oB5855Q8IBD7G"/>
+ <unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.301.v201102200555-2407w312123151655"/>
+ <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.4.1.v201208170345-7C7OFm5F7RZHQRIsOz-Nz-_n"/>
+ <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.4.1.v201208170345-7H7GFeFDxumUpsw5rgjWnKDrsz0p4ymwjQz00T2S"/>
+ <unit id="org.eclipse.wst.xml_userdoc.feature.feature.group" version="3.3.0.v201102071641-50FYwAkF7B77UBZFDBL"/>
+ <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="2.0.100.v201203131922-7A7K0CcNBGPCTJ_FUOb"/>
+ <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.3.100.v201111021744-7T7ZFUaFIqUoJuvaKoCpQDKaGVPc"/>
<!-- only in JBT: SWTBot -->
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-10-01 16:03:12 UTC (rev 44182)
+++ trunk/build/target-platform/unified.target 2012-10-01 16:13:01 UTC (rev 44183)
@@ -40,21 +40,6 @@
<unit id="org.junit" version="4.10.0.v4_10_0_v20120426-0900"/>
<unit id="org.junit" version="3.8.2.v3_8_2_v20100427-1100"/>
- <!-- m2e, m2e-wtp + deps -->
- <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/>
- <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120914-0945"/>
- <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125-signed-201209140800"/>
- <unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
- <unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
- <unit id="ch.qos.logback.slf4j" version="1.0.0.v20120123-1500"/>
- <unit id="org.slf4j.api" version="1.6.4.v20120130-2120"/>
- <unit id="com.ning.async-http-client" version="1.6.5.20120903-0645"/>
- <unit id="org.jboss.netty" version="3.2.5.Final-20120903-0645"/>
- <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.101.v20120524-1717"/>
- <unit id="org.eclipse.equinox.p2.discovery" version="1.0.200.v20120524-1717"/>
- <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110808-1657"/>
-
<!-- Orbit bundles -->
<unit id="javax.activation" version="1.1.0.v201108011116"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
@@ -75,6 +60,34 @@
<unit id="org.apache.lucene.snowball" version="2.9.1.v20100421-0704"/>
<unit id="org.apache.lucene.spellchecker" version="3.5.0.v20120319-2345"/>
+ <unit id="org.apache.axis" version="1.4.0.v201005080400"/>
+ <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
+ <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+ <unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
+ <unit id="org.apache.jasper" version="7.0.26.v201205030742"/>
+ <unit id="org.apache.catalina" version="7.0.26.v201205021508"/>
+ <unit id="javax.ejb" version="3.1.1.v201204261316"/>
+ <unit id="javax.transaction" version="1.1.1.v201105210645"/>
+ <unit id="javax.el" version="2.2.0.v201108011116"/>
+ <unit id="javax.xml.rpc" version="1.1.0.v201005080400"/>
+
+ <!-- m2e, m2e-wtp + deps -->
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/>
+ <unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
+ <unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
+ <unit id="ch.qos.logback.slf4j" version="1.0.0.v20120123-1500"/>
+ <unit id="org.slf4j.api" version="1.6.4.v20120130-2120"/>
+ <unit id="com.ning.async-http-client" version="1.6.5.20120903-0645"/>
+ <unit id="org.jboss.netty" version="3.2.5.Final-20120903-0645"/>
+ <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120914-0945"/>
+ <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125-signed-201209140800"/>
+
+
+ <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.101.v20120524-1717"/>
+ <unit id="org.eclipse.equinox.p2.discovery" version="1.0.200.v20120524-1717"/>
+ <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110808-1657"/>
+
<!-- EMF, XSD -->
<unit id="org.eclipse.emf.workspace.feature.group" version="1.6.0.v20120328-0001-37708s734E377I3B4C2"/>
<unit id="org.eclipse.emf.validation.feature.group" version="1.6.0.v20120328-0001-479-9oB56N5BBR6LCA6"/>
@@ -133,14 +146,6 @@
<unit id="org.eclipse.rcp.feature.group" version="4.2.1.v20120814-120134-7IAPA8BrHQicS-rjP0GbqK780kMy"/>
<unit id="org.eclipse.pde.feature.group" version="3.8.1.v20120814-104528-7c7vFixFFt6Zr5aC6KM6LGWSd"/>
<unit id="org.eclipse.help.feature.group" version="1.4.1.v20120726-051048-8R7xFOUFLWUl7MoSKV_RBXl27"/>
- <!-- update.ui is on the 3.8 site, not the 4.2 site -->
- <unit id="org.eclipse.update.ui" version="3.3.0.v20120523-1742"/>
- <!-- there are two versions of this IU -
- 4.2 has ./org.eclipse.update.core_3.2.600.v20120530-1204.jar and
- 3.8 has ./org.eclipse.update.core_3.2.600.v20120530-120908.jar
- -->
- <!-- <unit id="org.eclipse.update.core" version="3.2.600.v20120530-120908"/> -->
- <unit id="org.eclipse.update.core" version="3.2.600.v20120820-205746"/>
<!-- DTP -->
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.10.1.v201208161415-7707FCcNBHLCgLUEdUb"/>
@@ -177,6 +182,7 @@
<unit id="org.eclipse.datatools.common.doc.user.feature.group" version="1.10.1.v201208161415-26-311A16321A3557"/>
<unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.10.1.v201208161415-37D-7733L3D753L7BBF"/>
<unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.10.1.v201208161415-37D-7733L3D753L7BBF"/>
+ <unit id="org.eclipse.persistence.jpa.feature.group" version="2.4.0.v20120608-r11652"/>
<!-- RSE, TM -->
<unit id="org.eclipse.rse.feature.group" version="3.4.1.201209191030-7L7IFBY83omx__z0RFpKdWB-r5MS"/>
@@ -193,61 +199,6 @@
<unit id="org.eclipse.tm.terminal.feature.group" version="3.2.1.201209191030-41031231A2A2141"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.100.201209191030-308Z31231A2A2141"/>
- <!-- WTP -->
- <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.4.1.v201208241503-7E7JFBjF9JgLWgMhh4X6Ps"/>
- <unit id="org.eclipse.jst.jee" version="1.0.500.v201202020745"/>
- <unit id="org.eclipse.wst.common.frameworks" version="1.2.200.v201203141800"/>
- <unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.300.v201111030424"/>
- <unit id="org.eclipse.jst.jee.web" version="1.0.301.v201007070907"/>
- <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/>
- <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/>
- <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
- <unit id="org.eclipse.jpt.common.feature.feature.group" version="1.2.1.v201208222210-663AkF7BF7cFFFFB7"/>
- <unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.2.1.v201208222210-3318s73573J777753"/>
- <unit id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.2.1.v201208222210-7M7J78F7RZHQYJAQsS4SVFD7"/>
- <unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.2.1.v201208222210-7S7K8gFBBoPapQieUcW_TFD7"/>
- <unit id="org.eclipse.persistence.jpa.feature.group" version="2.4.0.v20120608-r11652"/>
- <unit id="org.eclipse.jsf.feature.feature.group" version="3.4.1.v201208241503-7E7JFBjF9JgLWgMhh4X6Ps"/>
- <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/>
- <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.4.0.v201108110300-52FShAkF7BA8O8J9OC8"/>
- <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.4.0.v201107072300-7b7JIM0FSK2WM1PS9Ar7AKUz0TrWn"/>
- <unit id="org.eclipse.jst.enterprise_userdoc.feature.feature.group" version="3.3.100.v201105122000-62FUGBgJ9EA9aEeHRHc"/>
- <unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.201.v201208241503-20A87w312319352614"/>
- <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.101.v20120821_1416-777HFL6CcNBDmBjKOFHIEB"/>
- <unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.200.v20120517_1442-20A77w31231628a2553"/>
- <unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.4.0.v20120503_1042-31FEe8s73554A4Fa2153"/>
- <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.4.0.v20120503_1042-7A77FHr9xFcC2CFLZBCJMHLg7D64"/>
- <unit id="org.eclipse.jst.server_userdoc.feature.feature.group" version="3.3.100.v20110303-2-Eo7w3121162A3329"/>
- <unit id="org.eclipse.jst.web_core.feature.feature.group" version="3.4.1.v201208160300-7Q7EGVxFE9LeAJKvylauQtyivz-0sSxz003877"/>
- <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.8.v201208241503-46DI9oB58B5TBH8K5E"/>
- <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.4.1.v201208231800-7F7DFSlC25UrkX5qvgnXz0LZDA6kiWwylC3uxsWk"/>
- <unit id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.4.1.v201208231800-2117w312319373364"/>
- <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/>
- <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
- <unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.200.v201109042201-5-F8NAkF7BB7U8PEK8K"/>
- <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.2.0.v201204151854-7E7AF70F8NcJS_KqT5TpXq"/>
- <unit id="org.eclipse.jst.ws.jaxws_userdoc.feature.feature.group" version="1.0.200.v201205012246-3-DF8s73573D795LAF"/>
- <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.4.1.v201208162200-7B7EFMTF7RZHOjIuOyR0QS"/>
- <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.4.0.v201202292300-377F8N8s735555393B7B"/>
- <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.4.1.v201208170300-7C7AFeEEdhOaweJhCnQfykJvPz-S1RT"/>
- <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.4.1.v201208171701-7H7DFg0FC7sReqSyfqesWi"/>
- <unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.201.v20120821_1517-51F9xAkF7AL8QDRl8GAT"/>
- <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.100.v20110810_1722-33Et8s73563B6Ha3113"/>
- <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.101.v20120817_1533-7B7AFJQAtMduXxeIc0IpSdC97A9"/>
- <unit id="org.eclipse.wst.server_userdoc.feature.feature.group" version="3.3.200.v20120830_2320-20Eo7w31231941a3363"/>
- <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.4.1.v201208170345-7E7HFSlAJz-mw9qA03HKTuLirZsDJyCao"/>
- <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.4.1.v201208170345-7O7MFsPEMkBJz0wtb-ccsarPSceUIHO9iKk6XVPV"/>
- <unit id="org.eclipse.wst.web_userdoc.feature.feature.group" version="3.3.0.v201102200555-31Eo8s734B3E4H7799"/>
- <unit id="org.eclipse.wst.ws_core.feature.feature.group" version="3.4.0.v201108230503-7L7RFoGFGtGd-xhuy-rRwz-2766"/>
- <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.4.1.v201208172041-7I7CFkXEtEoXHw684K6n3-z-F3stz0lKFx169q5z"/>
- <unit id="org.eclipse.wst.ws_userdoc.feature.feature.group" version="3.1.300.v201102200555-44FR79oB5855Q8IBD7G"/>
- <unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.301.v201102200555-2407w312123151655"/>
- <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.4.1.v201208170345-7C7OFm5F7RZHQRIsOz-Nz-_n"/>
- <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.4.1.v201208170345-7H7GFeFDxumUpsw5rgjWnKDrsz0p4ymwjQz00T2S"/>
- <unit id="org.eclipse.wst.xml_userdoc.feature.feature.group" version="3.3.0.v201102071641-50FYwAkF7B77UBZFDBL"/>
- <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="2.0.100.v201203131922-7A7K0CcNBGPCTJ_FUOb"/>
- <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.3.100.v201111021744-7T7ZFUaFIqUoJuvaKoCpQDKaGVPc"/>
-
<!-- JBIDE-9549, JBDS-1904 add egit/jgit and mylyn support to TP, including dependent plugins -->
<unit id="org.eclipse.jsch.ui" version="1.1.400.v20120522-1148"/>
<unit id="org.eclipse.jsch.core" version="1.1.400.v20120522-1148"/>
@@ -291,6 +242,29 @@
<unit id="org.eclipse.mylyn.tasks.ui" version="3.8.2.v20120916-1200"/>
<unit id="org.eclipse.mylyn.tasks.core" version="3.8.2.v20120916-1200"/>
<unit id="org.eclipse.mylyn.tasks.bugs" version="3.8.2.v20120916-1200"/>
+
+ <unit id="org.eclipse.ui" version="3.103.0.v20120705-114351"/>
+ <unit id="org.eclipse.core.runtime" version="3.8.0.v20120521-2346"/>
+ <unit id="org.eclipse.core.resources" version="3.8.1.v20120802-154922"/>
+ <unit id="org.eclipse.ui.ide" version="3.8.1.v20120828-165804"/>
+ <unit id="org.eclipse.ui.workbench.texteditor" version="3.8.0.v20120523-1310"/>
+ <unit id="org.eclipse.jface.text" version="3.8.1.v20120828-155502"/>
+ <unit id="org.eclipse.osgi" version="3.8.1.v20120830-144521"/>
+ <unit id="org.eclipse.core.filesystem" version="1.3.200.v20120522-2012"/>
+ <unit id="org.eclipse.ui.forms" version="3.5.200.v20120705-114351"/>
+ <unit id="org.eclipse.ui.editors" version="3.8.0.v20120523-1540"/>
+ <unit id="org.eclipse.team.core" version="3.6.100.v20120524-0627"/>
+ <unit id="org.eclipse.team.ui" version="3.6.200.v20120522-1148"/>
+ <unit id="org.eclipse.jface" version="3.8.101.v20120817-083647"/>
+ <unit id="org.eclipse.compare" version="3.5.300.v20120522-1148"/>
+ <!-- update.ui is on the 3.8 site, not the 4.2 site -->
+ <unit id="org.eclipse.update.ui" version="3.3.0.v20120523-1742"/>
+ <!-- there are two versions of this IU -
+ 4.2 has ./org.eclipse.update.core_3.2.600.v20120530-1204.jar and
+ 3.8 has ./org.eclipse.update.core_3.2.600.v20120530-120908.jar
+ -->
+ <!-- <unit id="org.eclipse.update.core" version="3.2.600.v20120530-120908"/> -->
+ <unit id="org.eclipse.update.core" version="3.2.600.v20120820-205746"/>
<unit id="com.atlassian.connector.commons" version="4.0.0.v20120628"/>
<unit id="com.atlassian.connector.eclipse.bamboo.core" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.bamboo.ui" version="3.0.6.v20120628"/>
@@ -316,35 +290,69 @@
<!-- dep for com.atlassian.connector.eclipse.directclickthrough.ui -->
<unit id="com.thoughtworks.xstream" version="1.3.1.v201111240924"/>
<unit id="org.xmlpull" version="1.1.3.4_v201201052148"/>
- <unit id="org.eclipse.ui" version="3.103.0.v20120705-114351"/>
- <unit id="org.eclipse.core.runtime" version="3.8.0.v20120521-2346"/>
- <unit id="org.eclipse.core.resources" version="3.8.1.v20120802-154922"/>
- <unit id="org.eclipse.ui.ide" version="3.8.1.v20120828-165804"/>
- <unit id="org.eclipse.ui.workbench.texteditor" version="3.8.0.v20120523-1310"/>
- <unit id="org.eclipse.jface.text" version="3.8.1.v20120828-155502"/>
- <unit id="org.eclipse.osgi" version="3.8.1.v20120830-144521"/>
- <unit id="org.eclipse.core.filesystem" version="1.3.200.v20120522-2012"/>
- <unit id="org.eclipse.ui.forms" version="3.5.200.v20120705-114351"/>
- <unit id="org.eclipse.ui.editors" version="3.8.0.v20120523-1540"/>
- <unit id="org.eclipse.team.core" version="3.6.100.v20120524-0627"/>
- <unit id="org.eclipse.team.ui" version="3.6.200.v20120522-1148"/>
- <unit id="org.eclipse.jface" version="3.8.101.v20120817-083647"/>
- <unit id="org.eclipse.compare" version="3.5.300.v20120522-1148"/>
- <unit id="org.apache.axis" version="1.4.0.v201005080400"/>
- <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
- <unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
- <unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
+
<unit id="org.jdom_jaxen" version="1.0.0.20081203-1100"/>
<unit id="org.mortbay.jetty.server" version="6.1.23.v201012071420"/>
<unit id="org.mortbay.jetty.util" version="6.1.23.v201012071420"/>
- <unit id="org.apache.jasper" version="7.0.26.v201205030742"/>
- <unit id="org.apache.catalina" version="7.0.26.v201205021508"/>
- <unit id="javax.ejb" version="3.1.1.v201204261316"/>
- <unit id="javax.transaction" version="1.1.1.v201105210645"/>
+
<unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
- <unit id="javax.xml.rpc" version="1.1.0.v201005080400"/>
- <unit id="javax.el" version="2.2.0.v201108011116"/>
+ <!-- WTP -->
+ <unit id="org.eclipse.jst.jee" version="1.0.500.v201202020745"/>
+ <unit id="org.eclipse.jst.jee.web" version="1.0.301.v201007070907"/>
+ <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/>
+ <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/>
+ <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
+
+ <unit id="org.eclipse.jpt.common.feature.feature.group" version="1.2.1.v201208222210-663AkF7BF7cFFFFB7"/>
+ <unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.2.1.v201208222210-3318s73573J777753"/>
+ <unit id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.2.1.v201208222210-7M7J78F7RZHQYJAQsS4SVFD7"/>
+ <unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.2.1.v201208222210-7S7K8gFBBoPapQieUcW_TFD7"/>
+
+ <unit id="org.eclipse.jsf.feature.feature.group" version="3.4.1.v201208241503-7E7JFBjF9JgLWgMhh4X6Ps"/>
+ <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.4.1.v201208241503-7E7JFBjF9JgLWgMhh4X6Ps"/>
+ <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/>
+ <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.4.0.v201108110300-52FShAkF7BA8O8J9OC8"/>
+ <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.4.0.v201107072300-7b7JIM0FSK2WM1PS9Ar7AKUz0TrWn"/>
+ <unit id="org.eclipse.jst.enterprise_userdoc.feature.feature.group" version="3.3.100.v201105122000-62FUGBgJ9EA9aEeHRHc"/>
+ <unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.201.v201208241503-20A87w312319352614"/>
+ <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.101.v20120821_1416-777HFL6CcNBDmBjKOFHIEB"/>
+ <unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.200.v20120517_1442-20A77w31231628a2553"/>
+ <unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.4.0.v20120503_1042-31FEe8s73554A4Fa2153"/>
+ <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.4.0.v20120503_1042-7A77FHr9xFcC2CFLZBCJMHLg7D64"/>
+ <unit id="org.eclipse.jst.server_userdoc.feature.feature.group" version="3.3.100.v20110303-2-Eo7w3121162A3329"/>
+ <unit id="org.eclipse.jst.web_core.feature.feature.group" version="3.4.1.v201208160300-7Q7EGVxFE9LeAJKvylauQtyivz-0sSxz003877"/>
+ <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.8.v201208241503-46DI9oB58B5TBH8K5E"/>
+ <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.4.1.v201208231800-7F7DFSlC25UrkX5qvgnXz0LZDA6kiWwylC3uxsWk"/>
+ <unit id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.4.1.v201208231800-2117w312319373364"/>
+ <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/>
+ <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
+ <unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.200.v201109042201-5-F8NAkF7BB7U8PEK8K"/>
+ <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.2.0.v201204151854-7E7AF70F8NcJS_KqT5TpXq"/>
+ <unit id="org.eclipse.jst.ws.jaxws_userdoc.feature.feature.group" version="1.0.200.v201205012246-3-DF8s73573D795LAF"/>
+
+ <unit id="org.eclipse.wst.common.frameworks" version="1.2.200.v201203141800"/>
+ <unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.300.v201111030424"/>
+ <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.4.1.v201208162200-7B7EFMTF7RZHOjIuOyR0QS"/>
+ <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.4.0.v201202292300-377F8N8s735555393B7B"/>
+ <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.4.1.v201208170300-7C7AFeEEdhOaweJhCnQfykJvPz-S1RT"/>
+ <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.4.1.v201208171701-7H7DFg0FC7sReqSyfqesWi"/>
+ <unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.201.v20120821_1517-51F9xAkF7AL8QDRl8GAT"/>
+ <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.100.v20110810_1722-33Et8s73563B6Ha3113"/>
+ <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.101.v20120817_1533-7B7AFJQAtMduXxeIc0IpSdC97A9"/>
+ <unit id="org.eclipse.wst.server_userdoc.feature.feature.group" version="3.3.200.v20120830_2320-20Eo7w31231941a3363"/>
+ <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.4.1.v201208170345-7E7HFSlAJz-mw9qA03HKTuLirZsDJyCao"/>
+ <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.4.1.v201208170345-7O7MFsPEMkBJz0wtb-ccsarPSceUIHO9iKk6XVPV"/>
+ <unit id="org.eclipse.wst.web_userdoc.feature.feature.group" version="3.3.0.v201102200555-31Eo8s734B3E4H7799"/>
+ <unit id="org.eclipse.wst.ws_core.feature.feature.group" version="3.4.0.v201108230503-7L7RFoGFGtGd-xhuy-rRwz-2766"/>
+ <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.4.1.v201208172041-7I7CFkXEtEoXHw684K6n3-z-F3stz0lKFx169q5z"/>
+ <unit id="org.eclipse.wst.ws_userdoc.feature.feature.group" version="3.1.300.v201102200555-44FR79oB5855Q8IBD7G"/>
+ <unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.301.v201102200555-2407w312123151655"/>
+ <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.4.1.v201208170345-7C7OFm5F7RZHQRIsOz-Nz-_n"/>
+ <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.4.1.v201208170345-7H7GFeFDxumUpsw5rgjWnKDrsz0p4ymwjQz00T2S"/>
+ <unit id="org.eclipse.wst.xml_userdoc.feature.feature.group" version="3.3.0.v201102071641-50FYwAkF7B77UBZFDBL"/>
+ <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="2.0.100.v201203131922-7A7K0CcNBGPCTJ_FUOb"/>
+ <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.3.100.v201111021744-7T7ZFUaFIqUoJuvaKoCpQDKaGVPc"/>
<!-- only in JBT: SWTBot -->
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
12 years, 3 months
JBoss Tools SVN: r44182 - in trunk/build/target-platforms: jbds/unified and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: mickael_istria
Date: 2012-10-01 12:03:12 -0400 (Mon, 01 Oct 2012)
New Revision: 44182
Modified:
trunk/build/target-platforms/jbds/unified/pom.xml
trunk/build/target-platforms/publish.sh
trunk/build/target-platforms/unified/pom.xml
Log:
JBDS-2341: Publish TP site to "official" locations
Modified: trunk/build/target-platforms/jbds/unified/pom.xml
===================================================================
--- trunk/build/target-platforms/jbds/unified/pom.xml 2012-10-01 15:56:11 UTC (rev 44181)
+++ trunk/build/target-platforms/jbds/unified/pom.xml 2012-10-01 16:03:12 UTC (rev 44182)
@@ -13,7 +13,7 @@
<packaging>pom</packaging>
<properties>
- <unified.URL>http://www.qa.jboss.com/binaries/RHDS/updates/jbds-target-platform_4.0.ju...</unified.URL>
+ <unified.URL>http://www.qa.jboss.com/binaries/RHDS/updates/jbds-target-platform_4.0.ju...</unified.URL>
</properties>
<build>
Modified: trunk/build/target-platforms/publish.sh
===================================================================
--- trunk/build/target-platforms/publish.sh 2012-10-01 15:56:11 UTC (rev 44181)
+++ trunk/build/target-platforms/publish.sh 2012-10-01 16:03:12 UTC (rev 44182)
@@ -6,9 +6,9 @@
# build.xml, *.target*, publish.sh, target2p2mirror.xml; also jbds/trunk/releng/org.jboss.ide.eclipse.releng/requirements/jbds-target-platform/build.properties;
# also all devstudio-6.0_*.updatesite jobs (4) need to be pointed at the new Target Platform URL
targetZipFile=e421-wtp341.target
-repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_4.0.juno.SR1-experimental
-destinationPath=/home/hudson/static_build_env/jbds/target-platform_4.0.juno.SR1-experimental
-DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_4.0.juno.SR1-experimental
+repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_4.0.juno.SR1
+destinationPath=/home/hudson/static_build_env/jbds/target-platform_4.0.juno.SR1
+DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_4.0.juno.SR1
include="*"
exclude="--exclude '.blobstore'" # exclude the .blobstore
@@ -23,22 +23,22 @@
'-include') include="$2"; shift 2;;
'-exclude') exclude="$2"; shift 2;;
- '-jbt_4.0.juno.SR1-experimental')
+ '-jbt_4.0.juno.SR1')
# defaults for JBT (trunk)
targetZipFile=e421-wtp341.target
- repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_4.0.juno.SR1-experimental
- destinationPath=/home/hudson/static_build_env/jbds/target-platform_4.0.juno.SR1-experimental
- DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_4.0.juno.SR1-experimental
+ repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_4.0.juno.SR1
+ destinationPath=/home/hudson/static_build_env/jbds/target-platform_4.0.juno.SR1
+ DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/juno/SR1
include="*"
exclude="--exclude '.blobstore'" # exclude the .blobstore
shift 1;;
- '-jbds_4.0.juno.SR1-experimental')
+ '-jbds_4.0.juno.SR1')
# defaults for JBDS (trunk)
targetZipFile=jbds600-e421-wtp341.target
- repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_4.0.juno.SR1-experimental
- destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_4.0.juno.SR1-experimental
- DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_4.0.juno.SR1-experimental
+ repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_4.0.juno.SR1
+ destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_4.0.juno.SR1
+ DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_4.0.juno.SR1
include=".blobstore *" # include the .blobstore
exclude=""
shift 1;;
Modified: trunk/build/target-platforms/unified/pom.xml
===================================================================
--- trunk/build/target-platforms/unified/pom.xml 2012-10-01 15:56:11 UTC (rev 44181)
+++ trunk/build/target-platforms/unified/pom.xml 2012-10-01 16:03:12 UTC (rev 44182)
@@ -13,7 +13,7 @@
<packaging>pom</packaging>
<properties>
- <unified.URL>http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR1...</unified.URL>
+ <unified.URL>http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR1...</unified.URL>
</properties>
<build>
12 years, 3 months
JBoss Tools SVN: r44181 - in trunk/build: aggregate/site and 5 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-10-01 11:56:11 -0400 (Mon, 01 Oct 2012)
New Revision: 44181
Modified:
trunk/build/aggregate/coretests-site/associate.properties
trunk/build/aggregate/site/associate.properties
trunk/build/aggregate/soa-site/site/associate.properties
trunk/build/aggregate/soatests-site/site/associate.properties
trunk/build/aggregate/webtools-site/associate.properties
trunk/build/parent/pom.xml
trunk/build/target-platform/multiple.target
Log:
point pom and .target files at SR1, not SR0
Modified: trunk/build/aggregate/coretests-site/associate.properties
===================================================================
--- trunk/build/aggregate/coretests-site/associate.properties 2012-10-01 15:35:35 UTC (rev 44180)
+++ trunk/build/aggregate/coretests-site/associate.properties 2012-10-01 15:56:11 UTC (rev 44181)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/juno/SR0a/,http://download.jboss.org/jbosstools/updates/development/juno/
+associate.sites=http://download.jboss.org/jbosstools/updates/juno/SR1/,http://download.jboss.org/jbosstools/updates/development/juno/
Modified: trunk/build/aggregate/site/associate.properties
===================================================================
--- trunk/build/aggregate/site/associate.properties 2012-10-01 15:35:35 UTC (rev 44180)
+++ trunk/build/aggregate/site/associate.properties 2012-10-01 15:56:11 UTC (rev 44181)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/juno/SR0a/
+associate.sites=http://download.jboss.org/jbosstools/updates/juno/SR1/
Modified: trunk/build/aggregate/soa-site/site/associate.properties
===================================================================
--- trunk/build/aggregate/soa-site/site/associate.properties 2012-10-01 15:35:35 UTC (rev 44180)
+++ trunk/build/aggregate/soa-site/site/associate.properties 2012-10-01 15:56:11 UTC (rev 44181)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/juno/soa-tooling/SR0/,http://download.jboss.org/jbosstools/updates/juno/SR0a/,http://download.jboss.org/jbosstools/updates/development/juno/
+associate.sites=http://download.jboss.org/jbosstools/updates/juno/soa-tooling/SR0/,http://download.jboss.org/jbosstools/updates/juno/SR1/,http://download.jboss.org/jbosstools/updates/development/juno/
Modified: trunk/build/aggregate/soatests-site/site/associate.properties
===================================================================
--- trunk/build/aggregate/soatests-site/site/associate.properties 2012-10-01 15:35:35 UTC (rev 44180)
+++ trunk/build/aggregate/soatests-site/site/associate.properties 2012-10-01 15:56:11 UTC (rev 44181)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/juno/SR0a/,http://download.jboss.org/jbosstools/updates/development/juno/,http://download.jboss.org/jbosstools/updates/development/juno/soa-tooling/
+associate.sites=http://download.jboss.org/jbosstools/updates/juno/SR1/,http://download.jboss.org/jbosstools/updates/development/juno/,http://download.jboss.org/jbosstools/updates/development/juno/soa-tooling/
Modified: trunk/build/aggregate/webtools-site/associate.properties
===================================================================
--- trunk/build/aggregate/webtools-site/associate.properties 2012-10-01 15:35:35 UTC (rev 44180)
+++ trunk/build/aggregate/webtools-site/associate.properties 2012-10-01 15:56:11 UTC (rev 44181)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/juno/SR0a/,http://download.jboss.org/jbosstools/updates/development/juno/
+associate.sites=http://download.jboss.org/jbosstools/updates/juno/SR1/,http://download.jboss.org/jbosstools/updates/development/juno/
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-10-01 15:35:35 UTC (rev 44180)
+++ trunk/build/parent/pom.xml 2012-10-01 15:56:11 UTC (rev 44181)
@@ -39,12 +39,12 @@
<coverage.filter>org.jboss.tools.*</coverage.filter>
<!-- 1a. URL of latest JBT target platform site -->
- <jbosstools-target-site>http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR0...</jbosstools-target-site>
+ <jbosstools-target-site>http://download.jboss.org/jbosstools/updates/target-platform_4.0.juno.SR1...</jbosstools-target-site>
<!-- 1b. or use -Plocal.site -Dlocal.site=file:///${HOME}/trunk/build/target-platform/REPO/ -->
<!-- TODO: don't forget to update JBDS .updatesite jobs when this value changes! -->
<!-- TODO: see also 'hudson' profile below for other default value -->
- <local.site>file:///${user.home}/.m2/jbosstools-target-platform_4.0.juno.SR0a/</local.site>
+ <local.site>file:///${user.home}/.m2/jbosstools-target-platform_4.0.juno.SR1/</local.site>
<!-- 2a. URL of latest JBT nightly staging composite site (all the components
in once place) -->
@@ -60,8 +60,8 @@
<!-- 3a. URL of latest JBT requirements composite mirror -->
<!-- TODO: don't forget to update this in ../aggregate/*/associate.properties too (5 files)! -->
- <jboss-requirements-composite-mirror>http://download.jboss.org/jbosstools/updates/juno/SR0a/</jboss-requirements-composite-mirror>
- <jboss-requirements-composite-soa-tooling-mirror>http://download.jboss.org/jbosstools/updates/juno/soa-tooling/SR0a/</jboss-requirements-composite-soa-tooling-mirror>
+ <jboss-requirements-composite-mirror>http://download.jboss.org/jbosstools/updates/juno/SR1/</jboss-requirements-composite-mirror>
+ <jboss-requirements-composite-soa-tooling-mirror>http://download.jboss.org/jbosstools/updates/juno/soa-tooling/SR1/</jboss-requirements-composite-soa-tooling-mirror>
<!-- 3b., or use -Plocal.requirements -Dlocal.requirements=file:///path/to/mirror/of/composite/requirements/site -->
<local.requirements>file:///qa/services/http/binaries/RHDS/updates/juno/</local.requirements>
@@ -684,7 +684,7 @@
</property>
</activation>
<properties>
- <local.site>file:///home/hudson/static_build_env/jbds/target-platform_4.0.juno.SR0a/e421RC2-wtp341M.target/</local.site>
+ <local.site>file:///home/hudson/static_build_env/jbds/target-platform_4.0.juno.SR1/e421-wtp341.target/</local.site>
</properties>
<build>
<plugins>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-10-01 15:35:35 UTC (rev 44180)
+++ trunk/build/target-platform/multiple.target 2012-10-01 15:56:11 UTC (rev 44181)
@@ -40,20 +40,6 @@
<unit id="org.junit" version="4.10.0.v4_10_0_v20120426-0900"/>
<unit id="org.junit" version="3.8.2.v3_8_2_v20100427-1100"/>
- <!-- m2e, m2e-wtp + deps -->
- <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/>
- <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120914-0945"/>
- <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125-signed-201209140800"/>
- <unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
- <unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
- <unit id="ch.qos.logback.slf4j" version="1.0.0.v20120123-1500"/>
- <unit id="org.slf4j.api" version="1.6.4.v20120130-2120"/>
- <unit id="com.ning.async-http-client" version="1.6.5.20120903-0645"/>
- <unit id="org.jboss.netty" version="3.2.5.Final-20120903-0645"/>
- <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.101.v20120524-1717"/>
- <unit id="org.eclipse.equinox.p2.discovery" version="1.0.200.v20120524-1717"/>
- <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110808-1657"/>
<!-- Orbit bundles -->
<unit id="javax.activation" version="1.1.0.v201108011116"/>
@@ -74,6 +60,20 @@
<unit id="org.apache.lucene.queries" version="3.5.0.v20120319-2345"/>
<unit id="org.apache.lucene.snowball" version="2.9.1.v20100421-0704"/>
<unit id="org.apache.lucene.spellchecker" version="3.5.0.v20120319-2345"/>
+ <!-- m2e, m2e-wtp + deps -->
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/>
+ <unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
+ <unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
+ <unit id="ch.qos.logback.slf4j" version="1.0.0.v20120123-1500"/>
+ <unit id="org.slf4j.api" version="1.6.4.v20120130-2120"/>
+ <unit id="com.ning.async-http-client" version="1.6.5.20120903-0645"/>
+ <unit id="org.jboss.netty" version="3.2.5.Final-20120903-0645"/>
+ <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120914-0945"/>
+ <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125-signed-201209140800"/>
+ <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.101.v20120524-1717"/>
+ <unit id="org.eclipse.equinox.p2.discovery" version="1.0.200.v20120524-1717"/>
+ <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110808-1657"/>
<!-- EMF, XSD -->
<unit id="org.eclipse.emf.workspace.feature.group" version="1.6.0.v20120328-0001-37708s734E377I3B4C2"/>
12 years, 3 months
JBoss Tools SVN: r44180 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits@lists.jboss.org
Author: ldimaggio
Date: 2012-10-01 11:35:35 -0400 (Mon, 01 Oct 2012)
New Revision: 44180
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java
Log:
Updated ExampleTest to narrow the criteria for dealing with the SOA-P server's extra window:
if ( (SWTJBTExt.isRunningOnMacOs()) && (!bot.shell("Java - Eclipse Platform").isActive()) && (configuredState.getServer().type.equals("SOA")) )
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java 2012-10-01 15:34:35 UTC (rev 44179)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java 2012-10-01 15:35:35 UTC (rev 44180)
@@ -12,6 +12,9 @@
import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.JBossToolsProjectExamples;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.junit.Test;
+
+import org.jboss.tools.ui.bot.ext.config.ConfiguredState;
+
/**
* this class represents SWTBot-based Project Example test. Whenever we test project-examples, we should
* extend these class and override what needed. See esb bot tests for details
@@ -89,11 +92,11 @@
// for (SWTBotShell s : theShells) {
// System.out.println ("DEBUG! " + s.getText());
// }
- if ((SWTJBTExt.isRunningOnMacOs()) && (!bot.shell("Java - Eclipse Platform").isActive() )){
+ if ( (SWTJBTExt.isRunningOnMacOs()) && (!bot.shell("Java - Eclipse Platform").isActive()) && (configuredState.getServer().type.equals("SOA")) ){
+ log.info("Running on a MAC - need to set Focus back to the Eclipse shell window");
bot.sleep(30000l);
bot.shell("Java - Eclipse Platform").activate();
bot.shell("Java - Eclipse Platform").setFocus();
- log.info("Running on a MAC");
}
SWTBot wiz = open.newObject(JBossToolsProjectExamples.LABEL);
12 years, 3 months