JBoss Tools SVN: r26386 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-11-09 12:02:29 -0500 (Tue, 09 Nov 2010)
New Revision: 26386
Modified:
trunk/build/target-platform/publish.sh
Log:
add overrides for targetFile, repoPath, destinationPath, and DESTINATION; set defaults for JBDS and JBT
Modified: trunk/build/target-platform/publish.sh
===================================================================
--- trunk/build/target-platform/publish.sh 2010-11-09 17:02:20 UTC (rev 26385)
+++ trunk/build/target-platform/publish.sh 2010-11-09 17:02:29 UTC (rev 26386)
@@ -1,12 +1,28 @@
#!/bin/bash
# Hudson creates a repo in ${repoPath}; copy it into other places for access by downstream jobs and users
+# defaults for JBoss Tools
targetFile=e361-wtp322.target
-
repoPath=/home/hudson/static_build_env/jbds/tools/sources/REPO
destinationPath=/home/hudson/static_build_env/jbds/target-platform
DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform
+while [ "$#" -gt 0 ]; do
+ case $1 in
+ '-targetFile') targetFile="$2"; shift 2;;
+ '-repoPath') repoPath="$2"; shift 2;;
+ '-destinationPath') destinationPath="$2"; shift 2;;
+ '-DESTINATION') DESTINATION="$2"; shift 2;;
+ '-jbds')
+ # defaults for JBDS
+ targetFile=jbds400-e361-wtp322.target
+ repoPath=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO
+ destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform
+ DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform
+ ;;
+ esac
+done
+
if [[ -d ${repoPath} ]]; then
cd ${repoPath}
15 years, 5 months
JBoss Tools SVN: r26385 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-11-09 12:02:20 -0500 (Tue, 09 Nov 2010)
New Revision: 26385
Added:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
Log:
add new jbds.target* files
Added: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target (rev 0)
+++ trunk/build/target-platform/jbds.target 2010-11-09 17:02:20 UTC (rev 26385)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?><?pde version="3.6"?>
+<target includeMode="feature" name="jbds">
+<locations>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <!-- CVS -->
+ <unit version="1.2.0.v20100427-7B77FKt90GE5h0SBT5FV9A01911" id="org.eclipse.cvs.feature.group"/>
+
+ <!-- DTP -->
+ <unit version="" id="org.eclipse.datatools.enablement.sdk.feature.feature.group"/>
+ <unit version="" id="org.eclipse.datatools.sdk.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-77078CcNBGKBZI_FcRd" id="org.eclipse.datatools.modelbase.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-7C7b8hEt1ZvtiLkdlO7BVoL_wm6" id="org.eclipse.datatools.connectivity.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-7H7C7ACcNBHBBkHeGSMd" id="org.eclipse.datatools.connectivity.oda.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-4107w3121151A1A53" id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-7B7C79CcNBGKBgIZCSNS" id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-7J8x7FBWwUL6z-2z-fcrYC2s55KI" id="org.eclipse.datatools.enablement.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-77778eBmKDNOMgJvJ8Of7QBR" id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-67C1AqGBJVKbHlH1GU7QBR" id="org.eclipse.datatools.enablement.hsqldb.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-7F47SFC7sRbrSZope9vW" id="org.eclipse.datatools.enablement.ibm.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-4-29oB56N5N7L6PAQ" id="org.eclipse.datatools.enablement.jdbc.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-2-07w31211518181A" id="org.eclipse.datatools.enablement.jdt.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-542AkF79P7QCP9SDB" id="org.eclipse.datatools.enablement.msft.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-546AkF78Y7R9PAX77" id="org.eclipse.datatools.enablement.mysql.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-7A7T78DZRDKDDdFyFiKD" id="org.eclipse.datatools.enablement.oda.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-3328s73533G4A5B63" id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-548cAkF79P7UBMATEE" id="org.eclipse.datatools.enablement.oracle.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-542AkF77g7V9N9e77" id="org.eclipse.datatools.enablement.postgresql.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-540AkF77g7V9N9e77" id="org.eclipse.datatools.enablement.sap.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-7E45F9NiNWvOOXxPdVT" id="org.eclipse.datatools.enablement.sybase.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-540AkF78Y7VCOCQDB" id="org.eclipse.datatools.enablement.ingres.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-541AkF79P7N8NAQ77" id="org.eclipse.datatools.enablement.sqlite.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-7N7y7AFDrhoZFIFUNhpFwckfaS-S" id="org.eclipse.datatools.sqldevtools.feature.feature.group"/>
+
+ <unit version="1.8.1.v20100618-4209oB57E5N8H9ICE" id="org.eclipse.datatools.sqldevtools.results.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-7A-2F7RZHLz-HvNlPz-Uk" id="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-277078B03G8S_IMz00IwOmQz00Vl" id="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-640BgJ9DI9ZHVDdHL" id="org.eclipse.datatools.sqldevtools.data.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-622BgJ9CR9XFcEWLP" id="org.eclipse.datatools.sqldevtools.parsers.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-79-3EVVFJoFsJcMz0Pe" id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-4208375LG5BJ93413" id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature.feature.group"/>
+
+ <unit version="1.8.1.v20100618-26-7w312116392911" id="org.eclipse.datatools.intro.feature.group"/>
+ <unit version="1.8.1.v20100618-47C08w95ENAK6AFDFK7" id="org.eclipse.datatools.doc.user.feature.group"/>
+ <unit version="1.8.1.v20100618-26-311A16321A3557" id="org.eclipse.datatools.common.doc.user.feature.group"/>
+ <unit version="1.8.1.v20100618-37D-7733L3D753L7BBF" id="org.eclipse.datatools.connectivity.doc.user.feature.group"/>
+ <unit version="1.8.1.v20100618-37D-7733L3D753L7BBF" id="org.eclipse.datatools.sqltools.doc.user.feature.group"/>
+
+ <!-- XSD -->
+ <unit version="2.6.0.v20100914-1218" id="org.eclipse.xsd.ecore.converter.feature.group"/>
+ <unit version="2.6.0.v20100914-1218" id="org.eclipse.xsd.edit.feature.group"/>
+ <unit version="2.6.0.v20100914-1218" id="org.eclipse.xsd.editor.feature.group"/>
+ <unit version="2.6.0.v20100914-1218" id="org.eclipse.xsd.mapping.editor.feature.group"/>
+ <unit version="2.6.0.v20100914-1218" id="org.eclipse.xsd.mapping.feature.group"/>
+ <unit version="2.6.0.v20100914-1218" id="org.eclipse.xsd.feature.group"/>
+
+ <!-- EMF -->
+ <unit version="2.6.1.v20100914-1218" id="org.eclipse.emf.feature.group"/>
+
+ <!-- GEF 3.6.1 -->
+ <unit version="3.6.1.v20100908-1100-4507w31211A2403131" id="org.eclipse.draw2d.feature.group"/>
+ <unit version="3.6.1.v20100908-1100-777B181A3Bz-6B663E7974242" id="org.eclipse.gef.feature.group"/>
+ <unit version="1.2.0.v20100519-2050-67808yE5F-8HAH4HECF4242" id="org.eclipse.zest.feature.group"/>
+
+ <!-- JDT 3.6.1 -->
+ <unit version="3.6.1.r361_v20100714-0800-7z8XFUSFLFlmgLc5z-Bvrt8-HVkH" id="org.eclipse.jdt.feature.group"/>
+
+ <!-- WTP SDK 3.2.2-20100915173744 -->
+ <unit version="2.3.2.v201008242310-7778BjBgJ9E99_H_DFBA" id="org.eclipse.jpt.eclipselink.feature.feature.group"/>
+ <unit version="2.3.2.v201008242310-7N7UF75FD3wTgbUpoff0aT" id="org.eclipse.jpt.feature.feature.group"/>
+ <unit version="3.2.2.v201008231400-7E7I6F9JgLWLMUW3" id="org.eclipse.jsf.feature.feature.group"/>
+ <unit version="3.2.2.v201008170019-377AB8s73533J5J759F" id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group"/>
+ <unit version="3.2.1.v201007070821-52FMTAkF7B77UBR7W98" id="org.eclipse.jst.enterprise_core.feature.feature.group"/>
+ <unit version="3.2.2.v201008190400-7b7GHf2FSK2WBLQ2D-mrubYEOrRh" id="org.eclipse.jst.enterprise_ui.feature.feature.group"/>
+ <unit version="3.2.100.v201007151547-62FR7BgJ9E99_EmEJFX" id="org.eclipse.jst.enterprise_userdoc.feature.feature.group"/>
+ <unit version="2.2.101.v20100906-208_7w31211A17" id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group"/>
+ <unit version="3.2.2.v20100818b-777HFGRCcNBDiBjIbhBA8" id="org.eclipse.jst.server_adapters.ext.feature.feature.group"/>
+ <unit version="3.2.0.v201005241530-208Z7w31211419" id="org.eclipse.jst.server_adapters.feature.feature.group"/>
+ <unit version="3.2.0.v201005241530-31FA28s73533C66" id="org.eclipse.jst.server_core.feature.feature.group"/>
+ <unit version="3.2.2.v20100908-7A5FEi9xFc7RCJMToAIOJC43A" id="org.eclipse.jst.server_ui.feature.feature.group"/>
+ <unit version="3.3.0.v201005241530-2-Eo7w3121162A3329" id="org.eclipse.jst.server_userdoc.feature.feature.group"/>
+ <unit version="3.2.2.v201008170029-7Q7BG75FE9Le9BCy-tZxTqohz000" id="org.eclipse.jst.web_core.feature.feature.group"/>
+ <unit version="2.3.1.v20100906-4609oB5855L6N" id="org.eclipse.jst.webpageeditor.feature.feature.group"/>
+ <unit version="3.2.2.v201008170029-7F77FJSC25Tkdy1nqglPjqLAoDgh" id="org.eclipse.jst.web_ui.feature.feature.group"/>
+ <unit version="3.2.1.v201009091720-2107w31211938" id="org.eclipse.jst.web_userdoc.feature.feature.group"/>
+ <unit version="1.1.100.v201005241530-78-FF0DZRDKDDePSKwHj" id="org.eclipse.jst.ws.axis2tools.feature.feature.group"/>
+ <unit version="1.0.2.v201008232129-7H777DFAKlRiOX8lGdRoz0878J" id="org.eclipse.jst.ws.cxf.feature.feature.group"/>
+ <unit version="1.0.0.v201005241530-5--AkF7B77NBZBgBg" id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group"/>
+ <unit version="1.0.1.v201008232129-7E777CF8NcJSSK-UBTwXn" id="org.eclipse.jst.ws.jaxws.feature.feature.group"/>
+ <unit version="1.0.2.v201008232129-3-28s73533I67767I" id="org.eclipse.jst.ws.jaxws_userdoc.feature.feature.group"/>
+ <unit version="3.2.2.v201008091400-7B7DFElF7RZHOZJ6W0PsNJ" id="org.eclipse.wst.common_core.feature.feature.group"/>
+ <unit version="3.2.2.v201008170019-377AB8s73533J5H335L" id="org.eclipse.wst.common.fproj.feature.group"/>
+ <unit version="3.2.2.v201008091400-7C78FPhEdhO_mXde7kbap_K7X1Qt" id="org.eclipse.wst.common_ui.feature.feature.group"/>
+ <unit version="1.2.2.v201008170101-7C78FGMF9JgLWLMUUEMtXc" id="org.eclipse.wst.jsdt.feature.feature.group"/>
+ <unit version="3.2.0.v201005241510-51EoAkF77g8HBSc" id="org.eclipse.wst.server_adapters.feature.feature.group"/>
+ <unit version="3.2.2.v20100908-30F8V8s734C3I3K" id="org.eclipse.wst.server_core.feature.feature.group"/>
+ <unit version="3.2.2.v20100908-7B4FBrAtJb1nESKmCJHPGQ347" id="org.eclipse.wst.server_ui.feature.feature.group"/>
+ <unit version="3.1.10.v201005241510-20Bg7w3121162A3236" id="org.eclipse.wst.server_userdoc.feature.feature.group"/>
+ <unit version="3.2.2.v201008100100-7E7AFHwAJrn5PM15pUYBwJLkSG8j" id="org.eclipse.wst.web_core.feature.feature.group"/>
+ <unit version="3.2.2.v201008100100-7O7CFbKEMf84nUlEJyX7-SPQjhYZ" id="org.eclipse.wst.web_ui.feature.feature.group"/>
+ <unit version="3.2.0.v201005241510-31Eo8s734B3E4H7799" id="org.eclipse.wst.web_userdoc.feature.feature.group"/>
+ <unit version="3.2.2.v201008211705-7L7RFezFGtGd-ngz--z0mHnb4852" id="org.eclipse.wst.ws_core.feature.feature.group"/>
+ <unit version="3.2.2.v201008211705-7I78FZFEtEoO2c5BlJ4jPNvNC-yS" id="org.eclipse.wst.ws_ui.feature.feature.group"/>
+ <unit version="3.1.200.v201007151546-44FO-9oB5855O8M9JHH" id="org.eclipse.wst.ws_userdoc.feature.feature.group"/>
+ <unit version="1.5.300.v201005241450-2407w312116191741" id="org.eclipse.wst.ws_wsdl15.feature.feature.group"/>
+ <unit version="3.2.2.v201008170029-7C7OFXYF7RZHQHI5PyJwPT" id="org.eclipse.wst.xml_core.feature.feature.group"/>
+ <unit version="3.2.2.v201008170029-7H7AFUQDxumQGOpBqffOY2f1qxDZ" id="org.eclipse.wst.xml_ui.feature.feature.group"/>
+ <unit version="3.2.100.v201005241420-50FXNAkF7B77RBgFFBF" id="org.eclipse.wst.xml_userdoc.feature.feature.group"/>
+ <unit version="1.1.5.v201009091745-67K2BgJ9DIAXCbBWJO" id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group"/>
+ <unit version="1.1.2.v201009091745-7S7WFAPFIpS-1-NbCE6tnacCXKP" id="org.eclipse.wst.xsl.feature.feature.group"/>
+
+ <!-- RCP 3.6.1 -->
+ <unit version="3.4.1.R36x_v20100823-7M7K7JF90dnJ-WLf3cf4yi" id="org.eclipse.equinox.executable.feature.group"/>
+ <unit version="2.0.1.r361_v20100903-897HFZFFZRuSD2LMtVxyz0Vr" id="org.eclipse.equinox.p2.user.ui.feature.group"/>
+ <unit version="1.2.0.v20100427-7e7jEQFEp4jsWcboLU9l93" id="org.eclipse.help.feature.group"/>
+ <unit version="3.6.1.r361_v20100909-9gF78GrkFqw7GrsZnvz0JWNTeb6fue6896L" id="org.eclipse.platform.feature.group"/>
+ <unit version="3.6.1.r361_v20100827-9OArFLdFjY-ThSQXmKvKz0_T" id="org.eclipse.rcp.feature.group"/>
+
+ <!-- UML -->
+ <unit version="3.1.1.v201008191505" id="org.eclipse.uml2.feature.group"/>
+ <unit version="3.1.0.v201005281015" id="org.eclipse.uml2.doc.feature.group"/>
+
+ <!-- PDE -->
+ <unit version="3.6.1.r361_v20100727-7b7mFL-FET3dhESDgE5_bkJ" id="org.eclipse.pde.feature.group"/>
+
+ <!-- TPTP -->
+ <unit version="4.3.1.v201009092123-797908s73533D4H6D56" id="org.eclipse.tptp.platform.instrumentation.ui.feature.group"/>
+ <unit version="4.7.1.v201009092123-8X8ZFXUFLWUl6knOxRCm9t" id="org.eclipse.tptp.platform.core.feature.group"/>
+ <unit version="4.5.1.v201009092123-797A18s73533L4F6D6D" id="org.eclipse.tptp.platform.jvmti.feature.group"/>
+ <unit version="4.5.1.v201009092123-7H7F2AkF7B77c7dEGDG" id="org.eclipse.tptp.platform.profile.server.feature.group"/>
+ <unit version="4.3.1.v201009092123-794F9x8s73533H3I6A56" id="org.eclipse.tptp.trace.feature.group"/>
+
+ <!-- RSE SDK 3.2.1 -->
+ <unit version="3.2.1.v201008191400-7L78FA-8wqbPcNj4qa8R0eViy7vZ" id="org.eclipse.rse.feature.group"/>
+ <unit version="1.1.200.v201005221100-31A78s733L3D7H7933" id="org.eclipse.rse.useractions.feature.group"/>
+ <unit version="3.0.201.v201008191400-4-8_7w3121192A2511" id="org.eclipse.tm.terminal.feature.group"/>
+ <unit version="2.1.0.v201006030830-30-7w312117152351" id="org.eclipse.tm.terminal.view.feature.group"/>
+ <unit version="2.0.200.v201005032000-3-8_7w311A1A271116" id="org.eclipse.tm.terminal.telnet.feature.group"/>
+ <unit version="2.0.200.v201005271030-3-A77w312116382141" id="org.eclipse.tm.terminal.ssh.feature.group"/>
+
+ <repository location="http://download.eclipse.org/releases/helios/"/>
+</location>
+</locations>
+</target>
\ No newline at end of file
Added: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml (rev 0)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2010-11-09 17:02:20 UTC (rev 26385)
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xs="http://www.w3.org/2001/XMLSchema" default="download.target.platform" name="Download target platform">
+<target name="help">
+<echo>
+ Generated with useLatest = true
+
+ ---
+
+ Use followStrict="true" to prevent downloading all
+ requirements not included in the target platform
+ or followStrict="false" to fetch everything
+
+ To run this script:
+
+ /abs/path/to/eclipse -vm /opt/jdk1.6.0/bin/java \
+ -nosplash -data /tmp/workspace -consolelog -application \
+ org.eclipse.ant.core.antRunner -f *.target.p2mirror.xml \
+ -Ddebug=true -DfollowStrict=true -DrepoDir=`pwd`/REPO/
+</echo>
+</target>
+<target unless="repoDir" name="init">
+<fail>Must set -DrepoDir=/abs/path/to/download/artifacts/</fail>
+</target>
+<target if="repoDir" description="Download from target platform definition" depends="init" name="download.target.platform">
+<property value="false" name="verbose"/>
+<property value="false" name="followStrict"/>
+<echo level="info">Download features/plugins into ${repoDir}</echo>
+<p2.mirror verbose="${verbose}" destination="file:${repoDir}">
+<slicingOptions followStrict="${followStrict}" includeFeatures="true"/>
+<source>
+<repository location="http://download.eclipse.org/releases/helios/"/>
+</source>
+<iu version="" id="org.eclipse.cvs.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.sdk.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.sdk.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.modelbase.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.connectivity.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.connectivity.oda.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.hsqldb.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.ibm.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.jdbc.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.jdt.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.msft.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.mysql.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.oda.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.oracle.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.postgresql.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.sap.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.sybase.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.ingres.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.enablement.sqlite.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.sqldevtools.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.sqldevtools.results.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.sqldevtools.data.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.sqldevtools.parsers.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature.feature.group"/>
+<iu version="" id="org.eclipse.datatools.intro.feature.group"/>
+<iu version="" id="org.eclipse.datatools.doc.user.feature.group"/>
+<iu version="" id="org.eclipse.datatools.common.doc.user.feature.group"/>
+<iu version="" id="org.eclipse.datatools.connectivity.doc.user.feature.group"/>
+<iu version="" id="org.eclipse.datatools.sqltools.doc.user.feature.group"/>
+<iu version="" id="org.eclipse.xsd.ecore.converter.feature.group"/>
+<iu version="" id="org.eclipse.xsd.edit.feature.group"/>
+<iu version="" id="org.eclipse.xsd.editor.feature.group"/>
+<iu version="" id="org.eclipse.xsd.mapping.editor.feature.group"/>
+<iu version="" id="org.eclipse.xsd.mapping.feature.group"/>
+<iu version="" id="org.eclipse.xsd.feature.group"/>
+<iu version="" id="org.eclipse.emf.feature.group"/>
+<iu version="" id="org.eclipse.draw2d.feature.group"/>
+<iu version="" id="org.eclipse.gef.feature.group"/>
+<iu version="" id="org.eclipse.zest.feature.group"/>
+<iu version="" id="org.eclipse.jdt.feature.group"/>
+<iu version="" id="org.eclipse.jpt.eclipselink.feature.feature.group"/>
+<iu version="" id="org.eclipse.jpt.feature.feature.group"/>
+<iu version="" id="org.eclipse.jsf.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group"/>
+<iu version="" id="org.eclipse.jst.enterprise_core.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.enterprise_ui.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.enterprise_userdoc.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.server_adapters.ext.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.server_adapters.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.server_core.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.server_ui.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.server_userdoc.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.web_core.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.webpageeditor.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.web_ui.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.web_userdoc.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.ws.axis2tools.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.ws.cxf.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.ws.jaxws.feature.feature.group"/>
+<iu version="" id="org.eclipse.jst.ws.jaxws_userdoc.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.common_core.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.common.fproj.feature.group"/>
+<iu version="" id="org.eclipse.wst.common_ui.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.jsdt.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.server_adapters.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.server_core.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.server_ui.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.server_userdoc.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.web_core.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.web_ui.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.web_userdoc.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.ws_core.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.ws_ui.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.ws_userdoc.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.ws_wsdl15.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.xml_core.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.xml_ui.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.xml_userdoc.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group"/>
+<iu version="" id="org.eclipse.wst.xsl.feature.feature.group"/>
+<iu version="" id="org.eclipse.equinox.executable.feature.group"/>
+<iu version="" id="org.eclipse.equinox.p2.user.ui.feature.group"/>
+<iu version="" id="org.eclipse.help.feature.group"/>
+<iu version="" id="org.eclipse.platform.feature.group"/>
+<iu version="" id="org.eclipse.rcp.feature.group"/>
+<iu version="" id="org.eclipse.uml2.feature.group"/>
+<iu version="" id="org.eclipse.uml2.doc.feature.group"/>
+<iu version="" id="org.eclipse.pde.feature.group"/>
+<iu version="" id="org.eclipse.tptp.platform.instrumentation.ui.feature.group"/>
+<iu version="" id="org.eclipse.tptp.platform.core.feature.group"/>
+<iu version="" id="org.eclipse.tptp.platform.jvmti.feature.group"/>
+<iu version="" id="org.eclipse.tptp.platform.profile.server.feature.group"/>
+<iu version="" id="org.eclipse.tptp.trace.feature.group"/>
+<iu version="" id="org.eclipse.rse.feature.group"/>
+<iu version="" id="org.eclipse.rse.useractions.feature.group"/>
+<iu version="" id="org.eclipse.tm.terminal.feature.group"/>
+<iu version="" id="org.eclipse.tm.terminal.view.feature.group"/>
+<iu version="" id="org.eclipse.tm.terminal.telnet.feature.group"/>
+<iu version="" id="org.eclipse.tm.terminal.ssh.feature.group"/>
+</p2.mirror>
+</target>
+</project>
15 years, 5 months
JBoss Tools SVN: r26384 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-09 11:24:26 -0500 (Tue, 09 Nov 2010)
New Revision: 26384
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
Log:
[JBIDE-7513] added equals and hascode methods to be able to match new instances to old ones (so that I can keep the selection in the cloud viewer)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java 2010-11-09 16:05:57 UTC (rev 26383)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java 2010-11-09 16:24:26 UTC (rev 26384)
@@ -45,6 +45,13 @@
return result;
}
+ /**
+ * The current strategy regarding instances is to create new instances (and
+ * not update instances). We therefore need equals to be able to match
+ * domain objects. We might have to change that since in my experience it is
+ * not a good choice to create new instances, better is to update the ones
+ * that are available in the client.
+ */
@Override
public boolean equals(Object obj) {
if (this == obj)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-11-09 16:05:57 UTC (rev 26383)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-11-09 16:24:26 UTC (rev 26384)
@@ -17,7 +17,6 @@
import org.jboss.tools.deltacloud.core.client.Instance;
import org.jboss.tools.deltacloud.core.client.InstanceAction;
-
public class DeltaCloudInstance {
public final static String PENDING = Instance.State.PENDING.toString();
@@ -25,75 +24,76 @@
public final static String STOPPED = Instance.State.STOPPED.toString();
public final static String TERMINATED = Instance.State.TERMINATED.toString();
public final static String BOGUS = Instance.State.BOGUS.toString();
-
+
public final static String START = InstanceAction.START;
public final static String STOP = InstanceAction.STOP;
public final static String REBOOT = InstanceAction.REBOOT;
public final static String DESTROY = InstanceAction.DESTROY;
-
+
private Instance instance;
private String givenName;
-
+
public DeltaCloudInstance(Instance instance) {
this.instance = instance;
}
-
+
public String getName() {
return instance.getName();
}
-
+
public String getGivenName() {
return givenName;
}
-
+
public void setGivenName(String name) {
givenName = name;
}
-
+
public String getId() {
return instance.getId();
}
-
+
public String getOwnerId() {
return instance.getOwnerId();
}
-
+
public String getState() {
return instance.getState().toString();
}
-
+
public String getKey() {
return instance.getKey();
}
-
+
public List<String> getActions() {
return instance.getActionNames();
}
-
+
public String getProfileId() {
return instance.getProfileId();
}
-
+
public String getRealmId() {
return instance.getRealmId();
}
-
+
public String getImageId() {
return instance.getImageId();
}
-
+
public List<String> getHostNames() {
return instance.getPublicAddresses();
}
-
+
public String getHostName() {
List<String> hostNames = getHostNames();
if (hostNames != null && hostNames.size() > 0)
return hostNames.get(0);
return null;
}
-
- protected boolean performInstanceAction(String actionId, DeltaCloudClientImpl client) throws DeltaCloudClientException {
+
+ protected boolean performInstanceAction(String actionId, DeltaCloudClientImpl client)
+ throws DeltaCloudClientException {
InstanceAction action = instance.getAction(actionId);
if (action == null) {
return false;
@@ -110,6 +110,13 @@
return result;
}
+ /**
+ * The current strategy regarding instances is to create new instances (and
+ * not update instances). We therefore need equals to be able to match
+ * domain objects. We might have to change that since in my experience it is
+ * not a good choice to create new instances, better is to update the ones
+ * that are available in the client.
+ */
@Override
public boolean equals(Object obj) {
if (this == obj)
15 years, 5 months
JBoss Tools SVN: r26383 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-09 11:05:57 -0500 (Tue, 09 Nov 2010)
New Revision: 26383
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java
Log:
[JBIDE-7518] loading images and instances from server after editing -> notifies listeners of changes
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java 2010-11-09 16:05:33 UTC (rev 26382)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java 2010-11-09 16:05:57 UTC (rev 26383)
@@ -119,12 +119,12 @@
return Collections.EMPTY_LIST;
}
List<Object> children = new ArrayList<Object>();
- for (Object member : itemsToMatch) {
- Object element = ((CloudViewElement) member).getElement();
- if (element != null) {
+ for (Object itemToMatch : itemsToMatch) {
+ Object elementToMatch = ((CloudViewElement) itemToMatch).getElement();
+ if (elementToMatch != null) {
for (Object child : getChildren()) {
Object childElement = ((CloudViewElement) child).getElement();
- if (element.equals(childElement)) {
+ if (elementToMatch.equals(childElement)) {
children.add(child);
}
}
15 years, 5 months
JBoss Tools SVN: r26382 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-09 11:05:33 -0500 (Tue, 09 Nov 2010)
New Revision: 26382
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
Log:
[JBIDE-7518] loading images and instances from server after editing -> notifies listeners of changes
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-09 16:05:11 UTC (rev 26381)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-09 16:05:33 UTC (rev 26382)
@@ -90,8 +90,7 @@
this.type = type;
storePassword(url, username, passwd);
save();
- loadInstances();
- loadImages();
+ loadChildren();
}
private void storePassword(String url, String username, String passwd) {
15 years, 5 months
JBoss Tools SVN: r26381 - in trunk/struts/tests/org.jboss.tools.struts.ui.bot.test: src/org/jboss/tools/struts/ui/bot/test/utils and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jlukas(a)redhat.com
Date: 2010-11-09 11:05:11 -0500 (Tue, 09 Nov 2010)
New Revision: 26381
Modified:
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/META-INF/MANIFEST.MF
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java
Log:
updated test and deps to swtbot 2.0.1
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/META-INF/MANIFEST.MF 2010-11-09 16:04:02 UTC (rev 26380)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/META-INF/MANIFEST.MF 2010-11-09 16:05:11 UTC (rev 26381)
@@ -7,19 +7,20 @@
Require-Bundle: org.apache.log4j;bundle-version="1.2.13",
org.eclipse.core.runtime,
org.eclipse.gef;bundle-version="3.5.1",
- org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0",
- org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.0",
- org.eclipse.swtbot.eclipse.gef.finder;bundle-version="2.0.0",
- org.eclipse.swtbot.eclipse.ui;bundle-version="2.0.0",
- org.eclipse.swtbot.junit4_x;bundle-version="2.0.0",
- org.eclipse.swtbot.swt.finder;bundle-version="2.0.0",
+ org.eclipse.swtbot.eclipse.core;bundle-version="2.0.1",
+ org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.1",
+ org.eclipse.swtbot.eclipse.gef.finder;bundle-version="2.0.1",
+ org.eclipse.swtbot.eclipse.ui;bundle-version="2.0.1",
+ org.eclipse.swtbot.junit4_x;bundle-version="2.0.1",
+ org.eclipse.swtbot.swt.finder;bundle-version="2.0.1",
org.eclipse.ui,
org.eclipse.ui.ide;bundle-version="3.5.2",
org.jboss.tools.common.model.ui;bundle-version="3.1.0",
org.jboss.tools.struts.ui;bundle-version="3.1.0",
org.jboss.tools.jst.ui.bot.test;bundle-version="1.0.0",
org.jboss.tools.ui.bot.ext;bundle-version="1.0.0",
- org.junit4;bundle-version="4.5.0"
+ org.junit4;bundle-version="4.5.0",
+ org.eclipse.ui.browser;bundle-version="3.3.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: JBoss by Red Hat
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java 2010-11-09 16:04:02 UTC (rev 26380)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/utils/StrutsUIEditorBot.java 2010-11-09 16:05:11 UTC (rev 26381)
@@ -1,13 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 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
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
package org.jboss.tools.struts.ui.bot.test.utils;
import java.lang.reflect.Field;
@@ -16,17 +6,16 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.eclipse.draw2d.FigureCanvas;
import org.eclipse.gef.GraphicalViewer;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
-import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditor;
-import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefFigureCanvas;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
+import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart;
+import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefViewer;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
import org.eclipse.swtbot.swt.finder.results.Result;
-import org.eclipse.swtbot.swt.finder.results.VoidResult;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IEditorReference;
import org.eclipse.ui.IWorkbenchPart;
@@ -34,79 +23,98 @@
import org.jboss.tools.common.editor.ObjectMultiPageEditor;
import org.jboss.tools.common.model.ui.editor.EditorPartWrapper;
-public class StrutsUIEditorBot extends SWTBotGefEditor {
+/**
+ * modified copy of SWTBotGefEditor class to get it working with Struts UI editor
+ *
+ * @author jlukas
+ */
+public class StrutsUIEditorBot extends SWTBotEditor {
+ private final StrutsUIEditorViewer viewer;
private static final Logger L = Logger.getLogger(StrutsUIEditorBot.class.getName());
- public StrutsUIEditorBot(IEditorReference reference) throws WidgetNotFoundException {
- super(reference, new SWTWorkbenchBot());
- }
+ public StrutsUIEditorBot(final IEditorReference editorReference)
+ throws WidgetNotFoundException {
+ super(editorReference, new SWTWorkbenchBot());
+ GraphicalViewer graphicalViewer = UIThreadRunnable.syncExec(new Result<GraphicalViewer>() {
+ public GraphicalViewer run() {
+ final IEditorPart/*EditorPartWrapper*/ editor = partReference.getEditor(true);
+ EditorPart/*StrutsEditor*/ ep = null;
+ try {
+ Field f = editor.getClass().getDeclaredField("editor");
+ f.setAccessible(true);
+ Object/*StrutsConfigEditor*/ o = f.get(editor);
+ f.setAccessible(false);
+ f = o.getClass().getDeclaredField("guiEditor");
+ f.setAccessible(true);
+ Object/*StrutsConfigGuiEditor*/ o2 = f.get(o);
+ f.setAccessible(false);
+ Method m = o2.getClass().getMethod("getGUI");
+ ep = (EditorPart) m.invoke(o2);
+ } catch (SecurityException e) {
+ L.log(Level.WARNING, e.getMessage(), e);
+ } catch (NoSuchFieldException e) {
+ L.log(Level.WARNING, e.getMessage(), e);
+ } catch (IllegalArgumentException e) {
+ L.log(Level.WARNING, e.getMessage(), e);
+ } catch (IllegalAccessException e) {
+ L.log(Level.WARNING, e.getMessage(), e);
+ } catch (NoSuchMethodException e) {
+ L.log(Level.WARNING, e.getMessage(), e);
+ } catch (InvocationTargetException e) {
+ L.log(Level.WARNING, e.getMessage(), e);
+ }
+ return (GraphicalViewer) ep.getAdapter(GraphicalViewer.class);
+ }
+ });
+ viewer = new StrutsUIEditorViewer(graphicalViewer);
+ }
+
+ public StrutsUIEditorBot activateTool(final String label) throws WidgetNotFoundException {
+ viewer.activateTool(label);
+ return this;
+ }
-// @Override
-// protected void init() throws WidgetNotFoundException {
-// UIThreadRunnable.syncExec(new VoidResult() {
-//
-// public void run() {
-// final IEditorPart/*EditorPartWrapper*/ editor = partReference.getEditor(true);
-// EditorPart/*StrutsEditor*/ ep = null;
-// try {
-// Field f = editor.getClass().getDeclaredField("editor");
-// f.setAccessible(true);
-// Object/*StrutsConfigEditor*/ o = f.get(editor);
-// f.setAccessible(false);
-// f = o.getClass().getDeclaredField("guiEditor");
-// f.setAccessible(true);
-// Object/*StrutsConfigGuiEditor*/ o2 = f.get(o);
-// f.setAccessible(false);
-// Method m = o2.getClass().getMethod("getGUI");
-// ep = (EditorPart) m.invoke(o2);
-// } catch (SecurityException e) {
-// L.log(Level.WARNING, e.getMessage(), e);
-// } catch (NoSuchFieldException e) {
-// L.log(Level.WARNING, e.getMessage(), e);
-// } catch (IllegalArgumentException e) {
-// L.log(Level.WARNING, e.getMessage(), e);
-// } catch (IllegalAccessException e) {
-// L.log(Level.WARNING, e.getMessage(), e);
-// } catch (NoSuchMethodException e) {
-// L.log(Level.WARNING, e.getMessage(), e);
-// } catch (InvocationTargetException e) {
-// L.log(Level.WARNING, e.getMessage(), e);
-// }
-// graphicalViewer = (GraphicalViewer) ep.getAdapter(GraphicalViewer.class);
-// final Control control = graphicalViewer.getControl();
-// if (control instanceof FigureCanvas) {
-// canvas = new SWTBotGefFigureCanvas((FigureCanvas) control);
-// }
-// editDomain = graphicalViewer.getEditDomain();
-// }
-// });
-//
-// if (graphicalViewer == null) {
-// throw new WidgetNotFoundException("Editor does not adapt to a GraphicalViewer");
-// }
-// }
+ public StrutsUIEditorBot activateTool(final String label, int index) throws WidgetNotFoundException {
+ viewer.activateTool(label, index);
+ return this;
+ }
+
+ public SWTBotGefEditPart mainEditPart() throws WidgetNotFoundException {
+ return viewer.mainEditPart();
+ }
+
+ public Control getControl() {
+ return viewer.getControl();
+ }
- public void selectPage(final String page) {
- IWorkbenchPart p = ((EditorPartWrapper) (getReference().getPart(true))).getEditor();
- assert p instanceof ObjectMultiPageEditor;
- final ObjectMultiPageEditor editor = (ObjectMultiPageEditor) p;
- // Select page
- Display.getDefault().syncExec(new Runnable() {
+ public StrutsUIEditorBot clickContextMenu(String text) throws WidgetNotFoundException {
+ viewer.clickContextMenu(text);
+ return this;
+ }
+
+ public void selectPage(final String page) {
+ IWorkbenchPart p = ((EditorPartWrapper) (getReference().getPart(true))).getEditor();
+ assert p instanceof ObjectMultiPageEditor;
+ final ObjectMultiPageEditor editor = (ObjectMultiPageEditor) p;
+ // Select page
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ editor.selectPageByName(page);
+ }
+ });
+ }
- public void run() {
- editor.selectPageByName(page);
- }
- });
- }
+ private static class StrutsUIEditorViewer extends SWTBotGefViewer {
- public Control/*FigureCanvas*/ getControl() {
- return null;
-// return UIThreadRunnable.syncExec(new Result<Control>() {
-//
-// public Control run() {
-// return graphicalViewer.getControl();
-// }
-// });
- }
+ public StrutsUIEditorViewer(GraphicalViewer graphicalViewer)
+ throws WidgetNotFoundException {
+ super(graphicalViewer);
+ }
+
+ public Control getControl() {
+ return super.getControl();
+ }
+
+ }
}
15 years, 5 months
JBoss Tools SVN: r26380 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-09 11:04:02 -0500 (Tue, 09 Nov 2010)
New Revision: 26380
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Image.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java
Log:
[JBIDE-7513] added equals and hascode methods to be able to match new instances to old ones (so that I can keep the selection in the cloud viewer)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-09 15:59:32 UTC (rev 26379)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-09 16:04:02 UTC (rev 26380)
@@ -1,5 +1,15 @@
2010-11-09 André Dietisheim <adietish(a)redhat.com>
+ * src/org/jboss/tools/deltacloud/core/client/Instance.java
+ (hashCode):
+ (equals):
+ [JBIDE-7513] added equals and hascode methods to be able to match new instances to old ones
+ (so that I can keep the selection in the cloud viewer)
+ * src/org/jboss/tools/deltacloud/core/client/Image.java
+ (hashCode):
+ (equals):
+ [JBIDE-7513] added equals and hascode methods to be able to match new instances to old ones
+ (so that I can keep the selection in the cloud viewer)
* src/org/jboss/tools/deltacloud/core/ImageFilter.java (setRules):
* src/org/jboss/tools/deltacloud/core/InstanceFilter.java
(setRules):
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java 2010-11-09 15:59:32 UTC (rev 26379)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java 2010-11-09 16:04:02 UTC (rev 26380)
@@ -36,4 +36,29 @@
public String getId() {
return image.getId();
}
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((image == null) ? 0 : image.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ DeltaCloudImage other = (DeltaCloudImage) obj;
+ if (image == null) {
+ if (other.image != null)
+ return false;
+ } else if (!image.equals(other.image))
+ return false;
+ return true;
+ }
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-11-09 15:59:32 UTC (rev 26379)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-11-09 16:04:02 UTC (rev 26380)
@@ -100,4 +100,35 @@
}
return client.performInstanceAction(action);
}
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((givenName == null) ? 0 : givenName.hashCode());
+ result = prime * result + ((instance == null) ? 0 : instance.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ DeltaCloudInstance other = (DeltaCloudInstance) obj;
+ if (givenName == null) {
+ if (other.givenName != null)
+ return false;
+ } else if (!givenName.equals(other.givenName))
+ return false;
+ if (instance == null) {
+ if (other.instance != null)
+ return false;
+ } else if (!instance.equals(other.instance))
+ return false;
+ return true;
+ }
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Image.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Image.java 2010-11-09 15:59:32 UTC (rev 26379)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Image.java 2010-11-09 16:04:02 UTC (rev 26380)
@@ -87,4 +87,49 @@
s += "Arch:\t\t" + getArchitecture() + "\n";
return s;
}
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((architecture == null) ? 0 : architecture.hashCode());
+ result = prime * result + ((description == null) ? 0 : description.hashCode());
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ result = prime * result + ((ownerId == null) ? 0 : ownerId.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ Image other = (Image) obj;
+ if (architecture == null) {
+ if (other.architecture != null)
+ return false;
+ } else if (!architecture.equals(other.architecture))
+ return false;
+ if (description == null) {
+ if (other.description != null)
+ return false;
+ } else if (!description.equals(other.description))
+ return false;
+ if (name == null) {
+ if (other.name != null)
+ return false;
+ } else if (!name.equals(other.name))
+ return false;
+ if (ownerId == null) {
+ if (other.ownerId != null)
+ return false;
+ } else if (!ownerId.equals(other.ownerId))
+ return false;
+ return true;
+ }
+
+
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-11-09 15:59:32 UTC (rev 26379)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-11-09 16:04:02 UTC (rev 26380)
@@ -250,4 +250,77 @@
return s;
}
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((cpu == null) ? 0 : cpu.hashCode());
+ result = prime * result + ((imageId == null) ? 0 : imageId.hashCode());
+ result = prime * result + ((keyname == null) ? 0 : keyname.hashCode());
+ result = prime * result + ((memory == null) ? 0 : memory.hashCode());
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ result = prime * result + ((ownerId == null) ? 0 : ownerId.hashCode());
+ result = prime * result + ((profileId == null) ? 0 : profileId.hashCode());
+ result = prime * result + ((realmId == null) ? 0 : realmId.hashCode());
+ result = prime * result + ((storage == null) ? 0 : storage.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ Instance other = (Instance) obj;
+ if (cpu == null) {
+ if (other.cpu != null)
+ return false;
+ } else if (!cpu.equals(other.cpu))
+ return false;
+ if (imageId == null) {
+ if (other.imageId != null)
+ return false;
+ } else if (!imageId.equals(other.imageId))
+ return false;
+ if (keyname == null) {
+ if (other.keyname != null)
+ return false;
+ } else if (!keyname.equals(other.keyname))
+ return false;
+ if (memory == null) {
+ if (other.memory != null)
+ return false;
+ } else if (!memory.equals(other.memory))
+ return false;
+ if (name == null) {
+ if (other.name != null)
+ return false;
+ } else if (!name.equals(other.name))
+ return false;
+ if (ownerId == null) {
+ if (other.ownerId != null)
+ return false;
+ } else if (!ownerId.equals(other.ownerId))
+ return false;
+ if (profileId == null) {
+ if (other.profileId != null)
+ return false;
+ } else if (!profileId.equals(other.profileId))
+ return false;
+ if (realmId == null) {
+ if (other.realmId != null)
+ return false;
+ } else if (!realmId.equals(other.realmId))
+ return false;
+ if (storage == null) {
+ if (other.storage != null)
+ return false;
+ } else if (!storage.equals(other.storage))
+ return false;
+ return true;
+ }
}
15 years, 5 months
JBoss Tools SVN: r26379 - in trunk/jsf: plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-11-09 10:59:32 -0500 (Tue, 09 Nov 2010)
New Revision: 26379
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column-RF4.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column-RF4.xhtml.xml
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
Log:
https://jira.jboss.org/browse/JBIDE-7449: Vpe templates for rich iteration.
- added support for breakRowBefore attribute of rich:column
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnTemplate.java 2010-11-09 14:47:33 UTC (rev 26378)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnTemplate.java 2010-11-09 15:59:32 UTC (rev 26379)
@@ -189,10 +189,16 @@
}
}
- public static boolean isBreakBefore(Node child) {
- String breakBeforeVal = ((Element)child).getAttribute(RichFaces.ATTR_BREAK_BEFORE);
- boolean breakBefore = breakBeforeVal != null && breakBeforeVal.equalsIgnoreCase(RichFaces.VALUE_TRUE);
- return breakBefore;
+ public static boolean isBreakBefore(Node node) {
+ if (node instanceof Element) {
+ Element element = (Element) node;
+ String breakBeforeVal = element.getAttribute(RichFaces.ATTR_BREAK_BEFORE);
+ String brealRowBeforeVal = element.getAttribute(RichFaces.ATTR_BREAK_ROW_BEFORE);
+ return RichFaces.VALUE_TRUE.equals(breakBeforeVal)
+ || RichFaces.VALUE_TRUE.equals(brealRowBeforeVal);
+ } else {
+ return false;
+ }
}
/**
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java 2010-11-09 14:47:33 UTC (rev 26378)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java 2010-11-09 15:59:32 UTC (rev 26379)
@@ -346,7 +346,7 @@
} else if (nodeName.equals(sourceElement.getPrefix() + Constants.COLON + RichFaces.TAG_COLUMN) ||
nodeName.equals(sourceElement.getPrefix() + Constants.COLON + RichFaces.TAG_COLUMNS)) {
// For new row, save length of previous.
- if (Boolean.getBoolean(column.getAttribute(RichFaces.ATTR_BREAK_BEFORE))) {
+ if (RichFacesColumnTemplate.isBreakBefore(column)) {
count = Math.max(currentLength,count);
currentLength = 0;
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java 2010-11-09 14:47:33 UTC (rev 26378)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java 2010-11-09 15:59:32 UTC (rev 26379)
@@ -422,9 +422,8 @@
currentLength = 0;
} else if (nodeName.equals(sourceElement.getPrefix() + COLUMN) ||
nodeName.equals(sourceElement.getPrefix() + COLUMNS)) {
- String breakBeforeStr = column.getAttribute("breakBefore"); //$NON-NLS-1$
// For new row, save length of previsous.
- if (Boolean.getBoolean(breakBeforeStr)) {
+ if (RichFacesColumnTemplate.isBreakBefore(column)) {
if (currentLength > count) {
count = currentLength;
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java 2010-11-09 14:47:33 UTC (rev 26378)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java 2010-11-09 15:59:32 UTC (rev 26379)
@@ -100,8 +100,7 @@
String nodeName = child.getNodeName();
if (nodeName.endsWith(':' + RichFaces.TAG_COLUMN) ||
nodeName.endsWith(':' + RichFaces.TAG_COLUMNS)) {
- final boolean breakBefore = RichFaces.VALUE_TRUE.equals( ((Element)child).getAttribute(RichFaces.ATTR_BREAK_BEFORE) );
- if (breakBefore) {
+ if (RichFacesColumnTemplate.isBreakBefore(child)) {
curRow++;
curColumn = 0;
curTr = visualDocument.createElement(HTML.TAG_TR);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java 2010-11-09 14:47:33 UTC (rev 26378)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java 2010-11-09 15:59:32 UTC (rev 26379)
@@ -30,6 +30,7 @@
public static final String ATTR_ADD_CONTROL_LABEL = "addControlLabel"; //$NON-NLS-1$
public static final String ATTR_ALIGN = "align"; //$NON-NLS-1$
public static final String ATTR_BREAK_BEFORE = "breakBefore"; //$NON-NLS-1$
+ public static final String ATTR_BREAK_ROW_BEFORE = "breakRowBefore"; // RichFaces 4.0 attribute //$NON-NLS-1$
public static final String ATTR_CAPTION_CLASS = "captionClass"; //$NON-NLS-1$
public static final String ATTR_CAPTION_STYLE = "captionStyle"; //$NON-NLS-1$
public static final String ATTR_COLLAPSE_ICON = "collapseIcon"; //$NON-NLS-1$
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column-RF4.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column-RF4.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column-RF4.xhtml 2010-11-09 15:59:32 UTC (rev 26379)
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<head>
+</head>
+<body>
+ <h1>column (RichFaces 4)</h1>
+ <h:form>
+ <rich:dataTable id="table1" value="#{bookList.bookList}" var="book" sortMode="multi">
+ <rich:column sortBy="#{book.price}" id="col1" >
+ <h:outputText value="#{book.price}" />
+ </rich:column>
+ <rich:column id="col2" sortBy="#{book.numOfCopies}" breakRowBefore="true">
+ <h:outputText value="#{book.numOfCopies}" />
+ </rich:column>
+ </rich:dataTable>
+ </h:form>
+</body>
+</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column-RF4.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column-RF4.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/column-RF4.xhtml.xml 2010-11-09 15:59:32 UTC (rev 26379)
@@ -0,0 +1,18 @@
+<tests>
+ <test id="table1">
+ <TABLE>
+ <COLGROUP SPAN="1">
+ </COLGROUP>
+ <TR>
+ <TD>
+ <SPAN CLASS="vpe-text">#{book.price}</SPAN>
+ </TD>
+ </TR>
+ <TR>
+ <TD>
+ <SPAN CLASS="vpe-text">#{book.numOfCopies}</SPAN>
+ </TD>
+ </TR>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2010-11-09 14:47:33 UTC (rev 26378)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2010-11-09 15:59:32 UTC (rev 26379)
@@ -95,6 +95,9 @@
public void testColumn() throws Throwable {
performContentTest("components/column.xhtml");//$NON-NLS-1$
}
+ public void testColumnRF4() throws Throwable {
+ performContentTest("components/column-RF4.xhtml");//$NON-NLS-1$
+ }
public void testDataGrid() throws Throwable {
performContentTest("components/dataGrid.xhtml");//$NON-NLS-1$
15 years, 5 months
JBoss Tools SVN: r26378 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-11-09 09:47:33 -0500 (Tue, 09 Nov 2010)
New Revision: 26378
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintInt.java
Log:
JBIDE-7193
https://jira.jboss.org/browse/JBIDE-7193
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintInt.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintInt.java 2010-11-09 14:42:33 UTC (rev 26377)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintInt.java 2010-11-09 14:47:33 UTC (rev 26378)
@@ -46,10 +46,10 @@
} else if(min == 0 && max == Integer.MAX_VALUE) {
return "must be a non-negative integer.";
} else if(min > Integer.MIN_VALUE && max == Integer.MAX_VALUE) {
- return MessageFormat.format("must be an integer greater than {0}.",
+ return MessageFormat.format("must be an integer not less than {0}.",
min);
} else if(min == Integer.MIN_VALUE && max < Integer.MAX_VALUE) {
- return MessageFormat.format("must be an integer less than {0}.", max);
+ return MessageFormat.format("must be an integer not greater than {0}.", max);
} else {
return MessageFormat.format("must be an integer from {0} to {1}.",
min, max);
15 years, 5 months
JBoss Tools SVN: r26377 - in trunk/esb/tests/org.jboss.tools.esb.validator.test: src/org/jboss/tools/esb/validator/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-11-09 09:42:33 -0500 (Tue, 09 Nov 2010)
New Revision: 26377
Modified:
trunk/esb/tests/org.jboss.tools.esb.validator.test/projects/esbTest/esbcontent/META-INF/jboss-esb-brp-broken.xml
trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java
Log:
JBIDE-7193
https://jira.jboss.org/browse/JBIDE-7193
Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/projects/esbTest/esbcontent/META-INF/jboss-esb-brp-broken.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/projects/esbTest/esbcontent/META-INF/jboss-esb-brp-broken.xml 2010-11-09 14:42:01 UTC (rev 26376)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/projects/esbTest/esbcontent/META-INF/jboss-esb-brp-broken.xml 2010-11-09 14:42:33 UTC (rev 26377)
@@ -57,6 +57,7 @@
<object-path esb="body.Policy"/>
<object-path esb="bod.Policy"/>
</property>
+ <property name="ruleMaxThreads" value="5"/>
</action>
<action class="org.jboss.soa.esb.actions.BusinessRulesProcessor" name="PolicyPricingRuleService">
<property name="decisionTable" value="decisionTable/PolicyPricing.xls"/>
Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java 2010-11-09 14:42:01 UTC (rev 26376)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java 2010-11-09 14:42:33 UTC (rev 26377)
@@ -42,12 +42,13 @@
}
public void testBusenessRulesProcessor() throws Exception {
- IFile file = project.getFile("esbcontent/META-INF/jboss-esb-brp-broken.xml");
+ IFile file = project.getFile("esbcontent/META-INF/jboss-esb-brp-broken.xml"); //$NON-NLS-1$
AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, ESBValidatorMessages.INVALID_RULE_SET_FOR_RULE_LANGUAGE, 52);
AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, ESBValidatorMessages.INVALID_RULE_AUDIT_TYPE_AND_INTERVAL, 34);
AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, ESBValidatorMessages.INVALID_OBJECT_PATH_WRONG_LOCATION, 58);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, ESBValidatorMessages.INVALID_RULE_MAX_THREADS, 60);
int markerNumbers = getMarkersNumber(file);
- assertEquals("jboss-esb-brp-broken.xml should have 2 error markers.", markerNumbers, 3);
+ assertEquals("jboss-esb-brp-broken.xml should have 4 error markers.", markerNumbers, 4);
}
/**
15 years, 5 months