JBoss Tools SVN: r22737 - in branches/3.2.helios: examples/site and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-10 19:23:38 -0400 (Thu, 10 Jun 2010)
New Revision: 22737
Modified:
branches/3.2.helios/esb/site/site.xml
branches/3.2.helios/examples/site/site.xml
branches/3.2.helios/maven/site/site.xml
branches/3.2.helios/seam/site/site.xml
branches/3.2.helios/tests/site/site.xml
Log:
add features to site.xml
Modified: branches/3.2.helios/esb/site/site.xml
===================================================================
--- branches/3.2.helios/esb/site/site.xml 2010-06-10 23:11:19 UTC (rev 22736)
+++ branches/3.2.helios/esb/site/site.xml 2010-06-10 23:23:38 UTC (rev 22737)
@@ -5,5 +5,8 @@
<category-def label="JBoss Tools esb Nightly Build Update Site" name="JBoss Tools esb Nightly Build Update Site">
<description>JBoss Tools esb Nightly Build Update Site: contains all features in this build.</description>
</category-def>
-
+ <feature url="features/org.jboss.tools.esb.feature_0.0.0.jar" id="org.jboss.tools.esb.feature" version="0.0.0">
+ <category name="JBoss Tools esb Nightly Build Update Site"/>
+ </feature>
+
</site>
Modified: branches/3.2.helios/examples/site/site.xml
===================================================================
--- branches/3.2.helios/examples/site/site.xml 2010-06-10 23:11:19 UTC (rev 22736)
+++ branches/3.2.helios/examples/site/site.xml 2010-06-10 23:23:38 UTC (rev 22737)
@@ -5,5 +5,11 @@
<category-def label="JBoss Tools examples Nightly Build Update Site" name="JBoss Tools examples Nightly Build Update Site">
<description>JBoss Tools examples Nightly Build Update Site: contains all features in this build.</description>
</category-def>
+ <feature url="features/org.jboss.tools.project.examples.feature_0.0.0.jar" id="org.jboss.tools.project.examples.feature" version="0.0.0">
+ <category name="JBoss Tools examples Nightly Build Update Site"/>
+ </feature>
+ <feature url="features/org.jboss.tools.community.project.examples.feature_0.0.0.jar" id="org.jboss.tools.community.project.examples.feature" version="0.0.0">
+ <category name="JBoss Tools examples Nightly Build Update Site"/>
+ </feature>
</site>
Modified: branches/3.2.helios/maven/site/site.xml
===================================================================
--- branches/3.2.helios/maven/site/site.xml 2010-06-10 23:11:19 UTC (rev 22736)
+++ branches/3.2.helios/maven/site/site.xml 2010-06-10 23:23:38 UTC (rev 22737)
@@ -5,5 +5,11 @@
<category-def label="JBoss Tools maven Nightly Build Update Site" name="JBoss Tools maven Nightly Build Update Site">
<description>JBoss Tools maven Nightly Build Update Site: contains all features in this build.</description>
</category-def>
+ <feature url="features/org.jboss.tools.maven.feature_0.0.0.jar" id="org.jboss.tools.maven.feature" version="0.0.0">
+ <category name="JBoss Tools maven Nightly Build Update Site"/>
+ </feature>
+ <feature url="features/org.jboss.tools.maven.seam.feature_0.0.0.jar" id="org.jboss.tools.maven.seam.feature" version="0.0.0">
+ <category name="JBoss Tools maven Nightly Build Update Site"/>
+ </feature>
</site>
Modified: branches/3.2.helios/seam/site/site.xml
===================================================================
--- branches/3.2.helios/seam/site/site.xml 2010-06-10 23:11:19 UTC (rev 22736)
+++ branches/3.2.helios/seam/site/site.xml 2010-06-10 23:23:38 UTC (rev 22737)
@@ -5,5 +5,8 @@
<category-def label="JBoss Tools seam Nightly Build Update Site" name="JBoss Tools seam Nightly Build Update Site">
<description>JBoss Tools seam Nightly Build Update Site: contains all features in this build.</description>
</category-def>
+ <feature url="features/org.jboss.tools.seam.feature_0.0.0.jar" id="org.jboss.tools.seam.feature" version="0.0.0">
+ <category name="JBoss Tools seam Nightly Build Update Site"/>
+ </feature>
</site>
Modified: branches/3.2.helios/tests/site/site.xml
===================================================================
--- branches/3.2.helios/tests/site/site.xml 2010-06-10 23:11:19 UTC (rev 22736)
+++ branches/3.2.helios/tests/site/site.xml 2010-06-10 23:23:38 UTC (rev 22737)
@@ -5,5 +5,8 @@
<category-def label="JBoss Tools tests Nightly Build Update Site" name="JBoss Tools tests Nightly Build Update Site">
<description>JBoss Tools tests Nightly Build Update Site: contains all features in this build.</description>
</category-def>
+ <feature url="features/org.jboss.tools.test.feature_0.0.0.jar" id="org.jboss.tools.test.feature" version="0.0.0">
+ <category name="JBoss Tools tests Nightly Build Update Site"/>
+ </feature>
</site>
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r22736 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-10 19:11:19 -0400 (Thu, 10 Jun 2010)
New Revision: 22736
Modified:
trunk/build/publish.sh
Log:
publish update site instead of named zip
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-06-10 21:25:59 UTC (rev 22735)
+++ trunk/build/publish.sh 2010-06-10 23:11:19 UTC (rev 22736)
@@ -1,17 +1,20 @@
#!/bin/bash
# Hudson script used to publish Tycho-built p2 update sites
-# define target zip filename date and hudson build id marked for clarity and publication
-ZIPNAME=${JOB_NAME}-Update-H${BUILD_NUMBER}-${BUILD_ID}.zip
-
# define target zip filename for inclusion in uberbuilder's bucky aggregator
SNAPNAME=${JOB_NAME}-Update-SNAPSHOT.zip
rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME}
if [[ -f ${WORKSPACE}/sources/site/target/site.zip ]]; then
- # copy into workspace for archiving
- rsync -aq ${WORKSPACE}/sources/site/target/site.zip ${WORKSPACE}/site/${JOB_NAME}/${ZIPNAME}
- # copy into workspace for access by bucky aggregator
+ # note the job name, build number, and build ID of the latest snapshot zip
+ echo "JOB_NAME = ${JOB_NAME}" > ${WORKSPACE}/site/${JOB_NAME}/JOB_NAME.txt
+ echo "BUILD_NUMBER = ${BUILD_NUMBER}" > ${WORKSPACE}/site/${JOB_NAME}/BUILD_NUMBER.txt
+ echo "BUILD_ID = ${BUILD_ID}" > ${WORKSPACE}/site/${JOB_NAME}/BUILD_ID.txt
+
+ # unzip into workspace for publishing as unpacked site
+ unzip -q ${WORKSPACE}/sources/site/target/site.zip -d ${WORKSPACE}/site/${JOB_NAME}/
+
+ # copy into workspace for access by bucky aggregator (same name every time)
rsync -aq ${WORKSPACE}/sources/site/target/site.zip ${WORKSPACE}/site/${SNAPNAME}
fi
@@ -26,5 +29,6 @@
rsync -arzq --delete ${WORKSPACE}/site/${JOB_NAME} $DESTINATION/builds/nightly/3.2.helios/
fi
if [[ -f ${WORKSPACE}/site/${SNAPNAME} ]]; then
+ # publish snapshot zip
rsync -arzq --delete ${WORKSPACE}/site/${SNAPNAME} $DESTINATION/builds/nightly/3.2.helios/
fi
\ No newline at end of file
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r22735 - trunk/as/tests/org.jboss.ide.eclipse.as.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-06-10 17:25:59 -0400 (Thu, 10 Jun 2010)
New Revision: 22735
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml
Log:
enable back commented requirements build to download AS distribution required for test
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml 2010-06-10 21:07:00 UTC (rev 22734)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml 2010-06-10 21:25:59 UTC (rev 22735)
@@ -30,8 +30,9 @@
<argLine>-Djbosstools.test.jboss.home.3.2=${requirements.build}/jboss-3.2.8.SP1 -Djbosstools.test.jboss.home.4.0=${requirements.build}/jboss-4.0.5.GA -Djbosstools.test.jboss.home.4.2=${requirements.build}/jboss-4.2.3.GA -Djbosstools.test.jboss.home.5.0=${requirements.build}/jboss-5.0.1.GA -Djbosstools.test.jboss.home.5.1=${requirements.build}/jboss-5.1.0.GA</argLine>
</configuration>
</plugin>
- <!-- <plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
<executions>
<execution>
<id>prepare-eclipse-base</id>
@@ -48,7 +49,7 @@
</configuration>
</execution>
</executions>
- </plugin> -->
+ </plugin>
</plugins>
</build>
</project>
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r22734 - in trunk/ws/plugins/org.jboss.tools.ws.creation.core: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2010-06-10 17:07:00 -0400 (Thu, 10 Jun 2010)
New Revision: 22734
Removed:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/lib/
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/.classpath
trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.creation.core/build.properties
Log:
JBIDE-6428 - fixing weird compile error and getting rid of internally-held wsdl4j.jar in favor of using javax.wsdl from Orbit/Eclipse
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/.classpath
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/.classpath 2010-06-10 19:06:14 UTC (rev 22733)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/.classpath 2010-06-10 21:07:00 UTC (rev 22734)
@@ -3,6 +3,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib" path="lib/wsdl4j.jar" sourcepath="org.jboss.tools.ws.creation.coresrc.zip"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2010-06-10 19:06:14 UTC (rev 22733)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2010-06-10 21:07:00 UTC (rev 22734)
@@ -36,14 +36,14 @@
org.eclipse.jdt,
org.eclipse.jdt.launching,
org.eclipse.debug.core,
- org.eclipse.jst.jee.web
+ org.eclipse.jst.jee.web,
+ javax.wsdl;visibility:=reexport
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.ws.creation.core,
org.jboss.tools.ws.creation.core.commands,
org.jboss.tools.ws.creation.core.data,
org.jboss.tools.ws.creation.core.messages,
org.jboss.tools.ws.creation.core.utils
-Bundle-ClassPath: lib/wsdl4j.jar,
- .
+Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/build.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/build.properties 2010-06-10 19:06:14 UTC (rev 22733)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/build.properties 2010-06-10 21:07:00 UTC (rev 22734)
@@ -2,7 +2,6 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- lib/wsdl4j.jar,\
plugin.properties,\
about.html
additional.bundles = org.eclipse.jem.util
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r22733 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-10 15:06:14 -0400 (Thu, 10 Jun 2010)
New Revision: 22733
Modified:
trunk/runstack.sh
Log:
tweak example and filter
Modified: trunk/runstack.sh
===================================================================
--- trunk/runstack.sh 2010-06-10 19:05:39 UTC (rev 22732)
+++ trunk/runstack.sh 2010-06-10 19:06:14 UTC (rev 22733)
@@ -7,7 +7,7 @@
if [[ $# -lt 1 ]]; then
echo "Usage: $0 component1 component2 ..."
echo "Eg. $0 tests common jmx archives as"
- echo "Eg. $0 jst jsf vpe struts seam"
+ echo "Eg. $0 jst jsf vpe struts seam -Dmaven.test.skip"
exit 1
fi
@@ -32,7 +32,8 @@
# collect compilation results and failures
for d in $components; do
cd $workingdir; echo "==== $d ===="
- egrep -v "org\.|com\." $d/buildlog.latest.txt | egrep "SUCCESS|FAIL"
+ egrep -v "org\.|com\." $d/buildlog.latest.txt | egrep "SUCCESS"
+ egrep "FAILURE|SKIPPED" $d/buildlog.latest.txt
egrep -A1 "Cannot complete the request|depends on|satisfy dependency|Missing requirement|requires '.+'" $d/buildlog.latest.txt
echo ""
done
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r22732 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-10 15:05:39 -0400 (Thu, 10 Jun 2010)
New Revision: 22732
Added:
trunk/build/target-platform/e36-wtp32-svn.target
Modified:
trunk/build/target-platform/e36-wtp32.target
trunk/build/target-platform/pom.xml
Log:
https://jira.jboss.org/browse/JBDS-1247 remove svn from target platform definition; fix path to parent pom
Copied: trunk/build/target-platform/e36-wtp32-svn.target (from rev 22731, trunk/build/target-platform/e36-wtp32.target)
===================================================================
--- trunk/build/target-platform/e36-wtp32-svn.target (rev 0)
+++ trunk/build/target-platform/e36-wtp32-svn.target 2010-06-10 19:05:39 UTC (rev 22732)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.6"?>
+
+<target name="e36-wtp32">
+<locations>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="3.6.0.I20100520-1744"/>
+<unit id="org.eclipse.platform.sdk" version="3.6.0.I20100520-1744"/>
+<unit id="org.eclipse.sdk.ide" version="3.6.0.I20100520-1744"/>
+<unit id="org.eclipse.releng.tools.feature.group" version="3.3.0.v20100427-44A77w31211614"/>
+<unit id="org.eclipse.swt.tools" version="3.6.0.v3611d"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.6milestones/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.0.v20100525-2205-35-7w3121163603316"/>
+<repository location="http://download.eclipse.org/birt/update-site/2.6-interim/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.6.0.v20100517-1331"/>
+<unit id="org.eclipse.gef.sdk.feature.group" version="3.6.0.v20100429-2050-7G7R-A5WNaPQIcSWKMfdROUWaQLI"/>
+<unit id="org.eclipse.zest.sdk.feature.group" version="1.2.0.v20100429-2050-679-8COKLDAJPWQNSXWPTedQT8YP"/>
+<unit id="org.eclipse.xsd.sdk.feature.group" version="2.6.0.v20100503-1402"/>
+<unit id="org.eclipse.tptp.monitoring.runtime.feature.group" version="4.5.0.v201005032111-7T7X-7r2VNos_vYhrZgcqiTMM"/>
+<unit id="org.eclipse.tptp.platform.runtime.feature.group" version="4.7.0.v201005032111-7u84-8ksiMskubQ6UTA7XS3tcLX0"/>
+<unit id="org.eclipse.tptp.wtp.feature.group" version="4.5.0.v201005032111-54-78I8G0BlG8C88S8WCW88"/>
+<unit id="org.eclipse.tptp.birt.feature.group" version="4.5.0.v201005032111-53-78A8A09t84644E4G6G44"/>
+<unit id="org.eclipse.tptp.test.runtime.feature.group" version="4.5.0.v201005032111-7H7I-7VrO5DXI-B6opYKPuD-96gb"/>
+<unit id="org.eclipse.tptp.trace.runtime.feature.group" version="4.4.0.v201005032111-7H7C-7XbL_J3E9NJOSVeYeWM94"/>
+<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.0.v201004210628-208Z7w31211419"/>
+<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.0.v201004210628-51EoAkF77g8HBSc"/>
+<repository location="http://download.eclipse.org/releases/helios"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.maven.ide.eclipse.sdk.feature.feature.group" version="0.10.0.20100209-0800"/>
+<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.10.0.20100209-0800"/>
+<unit id="org.maven.ide.eclipse.subclipse.feature.feature.group" version="0.10.0.20100209-0800"/>
+<unit id="org.maven.ide.eclipse.cvs.feature.feature.group" version="0.10.0.20100209-0800"/>
+<unit id="org.maven.ide.eclipse.scm.feature.feature.group" version="0.10.0.20100209-0800"/>
+<unit id="org.maven.ide.eclipse.temporary.mojos.feature.feature.group" version="0.10.0.20100209-0800"/>
+<repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.maven.ide.eclipse.feature.feature.group" version="0.10.0.20100209-0800"/>
+<repository location="http://m2eclipse.sonatype.org/sites/m2e"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.tmatesoft.svnkit.feature.group" version="1.3.3.6648"/>
+<unit id="com.sun.jna.feature.group" version="3.2.3"/>
+<repository location="http://eclipse.svnkit.com/1.3.x/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.polarion.eclipse.team.svn.connector.svnkit15.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.javahl15.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.javahl15.win32.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.svnkit16.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.javahl16.win32.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.javahl.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.javahl16.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.javahl.win32.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.svnkit.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.source.feature.group" version="2.2.2.I20100512-1900"/>
+<repository location="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..."/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.team.svn.mylyn.feature.group" version="0.7.9.I20100512-1900"/>
+<unit id="org.eclipse.team.svn.source.feature.group" version="0.7.9.I20100512-1900"/>
+<unit id="org.eclipse.team.svn.feature.group" version="0.7.9.I20100512-1900"/>
+<unit id="org.eclipse.team.svn.resource.ignore.rules.jdt.feature.group" version="0.7.9.I20100512-1900"/>
+<unit id="org.eclipse.team.svn.revision.graph.feature.group" version="0.7.9.I20100512-1900"/>
+<unit id="org.eclipse.team.svn.nl1.feature.group" version="0.7.9.I20100512-1900"/>
+<repository location="http://download.eclipse.org/technology/subversive/0.7/update-site/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.ecf.core.source.feature.group" version="3.2.0.v20100219-1253"/>
+<unit id="org.eclipse.ecf.core.featurepatch.source.feature.group" version="3.2.0.v20100219-1253"/>
+<unit id="org.eclipse.ecf.core.feature.group" version="3.2.0.v20100219-1253"/>
+<unit id="org.eclipse.ecf.core.featurepatch.feature.group" version="3.2.0.v20100219-1253"/>
+<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.feature.group" version="2.0.0.568-dev-e36"/>
+<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
+</location>
+</locations>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+</target>
Modified: trunk/build/target-platform/e36-wtp32.target
===================================================================
--- trunk/build/target-platform/e36-wtp32.target 2010-06-10 18:36:51 UTC (rev 22731)
+++ trunk/build/target-platform/e36-wtp32.target 2010-06-10 19:05:39 UTC (rev 22732)
@@ -12,70 +12,37 @@
<repository location="http://download.eclipse.org/eclipse/updates/3.6milestones/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.0.v20100525-2205-35-7w3121163603316"/>
+<unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.0"/>
<repository location="http://download.eclipse.org/birt/update-site/2.6-interim/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.6.0.v20100517-1331"/>
-<unit id="org.eclipse.gef.sdk.feature.group" version="3.6.0.v20100429-2050-7G7R-A5WNaPQIcSWKMfdROUWaQLI"/>
-<unit id="org.eclipse.zest.sdk.feature.group" version="1.2.0.v20100429-2050-679-8COKLDAJPWQNSXWPTedQT8YP"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.6.0"/>
+<unit id="org.eclipse.gef.sdk.feature.group" version="3.6.0"/>
+<unit id="org.eclipse.zest.sdk.feature.group" version="1.2.0"/>
<unit id="org.eclipse.xsd.sdk.feature.group" version="2.6.0.v20100503-1402"/>
<unit id="org.eclipse.tptp.monitoring.runtime.feature.group" version="4.5.0.v201005032111-7T7X-7r2VNos_vYhrZgcqiTMM"/>
<unit id="org.eclipse.tptp.platform.runtime.feature.group" version="4.7.0.v201005032111-7u84-8ksiMskubQ6UTA7XS3tcLX0"/>
<unit id="org.eclipse.tptp.wtp.feature.group" version="4.5.0.v201005032111-54-78I8G0BlG8C88S8WCW88"/>
<unit id="org.eclipse.tptp.birt.feature.group" version="4.5.0.v201005032111-53-78A8A09t84644E4G6G44"/>
<unit id="org.eclipse.tptp.test.runtime.feature.group" version="4.5.0.v201005032111-7H7I-7VrO5DXI-B6opYKPuD-96gb"/>
-<unit id="org.eclipse.tptp.trace.runtime.feature.group" version="4.4.0.v201005032111-7H7C-7XbL_J3E9NJOSVeYeWM94"/>
-<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.0.v201004210628-208Z7w31211419"/>
-<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.0.v201004210628-51EoAkF77g8HBSc"/>
+<unit id="org.eclipse.tptp.trace.runtime.feature.group" version="4.4.0"/>
+<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.0"/>
+<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.0"/>
<repository location="http://download.eclipse.org/releases/helios"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.maven.ide.eclipse.sdk.feature.feature.group" version="0.10.0.20100209-0800"/>
-<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.10.0.20100209-0800"/>
-<unit id="org.maven.ide.eclipse.subclipse.feature.feature.group" version="0.10.0.20100209-0800"/>
-<unit id="org.maven.ide.eclipse.cvs.feature.feature.group" version="0.10.0.20100209-0800"/>
-<unit id="org.maven.ide.eclipse.scm.feature.feature.group" version="0.10.0.20100209-0800"/>
-<unit id="org.maven.ide.eclipse.temporary.mojos.feature.feature.group" version="0.10.0.20100209-0800"/>
+<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.10.0"/>
<repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.maven.ide.eclipse.feature.feature.group" version="0.10.0.20100209-0800"/>
+<unit id="org.maven.ide.eclipse.feature.feature.group" version="0.10.0"/>
<repository location="http://m2eclipse.sonatype.org/sites/m2e"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.tmatesoft.svnkit.feature.group" version="1.3.3.6648"/>
-<unit id="com.sun.jna.feature.group" version="3.2.3"/>
-<repository location="http://eclipse.svnkit.com/1.3.x/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.polarion.eclipse.team.svn.connector.svnkit15.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.javahl15.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.javahl15.win32.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.svnkit16.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.javahl16.win32.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.javahl.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.javahl16.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.javahl.win32.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.svnkit.feature.group" version="2.2.2.I20100512-1900"/>
-<unit id="org.polarion.eclipse.team.svn.connector.source.feature.group" version="2.2.2.I20100512-1900"/>
-<repository location="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..."/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.team.svn.mylyn.feature.group" version="0.7.9.I20100512-1900"/>
-<unit id="org.eclipse.team.svn.source.feature.group" version="0.7.9.I20100512-1900"/>
-<unit id="org.eclipse.team.svn.feature.group" version="0.7.9.I20100512-1900"/>
-<unit id="org.eclipse.team.svn.resource.ignore.rules.jdt.feature.group" version="0.7.9.I20100512-1900"/>
-<unit id="org.eclipse.team.svn.revision.graph.feature.group" version="0.7.9.I20100512-1900"/>
-<unit id="org.eclipse.team.svn.nl1.feature.group" version="0.7.9.I20100512-1900"/>
-<repository location="http://download.eclipse.org/technology/subversive/0.7/update-site/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.ecf.core.source.feature.group" version="3.2.0.v20100219-1253"/>
-<unit id="org.eclipse.ecf.core.featurepatch.source.feature.group" version="3.2.0.v20100219-1253"/>
-<unit id="org.eclipse.ecf.core.feature.group" version="3.2.0.v20100219-1253"/>
-<unit id="org.eclipse.ecf.core.featurepatch.feature.group" version="3.2.0.v20100219-1253"/>
+<unit id="org.eclipse.ecf.core.source.feature.group" version="3.2.0"/>
+<unit id="org.eclipse.ecf.core.featurepatch.source.feature.group" version="3.2.0"/>
+<unit id="org.eclipse.ecf.core.feature.group" version="3.2.0"/>
+<unit id="org.eclipse.ecf.core.featurepatch.feature.group" version="3.2.0"/>
<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
Modified: trunk/build/target-platform/pom.xml
===================================================================
--- trunk/build/target-platform/pom.xml 2010-06-10 18:36:51 UTC (rev 22731)
+++ trunk/build/target-platform/pom.xml 2010-06-10 19:05:39 UTC (rev 22732)
@@ -3,14 +3,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <relativePath>parent-pom.xml</relativePath>
+ <relativePath>../../parent-pom.xml</relativePath>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.parent.pom</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools</groupId>
-
<artifactId>target-platform</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<build>
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r22731 - in trunk/build: aggregate and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-10 14:36:51 -0400 (Thu, 10 Jun 2010)
New Revision: 22731
Added:
trunk/build/aggregate/
trunk/build/aggregate/TODO.txt
trunk/build/aggregate/aggregateRepos.jbds.properties.UNUSED
trunk/build/aggregate/aggregateRepos.jbosstools.properties
trunk/build/aggregate/aggregateRepos.m2eclipse.properties
trunk/build/aggregate/aggregateRepos.xml
Log:
add aggregator to merge JBT update site w/ pi4soa, tdesigner, etc.
Added: trunk/build/aggregate/TODO.txt
===================================================================
--- trunk/build/aggregate/TODO.txt (rev 0)
+++ trunk/build/aggregate/TODO.txt 2010-06-10 18:36:51 UTC (rev 22731)
@@ -0,0 +1,3 @@
+TODO: write ant script wrapper to pass in correct variables to aggregateRepos.xml script
+TODO: create Hudson job to aggregate update site zips into a new uberzip
+
Added: trunk/build/aggregate/aggregateRepos.jbds.properties.UNUSED
===================================================================
--- trunk/build/aggregate/aggregateRepos.jbds.properties.UNUSED (rev 0)
+++ trunk/build/aggregate/aggregateRepos.jbds.properties.UNUSED 2010-06-10 18:36:51 UTC (rev 22731)
@@ -0,0 +1,60 @@
+# aggregateRepos.xml properties file
+
+# basic config when used in JBT/JBDS build
+eclipse.home=${clean.eclipse.home}
+working.dir=${product.build.directory}/b3.aggregator
+
+# basic config when testing on local - be sure to replace reference to ${updateZip} with local JBT/JBDS update site zip
+#eclipse.home=/home/nboldt/eclipse/36clean2/eclipse
+#working.dir=/tmp/build.b3.aggregator
+# optional config when testing on local
+#requirement.build.root=${working.dir}
+#update.site.product.name=JBoss Tools
+#update.site.description=Nightly
+#product.versionTag=3.1.0.v201002111546N-H238-CR2
+
+# descriptions and labels used to name the resulting repo or to name categories
+repoName=${update.site.product.name} ${update.site.description} Update Site
+#product.versionTag=3.1.0.v200910281633N-RC1
+
+# location from which to install b3 aggregator
+b3.aggregator.repo=http://download.jboss.org/jbosstools/requirements/helios/b3.aggregator-repo-0.1.0.r01001_e36.zip
+b3.backup.repos=http://download.eclipse.org/eclipse/updates/3.6milestones/,http://download.eclipse.org/releases/helios/,http://download.jboss.org/jbosstools/requirements/helios/buckminster-repo-1.3.0.r11439_e36.zip
+
+# repos to aggregate - local paths require jar:file:/path/to.zip!/
+# repos to aggregate - remote paths to a zip will be prefetched and treated as local repo archive
+#jar:file:${product.build.directory}/all/${updateZip}!/,\
+#jar:file:${working.dir}/JBossTools-Update-3.1.0.v201002111546N-H238-CR2.zip!/,\
+# http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...
+repos=\
+http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-3.2.0.M1-Update-SNAPSHOT.zip,\
+
+# associate sites to add to the resulting repo
+associate.sites=http://download.jboss.org/jbosstools/updates/helios/,\
+http://download.eclipse.org/birt/update-site/2.6-interim/,\
+http://download.eclipse.org/birt/update-site/2.6/,\
+http://download.eclipse.org/eclipse/updates/3.6milestones/,\
+http://download.eclipse.org/eclipse/updates/3.6/,\
+http://m2eclipse.sonatype.org/sites/m2e/,\
+http://m2eclipse.sonatype.org/sites/m2e-extras/
+
+# category to feature mappings: need a list of unique categoryIDs, then the list of features to assign to each category
+categories=SDKTools2,AllTools2,SOATools2
+SDKTools2.features=org.jboss.tools.jbpm3.sdk.feature
+#,org.jboss.tools.jmx.sdk.feature
+AllTools2.features=org.jbpm.gd.jpdl.feature
+#,org.jboss.tools.jmx.feature
+SOATools2.features=org.jbpm.gd.jpdl.feature
+#,org.jboss.tools.jmx.feature
+
+# for each repo zip input, list features to collect and assign to existing/new custom categories
+jbpm3-Update-N-SNAPSHOT.zip.features=org.jbpm.gd.jpdl.feature,org.jboss.tools.jbpm3.sdk.feature
+#JMX-Update-N-SNAPSHOT.zip.features=org.jboss.tools.jmx.feature,org.jboss.tools.jmx.sdk.feature
+
+# descriptions and labels for existing/new custom categories
+custom.category.label.SDKTools2=JBoss Developer Studio SDK
+custom.category.description.SDKTools2=JBoss Developer Studio SDK contains plugins where an SDK package exists. These contain both source and runtimes. Use these if you want to debug and/or provide patches to JBoss Developer Studio plugins.
+custom.category.label.AllTools2=All JBoss Developer Studio Tools - ${product.versionTag}
+custom.category.description.AllTools2=Contains ALL the plugins that are available from JBoss Tools except those related to integration with 3rd party plugins. Selecting this category will give you all tools needed for both Web, Seam and SOA Development.
+custom.category.label.SOATools2=SOA Development
+custom.category.description.SOATools2=Tools to help create SOA applications. Use these if you work with jBPM, Drools, JBoss ESB, JBoss WebServices or Smooks.
Added: trunk/build/aggregate/aggregateRepos.jbosstools.properties
===================================================================
--- trunk/build/aggregate/aggregateRepos.jbosstools.properties (rev 0)
+++ trunk/build/aggregate/aggregateRepos.jbosstools.properties 2010-06-10 18:36:51 UTC (rev 22731)
@@ -0,0 +1,62 @@
+# aggregateRepos.xml properties file
+
+# basic config when used in JBT/JBDS build
+eclipse.home=${clean.eclipse.home}
+working.dir=${product.build.directory}/b3.aggregator
+
+# basic config when testing on local - be sure to replace reference to ${updateZip} with local JBT/JBDS update site zip
+#eclipse.home=/home/nboldt/eclipse/36clean2/eclipse
+#working.dir=/tmp/build.b3.aggregator
+# optional config when testing on local
+#requirement.build.root=${working.dir}
+#update.site.product.name=JBoss Tools
+#update.site.description=Nightly
+#product.versionTag=3.1.0.v201002111546N-H238-CR2
+
+# descriptions and labels used to name the resulting repo or to name categories
+repoName=${update.site.product.name} ${update.site.description} Update Site
+#product.versionTag=3.1.0.v200910281633N-RC1
+
+# location from which to install b3 aggregator
+b3.aggregator.repo=http://download.jboss.org/jbosstools/requirements/helios/b3.aggregator-repo-0.1.0.r01001_e36.zip
+b3.backup.repos=http://download.eclipse.org/eclipse/updates/3.6milestones/,http://download.eclipse.org/releases/helios/,http://download.jboss.org/jbosstools/requirements/helios/buckminster-repo-1.3.0.r11439_e36.zip
+
+# repos to aggregate - local paths require jar:file:/path/to.zip!/
+# repos to aggregate - remote paths to a zip will be prefetched and treated as local repo archive
+# http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...
+repos=\
+http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-3.2.0.M1.helios-Update-SNAPSHOT.zip,\
+http://hudson.qa.jboss.com/hudson/view/DevStudio_CBI/job/jbosstools-cbi-pi4soa/lastSuccessfulBuild/artifact/build/N-SNAPSHOT/pi4soa-Update-N-SNAPSHOT.zip,\
+http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-teiid-designer-Update-SNAPSHOT.zip
+
+# associate sites to add to the resulting repo
+associate.sites=http://download.jboss.org/jbosstools/updates/helios/,\
+http://download.eclipse.org/birt/update-site/2.6-interim/,\
+http://download.eclipse.org/birt/update-site/2.6/,\
+http://download.eclipse.org/eclipse/updates/3.6milestones/,\
+http://download.eclipse.org/eclipse/updates/3.6/,\
+http://m2eclipse.sonatype.org/sites/m2e/,\
+http://m2eclipse.sonatype.org/sites/m2e-extras/,\
+http://subclipse.tigris.org/update_1.6.x/,\
+http://download.eclipse.org/technology/subversive/0.7/update-site/,\
+http://community.polarion.com/projects/subversive/download/eclipse/2.0/update-site/
+
+# category to feature mappings: need a list of unique categoryIDs, then the list of features to assign to each category
+categories=AllTools2,DataTools2
+AllTools2.features=org.pi4soa.core.feature,\
+org.teiid.datatools.connectivity.feature,org.teiid.designer.feature,org.teiid.designer.runtime.feature
+DataTools2.features=org.teiid.datatools.connectivity.feature,org.teiid.designer.feature,org.teiid.designer.runtime.feature
+
+# for each repo zip input, list features to collect and assign to existing/new custom categories
+pi4soa-Update-N-SNAPSHOT.zip.features=org.pi4soa.core.feature,org.pi4soa.sdk.feature
+jbosstools-teiid-designer-Update-SNAPSHOT.zip=org.teiid.datatools.connectivity.feature,org.teiid.designer.feature,org.teiid.designer.runtime.feature
+
+# descriptions and labels for existing/new custom categories
+custom.category.label.SDKTools2=JBoss Tools SDK
+custom.category.description.SDKTools2=JBoss Tools SDK contains plugins where an SDK package exists. These contain both source and runtimes. Use these if you want to debug and/or provide patches to JBoss Tools plugins.
+custom.category.label.AllTools2=All JBoss Tools - ${product.versionTag}
+custom.category.description.AllTools2=Contains ALL the plugins that are available from JBoss Tools except those related to integration with 3rd party plugins. Selecting this category will give you all tools needed for both Web, Seam and SOA Development.
+custom.category.label.SOATools2=SOA Development
+custom.category.description.SOATools2=Tools to help create SOA applications. Use these if you work with jBPM, Drools, JBoss ESB, JBoss WebServices or Smooks.
+custom.category.label.DataTools2=Data Services
+custom.category.description.DataTools2=Tools related to data services such as persistence and transformation.
Added: trunk/build/aggregate/aggregateRepos.m2eclipse.properties
===================================================================
--- trunk/build/aggregate/aggregateRepos.m2eclipse.properties (rev 0)
+++ trunk/build/aggregate/aggregateRepos.m2eclipse.properties 2010-06-10 18:36:51 UTC (rev 22731)
@@ -0,0 +1,24 @@
+# aggregateRepos.xml properties file
+
+# basic configuration
+eclipse.home=/home/nboldt/eclipse/36clean/eclipse
+working.dir=/tmp/build.b3.aggregator
+
+# descriptions and labels used to name the resulting repo or to name categories
+repoName=m2eclipse 0.10.0.20100209-0800 Updates
+product.versionTag=0.10.0.20100209-0800
+
+# location from which to install b3 aggregator
+b3.aggregator.repo=http://download.jboss.org/jbosstools/requirements/helios/b3.aggregator-repo-0.1.0.r01001_e36.zip
+b3.backup.repos=http://download.eclipse.org/eclipse/updates/3.6milestones/,http://download.eclipse.org/releases/helios/,http://download.jboss.org/jbosstools/requirements/helios/buckminster-repo-1.3.0.r11439_e36.zip
+
+# repos to aggregate - local paths require jar:file:/path/to.zip!/
+repos=\
+http://m2eclipse.sonatype.org/sites/m2e/,\
+http://m2eclipse.sonatype.org/sites/m2e-extras/
+
+associate.sites=http://download.eclipse.org/releases/galileo/,\
+http://download.eclipse.org/eclipse/updates/3.5/,\
+http://subclipse.tigris.org/update_1.6.x
+
+categories=
Added: trunk/build/aggregate/aggregateRepos.xml
===================================================================
--- trunk/build/aggregate/aggregateRepos.xml (rev 0)
+++ trunk/build/aggregate/aggregateRepos.xml 2010-06-10 18:36:51 UTC (rev 22731)
@@ -0,0 +1,631 @@
+<project default="run" name="aggregateRepos">
+ <taskdef resource="net/sf/antcontrib/antlib.xml">
+ <classpath>
+ <pathelement path="${classpath}" />
+ <pathelement location="/usr/share/java/ant-contrib.jar" />
+ </classpath>
+ </taskdef>
+
+ <!-- Complete set of steps: init,prefetch.repo.zips,install.b3.aggregator,generate.build.file,run.build.file,add.associate.sites,zip.repo,cleanup -->
+ <target name="run"
+ depends="init,prefetch.repo.zips,install.b3.aggregator,generate.build.file,run.build.file,add.associate.sites,zip.repo,cleanup"
+ />
+
+ <target name="init">
+ <property name="aggregateRepos.properties" value="aggregateRepos.m2eclipse.properties" />
+ <property file="${aggregateRepos.properties}" />
+ <mkdir dir="${working.dir}" />
+ <!-- set these properties in aggregateRepos.properties file:
+ eclipse.home=/home/nboldt/eclipse/35clean/eclipse
+ working.dir=${java.io.tmpdir}/build.b3.aggregator
+ repoName=JBoss Tools Nightly Aggregate Update Site
+ product.versionTag=3.1.0.v200910281633N-RC1
+ repos=\
+ jar:file:${java.io.tmpdir}/build.b3.aggregator/JBossTools-Update-3.1.0.v200910281633N-RC1.zip!/,\
+ jar:file:${java.io.tmpdir}/build.b3.aggregator/pi4soa-Update-N-SNAPSHOT.zip!/,\
+ jar:file:${java.io.tmpdir}/build.b3.aggregator/jbpm3-Update-N-SNAPSHOT.zip!/,\
+ jar:file:${java.io.tmpdir}/build.b3.aggregator/jbpm4-Update-N-SNAPSHOT.zip!/
+ #repos=\
+ #jar:file:${java.io.tmpdir}/build.b3.aggregator/JBossTools-Update-3.1.0.v200910281633N-RC1.zip!/,\
+ #ttp://hudson.qa.jboss.com/hudson/view/DevStudio/job/jbosstools-cbi-pi4soa/lastStableBuild/artifact/build/N-SNAPSHOT/pi4soa-Update-N-SNAPSHOT.zip,\
+ #http://hudson.qa.jboss.com/hudson/view/DevStudio/job/jbosstools-cbi-jbpm3/lastStableBuild/artifact/build/N-SNAPSHOT/jbpm3-Update-N-SNAPSHOT.zip,\
+ #http://hudson.qa.jboss.com/hudson/view/DevStudio/job/jbosstools-cbi-jbpm4/lastStableBuild/artifact/build/N-SNAPSHOT/jbpm4-Update-N-SNAPSHOT.zip
+
+ associate.sites=\
+ http://download.eclipse.org/releases/galileo,\
+ http://download.eclipse.org/birt/update-site/2.5/,\
+ http://download.eclipse.org/eclipse/updates/3.5/,\
+ http://download.jboss.org/jbosstools/updates/m2eclipse/0.10/
+ # http://m2eclipse.sonatype.org/update-dev
+ -->
+ <property name="working.dir" value="/tmp/build.b3.aggregator" />
+ <property name="requirement.build.root" value="${working.dir}" />
+ </target>
+
+ <!-- prefetch remote update site zips as local archive repos -->
+ <target name="prefetch.repo.zips" description="prefetch repo zips and convert remote repo zips to local">
+ <antcallback return="prefetchRepoZips.return" target="prefetchRepoZips">
+ <param name="theList" value="${repos}" />
+ </antcallback>
+ <var name="repos" value="${prefetchRepoZips.return}" />
+ <var name="prefetchRepoZips.return" unset="true" />
+
+ <if>
+ <and>
+ <isset property="associate.sites" />
+ <not>
+ <equals arg1="${associate.sites}" arg2="" />
+ </not>
+ </and>
+ <then>
+ <antcallback return="prefetchRepoZips.return" target="prefetchRepoZips">
+ <param name="theList" value="${associate.sites}" />
+ </antcallback>
+ <var name="associate.sites" value="${prefetchRepoZips.return}" />
+ <var name="prefetchRepoZips.return" unset="true" />
+ </then>
+ </if>
+ </target>
+
+ <target name="install.b3.aggregator" description="b3 Aggregator requires Eclipse 3.6">
+ <!-- set these properties in aggregateRepos.properties file:
+ b3.aggregator.repo=http://download.jboss.org/jbosstools/requirements/heli...
+ b3.backup.repos=http://download.eclipse.org/eclipse/updates/3.6milestones...
+ -->
+
+ <!-- prefetch remote update site zips as local archive repos -->
+ <antcallback return="prefetchRepoZips.return" target="prefetchRepoZips">
+ <param name="theList" value="${b3.aggregator.repo}" />
+ </antcallback>
+ <var name="b3.aggregator.repo" value="${prefetchRepoZips.return}" />
+ <var name="prefetchRepoZips.return" unset="true" />
+
+ <antcallback return="prefetchRepoZips.return" target="prefetchRepoZips">
+ <param name="theList" value="${b3.backup.repos}" />
+ </antcallback>
+ <var name="b3.backup.repos" value="${prefetchRepoZips.return}" />
+ <var name="prefetchRepoZips.return" unset="true" />
+
+ <chmod perm="+x" file="${eclipse.home}/eclipse" />
+ <exec executable="${eclipse.home}/eclipse"
+ failonerror="true"
+ dir="${eclipse.home}"
+ timeout="900000"
+ taskname="p2.dir"
+ >
+ <arg line=" -vm ${java.home}/bin/java" />
+ <!-- If using Eclipse 3.4, " -application org.eclipse.equinox.p2.director.app.application" -->
+ <arg line=" -application org.eclipse.equinox.p2.director" />
+ <arg line=" -nosplash --launcher.suppressErrors -consoleLog -flavor tooling -roaming -profile SDKProfile" />
+ <arg line=" -installIU org.eclipse.b3.aggregator.engine.feature.feature.group" />
+ <!-- optional for UI -->
+ <!-- <arg line=" -installIU org.eclipse.b3.aggregator.editor.feature.feature.group" /> -->
+ <arg line=" -destination ${eclipse.home} -bundlepool ${eclipse.home}" />
+ <arg line=" -metadataRepository ${b3.aggregator.repo},${b3.backup.repos},file:${eclipse.home}/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile"
+ />
+ <arg line=" -artifactRepository ${b3.aggregator.repo},${b3.backup.repos},file:${eclipse.home}"
+ />
+ <arg line=" -profileProperties org.eclipse.update.install.features=true" />
+ <arg line=" -vmargs -Declipse.p2.data.area=${eclipse.home}/p2 -Declipse.p2.MD5Check=false" />
+ </exec>
+ </target>
+
+ <target name="prefetchRepoZips"
+ description="Support remote update site zips: if repoURL contains http: or ftp: and .zip, get then switch it to a jar:file: URL"
+ >
+ <property name="theList" value="" />
+ <property name="theTargetDir" value="${requirement.build.root}/p2repos" />
+ <mkdir dir="${theTargetDir}" />
+ <var name="prefetchRepoZips.return" value="${theList}" />
+ <for param="repoURL" list="${theList}" delimiter=",
+ ">
+ <sequential>
+ <if>
+ <and>
+ <contains string="@{repoURL}" substring=".zip" />
+ <or>
+ <contains string="@{repoURL}" substring="http://" />
+ <contains string="@{repoURL}" substring="https://" />
+ <contains string="@{repoURL}" substring="ftp://" />
+ <contains string="@{repoURL}" substring="file://" />
+ </or>
+ </and>
+
+ <then>
+ <var name="repoFile" unset="true" />
+ <propertyregex property="repoFile"
+ input="@{repoURL}"
+ defaultvalue="@{repoURL}"
+ regexp=".+/([^/]+.zip)"
+ replace="\1"
+ casesensitive="false"
+ override="true"
+ />
+ <propertyregex property="prefetchRepoZips.return"
+ input="${prefetchRepoZips.return}"
+ defaultvalue="${prefetchRepoZips.return}"
+ regexp="@{repoURL}"
+ replace="jar:file:${theTargetDir}/${repoFile}!/"
+ casesensitive="false"
+ override="true"
+ />
+ <get dest="${theTargetDir}/${repoFile}" src="@{repoURL}" usetimestamp="true" />
+ <var name="repoFile" unset="true" />
+ <!-- <echo>repoURL = ${prefetchRepoZips.return}</echo> -->
+ </then>
+ </if>
+ </sequential>
+ </for>
+ </target>
+
+ <target name="generate.build.file">
+ <property name="repoName" value="JBoss Tools Aggregate Update Site" />
+ <property name="platform.names" value="linux-gtk,linux-gtk-x86_64,win32,macosx-carbon,macosx-cocoa" />
+ <!-- packedStrategy = {SKIP, UNPACK, UNPACK_AS_SIBLING, COPY, VERIFY} -->
+ <!-- mavenResult="{true,false}" -->
+ <echo file="${working.dir}/repo.b3aggr"><?xml version="1.0" encoding="UTF-8"?>
+<aggregator:Aggregator xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:aggregator="http://www.eclipse.org/b3/2010/aggregator/1.0.0"
+ buildmaster="//@contacts[email='nickboldt(a)gmail.com']"
+ label="${repoName}" buildRoot="${working.dir}/output"
+ packedStrategy="COPY" type="N" mavenResult="false">
+ <contacts name="Nick Boldt" email="nickboldt(a)gmail.com"/>
+</echo>
+ <for param="platform" list="${platform.names}" delimiter=",">
+ <sequential>
+ <if>
+ <equals arg1="@{platform}" arg2="linux-gtk" />
+ <then>
+ <echo file="${working.dir}/repo.b3aggr" append="true"> <configurations operatingSystem="linux" windowSystem="gtk"/>
+</echo>
+ </then>
+ </if>
+ <if>
+ <equals arg1="@{platform}" arg2="win32" />
+ <then>
+ <echo file="${working.dir}/repo.b3aggr" append="true"> <configurations operatingSystem="win32" windowSystem="win32"/>
+</echo>
+ </then>
+ </if>
+ <if>
+ <equals arg1="@{platform}" arg2="linux-gtk-x86_64" />
+ <then>
+ <echo file="${working.dir}/repo.b3aggr" append="true"> <configurations operatingSystem="linux" windowSystem="gtk" architecture="x86_64"/>
+</echo>
+ </then>
+ </if>
+ <if>
+ <equals arg1="@{platform}" arg2="macosx-carbon" />
+ <then>
+ <echo file="${working.dir}/repo.b3aggr" append="true"> <configurations operatingSystem="macosx" windowSystem="carbon" architecture="x86"/>
+</echo>
+ </then>
+ </if>
+ <if>
+ <equals arg1="@{platform}" arg2="macosx-cocoa" />
+ <then>
+ <echo file="${working.dir}/repo.b3aggr" append="true"> <configurations operatingSystem="macosx" windowSystem="cocoa" architecture="x86"/>
+</echo>
+ </then>
+ </if>
+ </sequential>
+ </for>
+
+ <!-- store an array of ${featureID}_${featureVersion} values against which to check when echoing to repo.b3aggr file -->
+ <var name="unique.installableUnits" value="" />
+
+ <echo file="${working.dir}/repo.b3aggr" append="true">
+ <contributions label="repos" contacts="//@contacts[email='nickboldt(a)gmail.com']"></echo>
+ <!-- counter variable; repoID.string stores a series of R; repoID stores the string length -->
+ <var name="repoID.string" value="" />
+ <var name="repoID" value="0" />
+ <for param="repo" list="${repos}" delimiter=",
+ ">
+ <sequential>
+ <!-- get list of features+plugins in the repo -->
+ <var name="repoFile" unset="true" />
+ <var name="repoFilename" unset="true" />
+ <propertyregex property="repoFile"
+ input="@{repo}"
+ defaultvalue="@{repo}"
+ override="true"
+ regexp="jar:file:(.+)!/"
+ replace="\1"
+ />
+ <propertyregex property="repoFilename"
+ input="${repoFile}"
+ defaultvalue="${repoFile}"
+ override="true"
+ regexp=".+/([^/]+.zip)"
+ replace="\1"
+ />
+ <echo file="${working.dir}/repo.b3aggr" append="true">
+ <repositories location="@{repo}">
+</echo>
+ <!-- collect features into custom categories, if defined. See aggregateRepos.properties for how to define these mappings -->
+ <if>
+ <and>
+ <isset property="${repoFilename}.features" />
+ <isset property="categories" />
+ </and>
+ <then>
+ <!-- eg., pi4soa-Update-N-SNAPSHOT.zip.features=org.pi4soa.sdk.feature,org.pi4soa.core.feature -->
+ <propertycopy from="${repoFilename}.features"
+ property="repo.features"
+ override="true"
+ silent="true"
+ />
+ <var name="featureID.num" value="0" />
+ <for param="repo.feature" list="${repo.features}" delimiter=", ">
+ <sequential>
+ <!-- find the category to which this feature must be assigned -->
+ <!-- eg., categories=JBossToolsSDK,JBossTools,jBPMTools -->
+ <for param="categoryID" list="${categories}" delimiter=", ">
+ <sequential>
+ <if>
+ <not>
+ <isset property="custom.category.features.@{categoryID}" />
+ </not>
+ <then>
+ <var name="custom.category.features.@{categoryID}" value="" />
+ </then>
+ </if>
+
+ <if>
+ <and>
+ <!-- eg., JBossToolsSDK.features=org.pi4soa.sdk.feature,org.jboss.tools.jbpm3.sdk.feature,org.jboss.tools.jbpm4.sdk.feature
+ JBossTools.features=org.pi4soa.core.feature,org.pi4soa.core.source.feature -->
+ <isset property="@{categoryID}.features" />
+ <contains string="${(a){categoryID}.features}"
+ substring="@{repo.feature}"
+ />
+ </and>
+ <then>
+ <antcallback target="getIndex" return="getIndex.return">
+ <param name="entry" value="@{repo.feature}" />
+ <param name="list" value="${repo.features}" />
+ </antcallback>
+ <var name="featureID.num" value="${getIndex.return}" />
+ <var name="getIndex.return" unset="true" />
+
+ <!-- eg., custom.category.label.JBossToolsSDK=JBoss Tools SDK - ${product.versionTag}
+ custom.category.description.JBossToolsSDK=JBoss Tools SDK helps JBoss and J2EE developers develop their applications quickly and painlessly. Contains runtimes and sources. -->
+ <antcallback target="addFeatureToCategories"
+ return="addFeatureToCategories.return, unique.installableUnits"
+ >
+ <param name="repoID" value="${repoID}" />
+ <param name="featureID.num" value="${featureID.num}" />
+ <param name="include"
+ value="features/(a){repo.feature}_*, **/features/(a){repo.feature}_*"
+ />
+ <param name="repoFile" value="${repoFile}" />
+ <param name="categories" value="${categories}" />
+ </antcallback>
+ <var name="custom.category.features.@{categoryID}"
+ value="${custom.category.features.(a){categoryID}}${addFeatureToCategories.return}"
+ />
+ </then>
+ </if>
+ </sequential>
+ </for>
+ </sequential>
+ </for>
+ </then>
+ </if>
+ <echo file="${working.dir}/repo.b3aggr" append="true"> </repositories>
+</echo>
+ <var name="repoID.string" value="${repoID.string}R" />
+ <var name="repoID" unset="true" />
+ <length property="repoID" string="${repoID.string}" />
+ <!-- <echo>repoID = ${repoID}, repoID.string = ${repoID.string}</echo> -->
+ </sequential>
+ </for>
+
+ <echo file="${working.dir}/repo.b3aggr" append="true"> </contributions>
+
+</echo>
+ <!-- create custom categories to collect the features -->
+ <for param="custom.category.id" list="${categories}" delimiter=",
+ ">
+ <sequential>
+ <!-- trim prefix " " -->
+ <propertyregex property="custom.category.features.(a){custom.category.id}"
+ defaultvalue="${custom.category.features.(a){custom.category.id}}"
+ input="${custom.category.features.(a){custom.category.id}}"
+ regexp=" (.+)"
+ replace="\1"
+ override="true"
+ />
+
+ <echo file="${working.dir}/repo.b3aggr" append="true"> <customCategories
+ identifier="@{custom.category.id}"
+ label="${custom.category.label.(a){custom.category.id}}"
+ description="${custom.category.description.(a){custom.category.id}}"
+ features="${custom.category.features.(a){custom.category.id}}" />
+</echo>
+ </sequential>
+ </for>
+
+ <if>
+ <and>
+ <isset property="associate.sites" />
+ <not>
+ <equals arg1="${associate.sites}" arg2="" />
+ </not>
+ </and>
+ <then>
+ <for param="associate.site" list="${associate.sites}" delimiter=",
+ ">
+ <sequential>
+ <echo file="${working.dir}/repo.b3aggr" append="true">
+ <validationRepositories location="@{associate.site}" />
+</echo>
+ </sequential>
+ </for>
+ </then>
+ </if>
+
+ <echo file="${working.dir}/repo.b3aggr" append="true"></aggregator:Aggregator>
+</echo>
+ </target>
+
+ <target name="addFeatureToCategories">
+ <var name="addFeatureToCategories.return" value="" />
+ <property name="repoID" value="9" />
+ <property name="include" value="features/org.pi4soa.core.feature_*, **/features/org.pi4soa.core.feature_*" />
+ <property name="repoFile" value="${working.dir}/pi4soa-Update-N-SNAPSHOT.zip" />
+ <property name="categories" value="SDKTools2,SOATools2,AllTools2" />
+ <propertyregex property="repoFilename"
+ input="${repoFile}"
+ defaultvalue="${repoFile}"
+ regexp=".+/([^/]+.zip)"
+ replace="\1"
+ casesensitive="false"
+ override="true"
+ />
+
+ <if>
+ <and>
+ <!-- haven't already unzipped this -->
+ <not>
+ <available file="${repoFile}_" type="dir" />
+ </not>
+ </and>
+ <then>
+ <if>
+ <available file="${repoFile}" type="file" />
+ <then>
+ <unzip src="${repoFile}" dest="${repoFile}_" />
+ </then>
+ <else>
+ <fail>Error!
+ Cannot find ${repoFile} to unpack!
+ </fail>
+ </else>
+ </if>
+ </then>
+ </if>
+
+ <property name="featureID.num" value="0" />
+ <for param="entry" delimiter=",
+ ">
+ <fileset dir="${repoFile}_" includes="${include}" />
+ <sequential>
+ <!-- get featureID and featureVersion -->
+ <var name="featureID" unset="true" />
+ <var name="featureVersion" unset="true" />
+ <propertyregex property="featureID"
+ input="@{entry}"
+ defaultvalue="@{entry}"
+ regexp=".+/([^/_]+)_.+"
+ replace="\1"
+ />
+ <propertyregex property="featureVersion"
+ input="@{entry}"
+ defaultvalue="@{entry}"
+ regexp=".+/${featureID}_(.+).jar"
+ replace="\1"
+ />
+
+ <!-- for a given featureID, check each of the available ${categories}; for each @{category}, check if featureID in list of ${(a){category}.features} -->
+ <var name="featureID.categories" value="" />
+ <for param="category" list="${categories}" delimiter=", ">
+ <sequential>
+ <if>
+ <isset property="@{category}.features" />
+ <then>
+ <for param="featureID" list="${(a){category}.features}" delimiter=",
+">
+ <sequential>
+ <if>
+ <equals arg1="${featureID}" arg2="@{featureID}" />
+ <then>
+ <!-- given: SDKTools2,SOATools2,AllTools2
+ return:
+ //@customCategories[identifier='${category1}'] //@customCategories[identifier='${category2}'] //@customCategories[identifier='${categoryID3}']
+ eg.,
+ //@customCategories[identifier='SDKTools2'] //@customCategories[identifier='SOATools2'] //@customCategories[identifier='AllTools2'] -->
+ <var name="featureID.categories"
+ value="${featureID.categories} //@customCategories[identifier='@{category}']"
+ />
+ </then>
+ </if>
+ </sequential>
+ </for>
+ </then>
+ </if>
+ </sequential>
+ </for>
+ <!-- trim prefix " " -->
+ <propertyregex property="featureID.categories"
+ defaultvalue="${featureID.categories}"
+ input="${featureID.categories}"
+ regexp=" (.+)"
+ replace="\1"
+ override="true"
+ />
+
+ <var name="isNewInstallableUnit" value="true" />
+ <for param="installableUnit" list="${unique.installableUnits}" delimiter=", ">
+ <sequential>
+ <if>
+ <equals arg1="@{installableUnit}" arg2="${featureID}_${featureVersion}" />
+ <then>
+ <var name="isNewInstallableUnit" value="false" />
+ </then>
+ </if>
+ </sequential>
+ </for>
+ <if>
+ <!-- cannot echo the same <features> twice - must be ; store ${featureID}_${featureVersion} in an array and check if in array before echoing again -->
+ <istrue value="${isNewInstallableUnit}" />
+ <then>
+ <var name="unique.installableUnits"
+ value="${unique.installableUnits}, ${featureID}_${featureVersion}"
+ />
+ <echo file="${working.dir}/repo.b3aggr" append="true"> <features categories="${featureID.categories}" name="${featureID}.feature.group" versionRange="${featureVersion}" />
+</echo>
+ <echo level="info">${featureID}_${featureVersion}: add @repositories.${repoID}/(a)features.${featureID.num} to ${featureID.categories}</echo>
+ </then>
+ <else>
+ <echo level="info">${featureID}_${featureVersion} already added.</echo>
+ </else>
+ </if>
+ <var name="addFeatureToCategories.return"
+ value="${addFeatureToCategories.return} //@contributions[label='repos']/@repositories.${repoID}/(a)features.${featureID.num}"
+ />
+
+ </sequential>
+ </for>
+ <var name="featureID.categories" unset="true" />
+ <var name="isNewInstallableUnit" unset="true" />
+ </target>
+
+ <target name="run.build.file">
+ <chmod perm="+x" file="${eclipse.home}/eclipse" />
+ <exec executable="${eclipse.home}/eclipse"
+ failonerror="true"
+ dir="${eclipse.home}"
+ timeout="900000"
+ taskname="b3aggr"
+ >
+ <arg line=" -vm ${java.home}/bin/java" />
+ <arg line=" -application org.eclipse.b3.cli.headless" />
+ <arg line=" -nosplash --launcher.suppressErrors -consoleLog aggregate" />
+ <arg line=" --buildModel ${working.dir}/repo.b3aggr --action BUILD" />
+ <!-- To verify w/o actually doing the aggregation, use - -action VERIFY -->
+ </exec>
+ </target>
+
+ <!-- until https://bugs.eclipse.org/bugs/show_bug.cgi?id=303244 is fixed, do it manually -->
+ <target name="add.associate.sites">
+ <if>
+ <and>
+ <isset property="associate.sites" />
+ <not>
+ <equals arg1="${associate.sites}" arg2="" />
+ </not>
+ </and>
+ <then>
+ <if>
+ <available file="${working.dir}/output/final/content.jar" type="file" />
+ <then>
+ <unzip src="${working.dir}/output/final/content.jar" dest="${working.dir}/output/final" />
+ <delete file="${working.dir}/output/final/content.jar" />
+ </then>
+ </if>
+ <!-- counter variable -->
+ <var name="associate.sites.0" value="" />
+ <for param="associate.site" list="${associate.sites}" delimiter=",
+ ">
+ <sequential>
+ <var name="associate.sites.0" value="${associate.sites.0}00" />
+ </sequential>
+ </for>
+ <length property="associate.sites.length" string="${associate.sites.0}" />
+
+ <loadfile srcfile="${working.dir}/output/final/content.xml" property="content.xml">
+ <filterchain>
+ <tailfilter lines="-1" skip="1" />
+ </filterchain>
+ </loadfile>
+ <echo file="${working.dir}/output/final/content.xml" message="${content.xml}" />
+ <echo file="${working.dir}/output/final/content.xml" append="true"> <references size='${associate.sites.length}'>
+</echo>
+ <for param="associate.site" list="${associate.sites}" delimiter=",
+ ">
+ <sequential>
+ <!-- insert into content.xml -->
+ <echo file="${working.dir}/output/final/content.xml" append="true"> <repository uri='@{associate.site}' url='@{associate.site}' type='0' options='1'/>
+ <repository uri='@{associate.site}' url='@{associate.site}' type='1' options='1'/>
+</echo>
+ </sequential>
+ </for>
+ <echo file="${working.dir}/output/final/content.xml" append="true"> </references>
+</repository>
+</echo>
+ <zip destfile="${working.dir}/output/final/content.jar" basedir="${working.dir}/output/final" includes="content.xml"/>
+ <delete file="${working.dir}/output/final/content.xml" />
+ </then>
+ </if>
+ </target>
+
+ <!-- zip up the generated repo -->
+ <target name="zip.repo">
+ <zip destfile="${working.dir}/repo-from-packed-plugins.zip"
+ basedir="${working.dir}/output/final"
+ update="false"
+ />
+ </target>
+
+ <target name="cleanup">
+ <delete quiet="true" dir="${working.dir}/output" includeemptydirs="true" />
+ <!-- <delete quiet="true" file="${working.dir}/repo.b3aggr" /> -->
+ <for param="theZip" list="${repos}" delimiter=",
+ ">
+ <sequential>
+ <var name="zipFile" unset="true" />
+ <propertyregex property="zipFile"
+ input="@{theZip}"
+ defaultvalue="@{theZip}"
+ regexp=".+/([^/]+.zip).*"
+ replace="\1"
+ casesensitive="false"
+ override="true"
+ />
+ <if>
+ <available file="${working.dir}/${zipFile}_" type="dir" />
+ <then>
+ <delete dir="${working.dir}/${zipFile}_" quiet="true" includeemptydirs="true" />
+ </then>
+ </if>
+ </sequential>
+ </for>
+ </target>
+
+ <target name="getIndex">
+ <property name="getIndex.string" value="" />
+ <var name="getIndex.return" value="0" />
+ <property name="entry" value="" />
+ <property name="list" value="" />
+ <for param="this.entry" list="${list}" delimiter=", ">
+ <sequential>
+ <if>
+ <not>
+ <equals arg1="@{this.entry}" arg2="${entry}" />
+ </not>
+ <then>
+ <var name="getIndex.string" value="${getIndex.string}L" />
+ </then>
+ <else>
+ <var name="getIndex.return" unset="true" />
+ <length property="getIndex.return" string="${getIndex.string}" />
+ </else>
+ </if>
+
+ </sequential>
+ </for>
+ <!-- <echo> getIndex = ${getIndex.return} for ${entry} in ${list}</echo> -->
+ </target>
+
+</project>
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r22730 - in trunk/build: product and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-10 14:35:56 -0400 (Thu, 10 Jun 2010)
New Revision: 22730
Added:
trunk/build/product/
trunk/build/product/jbds4.product
trunk/build/product/pom.xml
Log:
add .product file and pom to build it with TODO marker
Copied: trunk/build/product/jbds4.product (from rev 22335, trunk/build/jbds.product)
===================================================================
--- trunk/build/product/jbds4.product (rev 0)
+++ trunk/build/product/jbds4.product 2010-06-10 18:35:56 UTC (rev 22730)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="JBoss Developer Studio" uid="com.jboss.developer.studio" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+
+ <configIni use="default">
+ </configIni>
+
+ <launcherArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+ </launcherArgs>
+
+ <windowImages/>
+
+ <launcher name="jbds">
+ <solaris/>
+ <win useIco="false">
+ <bmp/>
+ </win>
+ </launcher>
+
+ <vm>
+ <linux>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</linux>
+ <macos>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</macos>
+ <solaris>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</solaris>
+ <windows>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows>
+ </vm>
+
+ <plugins>
+ </plugins>
+
+ <features>
+ <feature id="org.jboss.tools.xulrunner.feature" version="1.9.1.2_v201003050540R"/>
+ <feature id="org.eclipse.rcp" version="3.6.0.v20100201-9GAcFGCFq7Lo_y4ElaEbOXNc"/>
+ <feature id="org.eclipse.pde" version="3.6.0.v20090930-7b7kFHlFEx2XkxZQja7HFJ3"/>
+ <feature id="org.eclipse.jdt" version="3.6.0.v20100308-1800-7z8XFRBFMTdeDrqFpIInkeg45027"/>
+ </features>
+
+
+</product>
Added: trunk/build/product/pom.xml
===================================================================
--- trunk/build/product/pom.xml (rev 0)
+++ trunk/build/product/pom.xml 2010-06-10 18:35:56 UTC (rev 22730)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <!--
+ First, build the JBT plugins:
+ cd ~/trunk; mvn clean install
+ or
+ cd ~/trunk; ant
+
+ Next, run this to create RCP product from available plugins + .product definition file
+ TODO: verify this works
+ cd ~/trunk/build/product; mvn clean package
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <relativePath>../parent-pom.xml</relativePath>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.product.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>JBoss Tools Product</name>
+ <packaging>eclipse-plugin</packaging>
+ <build>
+ <finalName>${project.artifactId}_${project.version}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-packaging-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <id>product-export</id>
+ <goals>
+ <goal>product-export</goal>
+ </goals>
+ <configuration>
+ <productConfigurationFile>jbds4.product
+ </productConfigurationFile>
+ <environments>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>carbon</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Property changes on: trunk/build/product/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r22729 - in trunk/build: target-platform and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-10 14:34:25 -0400 (Thu, 10 Jun 2010)
New Revision: 22729
Added:
trunk/build/target-platform/
trunk/build/target-platform/.project
trunk/build/target-platform/e36-wtp32.target
trunk/build/target-platform/m2e-e36.target
trunk/build/target-platform/pom.xml
Log:
https://jira.jboss.org/browse/JBDS-1247 add target platform definition
Added: trunk/build/target-platform/.project
===================================================================
--- trunk/build/target-platform/.project (rev 0)
+++ trunk/build/target-platform/.project 2010-06-10 18:34:25 UTC (rev 22729)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+<name>target-platform</name>
+<comment></comment>
+<projects>
+</projects>
+<buildSpec>
+<buildCommand>
+<name>org.maven.ide.eclipse.maven2Builder</name>
+<arguments>
+</arguments>
+</buildCommand>
+</buildSpec>
+<natures>
+<nature>org.maven.ide.eclipse.maven2Nature</nature>
+</natures>
+</projectDescription>
Property changes on: trunk/build/target-platform/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/build/target-platform/e36-wtp32.target
===================================================================
--- trunk/build/target-platform/e36-wtp32.target (rev 0)
+++ trunk/build/target-platform/e36-wtp32.target 2010-06-10 18:34:25 UTC (rev 22729)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.6"?>
+
+<target name="e36-wtp32">
+<locations>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="3.6.0.I20100520-1744"/>
+<unit id="org.eclipse.platform.sdk" version="3.6.0.I20100520-1744"/>
+<unit id="org.eclipse.sdk.ide" version="3.6.0.I20100520-1744"/>
+<unit id="org.eclipse.releng.tools.feature.group" version="3.3.0.v20100427-44A77w31211614"/>
+<unit id="org.eclipse.swt.tools" version="3.6.0.v3611d"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.6milestones/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.0.v20100525-2205-35-7w3121163603316"/>
+<repository location="http://download.eclipse.org/birt/update-site/2.6-interim/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.6.0.v20100517-1331"/>
+<unit id="org.eclipse.gef.sdk.feature.group" version="3.6.0.v20100429-2050-7G7R-A5WNaPQIcSWKMfdROUWaQLI"/>
+<unit id="org.eclipse.zest.sdk.feature.group" version="1.2.0.v20100429-2050-679-8COKLDAJPWQNSXWPTedQT8YP"/>
+<unit id="org.eclipse.xsd.sdk.feature.group" version="2.6.0.v20100503-1402"/>
+<unit id="org.eclipse.tptp.monitoring.runtime.feature.group" version="4.5.0.v201005032111-7T7X-7r2VNos_vYhrZgcqiTMM"/>
+<unit id="org.eclipse.tptp.platform.runtime.feature.group" version="4.7.0.v201005032111-7u84-8ksiMskubQ6UTA7XS3tcLX0"/>
+<unit id="org.eclipse.tptp.wtp.feature.group" version="4.5.0.v201005032111-54-78I8G0BlG8C88S8WCW88"/>
+<unit id="org.eclipse.tptp.birt.feature.group" version="4.5.0.v201005032111-53-78A8A09t84644E4G6G44"/>
+<unit id="org.eclipse.tptp.test.runtime.feature.group" version="4.5.0.v201005032111-7H7I-7VrO5DXI-B6opYKPuD-96gb"/>
+<unit id="org.eclipse.tptp.trace.runtime.feature.group" version="4.4.0.v201005032111-7H7C-7XbL_J3E9NJOSVeYeWM94"/>
+<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.0.v201004210628-208Z7w31211419"/>
+<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.0.v201004210628-51EoAkF77g8HBSc"/>
+<repository location="http://download.eclipse.org/releases/helios"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.maven.ide.eclipse.sdk.feature.feature.group" version="0.10.0.20100209-0800"/>
+<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.10.0.20100209-0800"/>
+<unit id="org.maven.ide.eclipse.subclipse.feature.feature.group" version="0.10.0.20100209-0800"/>
+<unit id="org.maven.ide.eclipse.cvs.feature.feature.group" version="0.10.0.20100209-0800"/>
+<unit id="org.maven.ide.eclipse.scm.feature.feature.group" version="0.10.0.20100209-0800"/>
+<unit id="org.maven.ide.eclipse.temporary.mojos.feature.feature.group" version="0.10.0.20100209-0800"/>
+<repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.maven.ide.eclipse.feature.feature.group" version="0.10.0.20100209-0800"/>
+<repository location="http://m2eclipse.sonatype.org/sites/m2e"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.tmatesoft.svnkit.feature.group" version="1.3.3.6648"/>
+<unit id="com.sun.jna.feature.group" version="3.2.3"/>
+<repository location="http://eclipse.svnkit.com/1.3.x/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.polarion.eclipse.team.svn.connector.svnkit15.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.javahl15.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.javahl15.win32.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.svnkit16.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.javahl16.win32.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.javahl.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.javahl16.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.javahl.win32.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.svnkit.feature.group" version="2.2.2.I20100512-1900"/>
+<unit id="org.polarion.eclipse.team.svn.connector.source.feature.group" version="2.2.2.I20100512-1900"/>
+<repository location="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..."/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.team.svn.mylyn.feature.group" version="0.7.9.I20100512-1900"/>
+<unit id="org.eclipse.team.svn.source.feature.group" version="0.7.9.I20100512-1900"/>
+<unit id="org.eclipse.team.svn.feature.group" version="0.7.9.I20100512-1900"/>
+<unit id="org.eclipse.team.svn.resource.ignore.rules.jdt.feature.group" version="0.7.9.I20100512-1900"/>
+<unit id="org.eclipse.team.svn.revision.graph.feature.group" version="0.7.9.I20100512-1900"/>
+<unit id="org.eclipse.team.svn.nl1.feature.group" version="0.7.9.I20100512-1900"/>
+<repository location="http://download.eclipse.org/technology/subversive/0.7/update-site/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.ecf.core.source.feature.group" version="3.2.0.v20100219-1253"/>
+<unit id="org.eclipse.ecf.core.featurepatch.source.feature.group" version="3.2.0.v20100219-1253"/>
+<unit id="org.eclipse.ecf.core.feature.group" version="3.2.0.v20100219-1253"/>
+<unit id="org.eclipse.ecf.core.featurepatch.feature.group" version="3.2.0.v20100219-1253"/>
+<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.feature.group" version="2.0.0.568-dev-e36"/>
+<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
+</location>
+</locations>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+</target>
Added: trunk/build/target-platform/m2e-e36.target
===================================================================
--- trunk/build/target-platform/m2e-e36.target (rev 0)
+++ trunk/build/target-platform/m2e-e36.target 2010-06-10 18:34:25 UTC (rev 22729)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.6"?>
+
+<target name="m2e-e36">
+<locations>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.sdk.ide" version="3.6.0.I20100527-1700"/>
+<unit id="org.eclipse.emf.common.feature.group" version="2.6.0.v20100527-1920"/>
+<unit id="org.eclipse.wst.common.emf" version="1.2.0.v201005200700"/>
+<unit id="org.eclipse.wst.sse.core" version="1.1.500.v201005261534"/>
+<unit id="org.eclipse.wst.xml.core" version="1.1.500.v201005271618"/>
+<unit id="org.eclipse.zest.sdk.feature.group" version="1.2.0.v20100519-2050-679-8COKLDAKOXIET_YWTacZM9XR"/>
+<unit id="org.eclipse.wst.sse.ui" version="1.2.0.v201005130131"/>
+<unit id="org.eclipse.emf.ecore.edit.feature.group" version="2.6.0.v20100527-1920"/>
+<unit id="org.eclipse.emf.edit.ui.feature.group" version="2.6.0.v20100527-1920"/>
+<unit id="org.eclipse.wst.xsd.core" version="1.1.501.v201004110600"/>
+<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.0.v201005241510-7O7CFb3EMf84nOyJKuT05LU72RId"/>
+<repository location="http://download.eclipse.org/releases/helios"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.test.junit3.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.0.568-dev-e36"/>
+<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
+</location>
+</locations>
+</target>
Added: trunk/build/target-platform/pom.xml
===================================================================
--- trunk/build/target-platform/pom.xml (rev 0)
+++ trunk/build/target-platform/pom.xml 2010-06-10 18:34:25 UTC (rev 22729)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <relativePath>parent-pom.xml</relativePath>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools</groupId>
+
+ <artifactId>target-platform</artifactId>
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <!-- add more artifacts if want more target platforms -->
+ <artifact>
+ <file>e36-wtp32.target</file>
+ <type>target</type>
+ <classifier>e36-wtp32</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
Property changes on: trunk/build/target-platform/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r22727 - in trunk/hibernatetools: plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-06-10 12:11:40 -0400 (Thu, 10 Jun 2010)
New Revision: 22727
Added:
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/Employee.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/EmployeeStatus.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/SalaryRate.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Employee.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/EmployeeStatus.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/SalaryRate.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Employee.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/EmployeeStatus.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/SalaryRate.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Employee.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/EmployeeStatus.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/SalaryRate.java
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/JPAConst.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/RefType.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapMockTests.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6058 - fixed
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2010-06-10 15:48:17 UTC (rev 22726)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2010-06-10 16:11:40 UTC (rev 22727)
@@ -609,6 +609,7 @@
boolean isOne2Many = false;
boolean isMany2One = false;
boolean isMany2Many = false;
+ boolean isEnumerated = false;
for ( ; referencesIt.hasNext(); ) {
Map.Entry<String, RefEntityInfo> entry2 = referencesIt.next();
RefEntityInfo refEntityInfo = entry2.getValue();
@@ -625,6 +626,9 @@
else if (refEntityInfo.refType == RefType.MANY2MANY && !refEntityInfo.resolvedAnnotationName) {
isMany2Many = true;
}
+ else if (refEntityInfo.refType == RefType.ENUMERATED && !refEntityInfo.resolvedAnnotationName) {
+ isEnumerated = true;
+ }
}
}
if (isOne2One) {
@@ -639,6 +643,9 @@
if (isMany2Many) {
entryInfo.addRequiredImport(JPAConst.IMPORT_MANY2MANY);
}
+ if (isEnumerated) {
+ entryInfo.addRequiredImport(JPAConst.IMPORT_ENUMERATED);
+ }
}
// re-generate RefFieldInfoMap (for simple process)
it = mapCUs_Info.entrySet().iterator();
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2010-06-10 15:48:17 UTC (rev 22726)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2010-06-10 16:11:40 UTC (rev 22727)
@@ -173,6 +173,10 @@
updateAnnotationRelInfo(node, mappedBy, fullyQualifiedName,
RefType.MANY2MANY, JPAConst.ANNOTATION_MANY2MANY, JPAConst.IMPORT_MANY2MANY);
}
+ else if (JPAConst.isAnnotationEnumerated(fullyQualifiedName)) {
+ updateAnnotationRelInfo(node, mappedBy, fullyQualifiedName,
+ RefType.ENUMERATED, JPAConst.ANNOTATION_ENUMERATED, JPAConst.IMPORT_ENUMERATED);
+ }
else if (JPAConst.isAnnotationMappedSuperclass(fullyQualifiedName)) {
ITypeBinding tb = node.resolveTypeBinding();
CompilationUnit cu = getCUFromTypeDeclaration(node);
@@ -477,10 +481,11 @@
SourceType sourceT = (SourceType)tb.getJavaElement();
entityFullyQualifiedName = sourceT.getFullyQualifiedName();
entityInfo.addDependency(entityFullyQualifiedName);
+ RefType refType2Use = tb.isEnum() ? RefType.ENUMERATED : RefType.MANY2ONE;
Iterator<String> itVarNames = list.iterator();
while (itVarNames.hasNext()) {
String name = itVarNames.next();
- entityInfo.addReference(name, entityFullyQualifiedName, RefType.MANY2ONE);
+ entityInfo.addReference(name, entityFullyQualifiedName, refType2Use);
}
}
else if (tb.getJavaElement() instanceof BinaryType) {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/JPAConst.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/JPAConst.java 2010-06-10 15:48:17 UTC (rev 22726)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/JPAConst.java 2010-06-10 16:11:40 UTC (rev 22727)
@@ -19,6 +19,7 @@
public static final String IMPORT_ONE2MANY = "javax.persistence.OneToMany"; //$NON-NLS-1$
public static final String IMPORT_MANY2ONE = "javax.persistence.ManyToOne"; //$NON-NLS-1$
public static final String IMPORT_MANY2MANY = "javax.persistence.ManyToMany"; //$NON-NLS-1$
+ public static final String IMPORT_ENUMERATED = "javax.persistence.Enumerated"; //$NON-NLS-1$
public static final String IMPORT_MAPPEDSUPERCLASS = "javax.persistence.MappedSuperclass"; //$NON-NLS-1$
public static final String IMPORT_VERSION = "javax.persistence.Version"; //$NON-NLS-1$
public static final String IMPORT_COLUMN = "javax.persistence.Column"; //$NON-NLS-1$
@@ -32,6 +33,7 @@
public static final String ANNOTATION_ONE2MANY = "OneToMany"; //$NON-NLS-1$
public static final String ANNOTATION_MANY2ONE = "ManyToOne"; //$NON-NLS-1$
public static final String ANNOTATION_MANY2MANY = "ManyToMany"; //$NON-NLS-1$
+ public static final String ANNOTATION_ENUMERATED = "Enumerated"; //$NON-NLS-1$
public static final String ANNOTATION_MAPPEDSUPERCLASS = "MappedSuperclass"; //$NON-NLS-1$
public static final String ANNOTATION_VERSION = "Version"; //$NON-NLS-1$
public static final String ANNOTATION_COLUMN = "Column"; //$NON-NLS-1$
@@ -48,6 +50,7 @@
ALL_IMPORTS.add(IMPORT_ONE2MANY);
ALL_IMPORTS.add(IMPORT_MANY2ONE);
ALL_IMPORTS.add(IMPORT_MANY2MANY);
+ ALL_IMPORTS.add(IMPORT_ENUMERATED);
ALL_IMPORTS.add(IMPORT_MAPPEDSUPERCLASS);
ALL_IMPORTS.add(IMPORT_VERSION);
ALL_IMPORTS.add(IMPORT_COLUMN);
@@ -66,6 +69,9 @@
else if (refType == RefType.MANY2MANY) {
return ANNOTATION_MANY2MANY;
}
+ else if (refType == RefType.ENUMERATED) {
+ return ANNOTATION_ENUMERATED;
+ }
return ""; //$NON-NLS-1$
}
@@ -125,6 +131,14 @@
return false;
}
+ static public boolean isAnnotationEnumerated(String fullyQualifiedName) {
+ if (ANNOTATION_ENUMERATED.compareTo(fullyQualifiedName) == 0 ||
+ IMPORT_ENUMERATED.compareTo(fullyQualifiedName) == 0) {
+ return true;
+ }
+ return false;
+ }
+
static public boolean isAnnotationMappedSuperclass(String fullyQualifiedName) {
if (ANNOTATION_MAPPEDSUPERCLASS.compareTo(fullyQualifiedName) == 0 ||
IMPORT_MAPPEDSUPERCLASS.compareTo(fullyQualifiedName) == 0) {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/RefType.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/RefType.java 2010-06-10 15:48:17 UTC (rev 22726)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/RefType.java 2010-06-10 16:11:40 UTC (rev 22727)
@@ -21,4 +21,5 @@
ONE2MANY,
MANY2ONE,
MANY2MANY,
+ ENUMERATED,
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java 2010-06-10 15:48:17 UTC (rev 22726)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java 2010-06-10 16:11:40 UTC (rev 22727)
@@ -447,7 +447,8 @@
addComplexNormalAnnotation(node, JPAConst.getRefType(refType), rei);
}
}
- else if (refType == RefType.MANY2ONE || rei.mappedBy == null || rei.mappedBy == "") { //$NON-NLS-1$
+ else if (refType == RefType.MANY2ONE || refType == RefType.ENUMERATED ||
+ rei.mappedBy == null || rei.mappedBy == "") { //$NON-NLS-1$
addSimpleMarkerAnnotation(node, JPAConst.getRefType(refType));
}
else {
@@ -578,7 +579,8 @@
addComplexNormalAnnotation(node, JPAConst.getRefType(refType), rei);
}
}
- else if (refType == RefType.MANY2ONE || rei.mappedBy == null || rei.mappedBy == "") { //$NON-NLS-1$
+ else if (refType == RefType.MANY2ONE || refType == RefType.ENUMERATED ||
+ rei.mappedBy == null || rei.mappedBy == "") { //$NON-NLS-1$
addSimpleMarkerAnnotation(node, JPAConst.getRefType(refType));
}
else {
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/Employee.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/Employee.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/Employee.java 2010-06-10 16:11:40 UTC (rev 22727)
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package test.annotated.fields;
+
+import javax.persistence.Entity;
+import javax.persistence.Version;
+
+@Entity
+public class Employee {
+
+ protected EmployeeStatus employeeStatus = EmployeeStatus.CONTRACT;
+ protected SalaryRate salaryRate = SalaryRate.EXECUTIVE;
+
+ public EmployeeStatus getStatus() {
+ return employeeStatus;
+ }
+
+ public SalaryRate getPayScale() {
+ return salaryRate;
+ }
+
+ protected Integer version;
+
+ @Version
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+}
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/EmployeeStatus.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/EmployeeStatus.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/EmployeeStatus.java 2010-06-10 16:11:40 UTC (rev 22727)
@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package test.annotated.fields;
+
+public enum EmployeeStatus {FULL_TIME, PART_TIME, CONTRACT}
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/SalaryRate.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/SalaryRate.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/SalaryRate.java 2010-06-10 16:11:40 UTC (rev 22727)
@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package test.annotated.fields;
+
+public enum SalaryRate {JUNIOR, SENIOR, MANAGER, EXECUTIVE}
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Employee.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Employee.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/Employee.java 2010-06-10 16:11:40 UTC (rev 22727)
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package test.annotated.getters;
+
+import javax.persistence.Entity;
+import javax.persistence.Version;
+
+@Entity
+public class Employee {
+
+ protected EmployeeStatus employeeStatus = EmployeeStatus.CONTRACT;
+ protected SalaryRate salaryRate = SalaryRate.EXECUTIVE;
+
+ public EmployeeStatus getStatus() {
+ return employeeStatus;
+ }
+
+ public SalaryRate getPayScale() {
+ return salaryRate;
+ }
+
+ protected Integer version;
+
+ @Version
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+}
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/EmployeeStatus.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/EmployeeStatus.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/EmployeeStatus.java 2010-06-10 16:11:40 UTC (rev 22727)
@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package test.annotated.getters;
+
+public enum EmployeeStatus {FULL_TIME, PART_TIME, CONTRACT}
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/SalaryRate.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/SalaryRate.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/SalaryRate.java 2010-06-10 16:11:40 UTC (rev 22727)
@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package test.annotated.getters;
+
+public enum SalaryRate {JUNIOR, SENIOR, MANAGER, EXECUTIVE}
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Employee.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Employee.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Employee.java 2010-06-10 16:11:40 UTC (rev 22727)
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package test.annotated.fields;
+
+import javax.persistence.Entity;
+import javax.persistence.Enumerated;
+import javax.persistence.Version;
+
+@Entity
+public class Employee {
+
+ @Enumerated
+ protected EmployeeStatus employeeStatus = EmployeeStatus.CONTRACT;
+ @Enumerated
+ protected SalaryRate salaryRate = SalaryRate.EXECUTIVE;
+
+ public EmployeeStatus getStatus() {
+ return employeeStatus;
+ }
+
+ public SalaryRate getPayScale() {
+ return salaryRate;
+ }
+
+ protected Integer version;
+
+ @Version
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+}
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/EmployeeStatus.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/EmployeeStatus.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/EmployeeStatus.java 2010-06-10 16:11:40 UTC (rev 22727)
@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package test.annotated.fields;
+
+public enum EmployeeStatus {FULL_TIME, PART_TIME, CONTRACT}
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/SalaryRate.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/SalaryRate.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/SalaryRate.java 2010-06-10 16:11:40 UTC (rev 22727)
@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package test.annotated.fields;
+
+public enum SalaryRate {JUNIOR, SENIOR, MANAGER, EXECUTIVE}
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Employee.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Employee.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Employee.java 2010-06-10 16:11:40 UTC (rev 22727)
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package test.annotated.getters;
+
+import javax.persistence.Entity;
+import javax.persistence.Enumerated;
+import javax.persistence.Version;
+
+@Entity
+public class Employee {
+
+ protected EmployeeStatus employeeStatus = EmployeeStatus.CONTRACT;
+ protected SalaryRate salaryRate = SalaryRate.EXECUTIVE;
+
+ @Enumerated
+ public EmployeeStatus getStatus() {
+ return employeeStatus;
+ }
+
+ @Enumerated
+ public SalaryRate getPayScale() {
+ return salaryRate;
+ }
+
+ protected Integer version;
+
+ @Version
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+}
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/EmployeeStatus.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/EmployeeStatus.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/EmployeeStatus.java 2010-06-10 16:11:40 UTC (rev 22727)
@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package test.annotated.getters;
+
+public enum EmployeeStatus {FULL_TIME, PART_TIME, CONTRACT}
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/SalaryRate.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/SalaryRate.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/SalaryRate.java 2010-06-10 16:11:40 UTC (rev 22727)
@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package test.annotated.getters;
+
+public enum SalaryRate {JUNIOR, SENIOR, MANAGER, EXECUTIVE}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapMockTests.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapMockTests.java 2010-06-10 15:48:17 UTC (rev 22726)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapMockTests.java 2010-06-10 16:11:40 UTC (rev 22727)
@@ -37,7 +37,6 @@
*
* @author Vitali Yemialyanchyk
*/
-@SuppressWarnings("restriction")
public class JPAMapMockTests extends TestCase {
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java 2010-06-10 15:48:17 UTC (rev 22726)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java 2010-06-10 16:11:40 UTC (rev 22727)
@@ -46,7 +46,6 @@
*
* @author Vitali Yemialyanchyk
*/
-@SuppressWarnings("restriction")
public class JPAMapTest extends TestCase {
public static final String PROJECT_NAME = "TestProject"; //$NON-NLS-1$
@@ -111,6 +110,8 @@
"test.annotated." + testSelection + ".FotoXPerson"); //$NON-NLS-1$ //$NON-NLS-2$
ICompilationUnit icu4 = Utils.findCompilationUnit(javaProject,
"test.annotated." + testSelection + ".ZTypesComplex"); //$NON-NLS-1$ //$NON-NLS-2$
+ ICompilationUnit icu5 = Utils.findCompilationUnit(javaProject,
+ "test.annotated." + testSelection + ".Employee"); //$NON-NLS-1$ //$NON-NLS-2$
try {
icu4.becomeWorkingCopy(null);
} catch (JavaModelException e) {
@@ -129,11 +130,13 @@
assertNotNull(icu2);
assertNotNull(icu3);
assertNotNull(icu4);
+ assertNotNull(icu5);
collector.initCollector();
collector.collect(icu, Integer.MAX_VALUE);
collector.collect(icu2, Integer.MAX_VALUE);
collector.collect(icu3, Integer.MAX_VALUE);
collector.collect(icu4, Integer.MAX_VALUE);
+ collector.collect(icu5, Integer.MAX_VALUE);
if (icu44 != null) {
collector.collect(icu44, Integer.MAX_VALUE);
}
@@ -152,6 +155,7 @@
checkItem("Country"); //$NON-NLS-1$
checkItem("Visa"); //$NON-NLS-1$
checkItem("ZTypesComplex"); //$NON-NLS-1$
+ checkItem("Employee"); //$NON-NLS-1$
if (icu44 != null) {
checkItem("Entity"); //$NON-NLS-1$
}
14 years, 7 months
- 1
- 0