JBoss Tools SVN: r20751 - trunk/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-03-10 18:30:34 -0500 (Wed, 10 Mar 2010)
New Revision: 20751
Modified:
trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
Log:
updated as per meeting on 20100304
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-03-10 23:09:46 UTC (rev 20750)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2010-03-10 23:30:34 UTC (rev 20751)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8' ?>
<section id="Issues-fixed-in-this-release">
<title>
- Issues fixed in this release
+ New and noteworthy features and bug fixes in this release
</title>
<para>
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r20750 - trunk/modeshape/releng.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-03-10 18:09:46 -0500 (Wed, 10 Mar 2010)
New Revision: 20750
Modified:
trunk/modeshape/releng/build.properties
Log:
hudson having network issues resolving eclipse mirrors, so just use zip
Modified: trunk/modeshape/releng/build.properties
===================================================================
--- trunk/modeshape/releng/build.properties 2010-03-10 22:39:55 UTC (rev 20749)
+++ trunk/modeshape/releng/build.properties 2010-03-10 23:09:46 UTC (rev 20750)
@@ -33,8 +33,8 @@
# To make the build go faster, use locally cached zips instead of galileo site
repositoryURLs=\
-http://download.eclipse.org/releases/galileo/,\
http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-3.5.2-20...
+#http://download.eclipse.org/releases/galileo/,\
IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r20749 - trunk/modeshape/releng.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-03-10 17:39:55 -0500 (Wed, 10 Mar 2010)
New Revision: 20749
Modified:
trunk/modeshape/releng/build.properties
Log:
enable local zip for faster rebuilding
Modified: trunk/modeshape/releng/build.properties
===================================================================
--- trunk/modeshape/releng/build.properties 2010-03-10 22:39:17 UTC (rev 20748)
+++ trunk/modeshape/releng/build.properties 2010-03-10 22:39:55 UTC (rev 20749)
@@ -33,8 +33,8 @@
# To make the build go faster, use locally cached zips instead of galileo site
repositoryURLs=\
-http://download.eclipse.org/releases/galileo/
-#http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-3.5.2-201002111343.zip,\
+http://download.eclipse.org/releases/galileo/,\
+http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-3.5.2-201002111343.zip
IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r20748 - trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-03-10 17:39:17 -0500 (Wed, 10 Mar 2010)
New Revision: 20748
Modified:
trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.xml
Log:
add eclipse test plugins to test feature
Modified: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.xml
===================================================================
--- trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.xml 2010-03-10 22:22:28 UTC (rev 20747)
+++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.xml 2010-03-10 22:39:17 UTC (rev 20748)
@@ -24,4 +24,17 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.ant.optional.junit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"/>
+
+ <plugin
+ id="org.eclipse.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
</feature>
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r20747 - trunk/modeshape/releng.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-03-10 17:22:28 -0500 (Wed, 10 Mar 2010)
New Revision: 20747
Modified:
trunk/modeshape/releng/build.properties
Log:
remove unneeded values and set to build from SVN
Modified: trunk/modeshape/releng/build.properties
===================================================================
--- trunk/modeshape/releng/build.properties 2010-03-10 22:13:13 UTC (rev 20746)
+++ trunk/modeshape/releng/build.properties 2010-03-10 22:22:28 UTC (rev 20747)
@@ -5,7 +5,6 @@
projectid=jbosstools.modeshape
zipPrefix=ModeShape
-buildType=N
version=1.0.0
#TODO: create mainFeatureToBuildID=org.jboss.tools.modeshape.rest.sdk.feature
@@ -25,10 +24,8 @@
# If building from local sources, need these paths defined.
# If building from SVN sources, comment these out or point them at this build's Hudson job's workspace paths
-localSourceCheckoutDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/modeshape
-relengBuilderDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/modeshape/releng
-relengBaseBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.releng.basebuilder
-relengCommonBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.dash.common.releng
+#localSourceCheckoutDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/modeshape
+#relengBuilderDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/modeshape/releng
JAVA14_HOME=${JAVA_HOME}
JAVA50_HOME=${JAVA_HOME}
@@ -38,15 +35,8 @@
repositoryURLs=\
http://download.eclipse.org/releases/galileo/
#http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-3.5.2-201002111343.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.2.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip
-#http://repository.jboss.org/eclipse/galileo/repos/orbit-R20100114021427-updateSite.zip,\
-#http://download.jboss.org/jbosstools/updates/nightly/trunk/,\
IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide
-#+org.eclipse.uml2.feature.group+org.eclipse.gef.feature.group+org.eclipse.emf.mapping+\
-#org.eclipse.xsd.feature.group+org.eclipse.xsd.edit+org.jdom+org.apache.xerces+\
-#org.eclipse.wst.wsdl.validation
flattenDependencies=true
parallelCompilation=true
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r20746 - in trunk/modeshape: releng and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-03-10 17:13:13 -0500 (Wed, 10 Mar 2010)
New Revision: 20746
Added:
trunk/modeshape/releng/
trunk/modeshape/releng/build.properties
trunk/modeshape/releng/build.xml
trunk/modeshape/releng/maps/
trunk/modeshape/releng/maps/project.map
trunk/modeshape/releng/maps/test.common.map
trunk/modeshape/releng/maps/test.eclipse.map
trunk/modeshape/releng/modeshape build.xml.launch
trunk/modeshape/releng/psfs/
trunk/modeshape/releng/psfs/project.subclipse.psf
trunk/modeshape/releng/psfs/project.subversive.psf
trunk/modeshape/releng/psfs/test.common.subclipse.psf
trunk/modeshape/releng/psfs/test.common.subversive.psf
trunk/modeshape/releng/psfs/test.eclipse.cvs.psf
trunk/modeshape/releng/testing.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-5318 first pass. to run tests as part of build, we'll need a testsuite class which includes all the tests you want to run
Property changes on: trunk/modeshape/releng
___________________________________________________________________
Name: svn:ignore
+ buildlog.latest.txt
Added: trunk/modeshape/releng/build.properties
===================================================================
--- trunk/modeshape/releng/build.properties (rev 0)
+++ trunk/modeshape/releng/build.properties 2010-03-10 22:13:13 UTC (rev 20746)
@@ -0,0 +1,67 @@
+## BEGIN PROJECT BUILD PROPERTIES ##
+
+# this property allows ant-contrib and pde-svn-plugin to be fetched and installed automatically for you
+thirdPartyDownloadLicenseAcceptance="I accept"
+
+projectid=jbosstools.modeshape
+zipPrefix=ModeShape
+buildType=N
+version=1.0.0
+
+#TODO: create mainFeatureToBuildID=org.jboss.tools.modeshape.rest.sdk.feature
+mainFeatureToBuildID=org.jboss.tools.modeshape.rest.feature
+testFeatureToBuildID=org.jboss.tools.modeshape.rest.test.feature
+
+# to (re)generate map and psfs, use these settings
+#build.steps=dir2svnmap,map2psf
+#dir2map.reporoot = http://anonsvn.jboss.org/repos
+#dir2map.repopath = jbosstools/trunk/modeshape
+#dir2map.dir = /home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/modeshape
+#dir2map.map = /home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/modeshape/releng/maps/project.map
+
+# on windows or mac, use testLocal; on linux use test (requires Xvnc or Xvfb)
+#build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup
+build.steps=buildUpdate,buildTests,generateDigests,publish,cleanup
+
+# If building from local sources, need these paths defined.
+# If building from SVN sources, comment these out or point them at this build's Hudson job's workspace paths
+localSourceCheckoutDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/modeshape
+relengBuilderDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/modeshape/releng
+relengBaseBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.releng.basebuilder
+relengCommonBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.dash.common.releng
+
+JAVA14_HOME=${JAVA_HOME}
+JAVA50_HOME=${JAVA_HOME}
+JAVA60_HOME=${JAVA_HOME}
+
+# To make the build go faster, use locally cached zips instead of galileo site
+repositoryURLs=\
+http://download.eclipse.org/releases/galileo/
+#http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-3.5.2-201002111343.zip,\
+#http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.2.zip,\
+#http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip
+#http://repository.jboss.org/eclipse/galileo/repos/orbit-R20100114021427-updateSite.zip,\
+#http://download.jboss.org/jbosstools/updates/nightly/trunk/,\
+
+IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide
+#+org.eclipse.uml2.feature.group+org.eclipse.gef.feature.group+org.eclipse.emf.mapping+\
+#org.eclipse.xsd.feature.group+org.eclipse.xsd.edit+org.jdom+org.apache.xerces+\
+#org.eclipse.wst.wsdl.validation
+
+flattenDependencies=true
+parallelCompilation=true
+generateFeatureVersionSuffix=true
+individualSourceBundles=true
+
+# don't suppress cleanup if tests fail
+noclean=false
+
+# do not sign or pack jars
+skipPack=true
+skipSign=true
+
+domainNamespace=*
+projNamespace=org.jboss.tools.modeshape.rest
+projRelengName=org.jboss.tools.modeshape.rest.releng
+
+## END PROJECT BUILD PROPERTIES ##
Property changes on: trunk/modeshape/releng/build.properties
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/modeshape/releng/build.xml
===================================================================
--- trunk/modeshape/releng/build.xml (rev 0)
+++ trunk/modeshape/releng/build.xml 2010-03-10 22:13:13 UTC (rev 20746)
@@ -0,0 +1,41 @@
+<!-- A sample build file for use with Hudson. Note that forceContextQualifier
+ is being set, which overrides tag/branch values found in *.map files
+-->
+<project default="run">
+ <target name="run">
+ <!-- 0. Set a valid path to JAVA_HOME, if Eclipse's ${java.home}/../bin/javac cannot be found
+ -->
+ <property name="JAVA_HOME" value="${java.home}/.." />
+
+ <tstamp>
+ <format property="buildTimestamp" pattern="yyyyMMddHHmm" />
+ </tstamp>
+ <property name="forceContextQualifier" value="v${buildTimestamp}" />
+
+ <!-- 1. Import these projects using File > Import > Team Project Set > ./psfs/athena.psf.
+ 2. Close the org.eclipse.releng.basebuilder project - it does not need to compile to be of use.
+ 3. You can also define absolute paths for these directories, if relative paths do not work.
+ -->
+ <condition property="relengCommonBuilderDir"
+ value="${basedir}/../../../org.eclipse.dash.common.releng"
+ else="${basedir}/../org.eclipse.dash.common.releng"
+ >
+ <available file="${basedir}/../../../org.eclipse.dash.common.releng" type="dir" />
+ </condition>
+ <condition property="relengBaseBuilderDir"
+ value="${basedir}/../../../org.eclipse.releng.basebuilder"
+ else="${basedir}/../org.eclipse.releng.basebuilder"
+ >
+ <available file="${basedir}/../../../org.eclipse.releng.basebuilder" type="dir" />
+ </condition>
+
+ <!-- 4. To build from CVS sources using information in the ./maps/*.map files, comment these next two properties
+ 5. Or, to build from sources in the workspace, use these properties. You can also use absolute paths if needed.
+ -->
+ <!-- <property name="localSourceCheckoutDir" value="${basedir}/.." />
+ <property name="relengBuilderDir" value="${basedir}" /> -->
+
+ <property file="build.properties" />
+ <ant antfile="${relengCommonBuilderDir}/build.xml" />
+ </target>
+</project>
Property changes on: trunk/modeshape/releng/build.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/modeshape/releng/maps/project.map
===================================================================
--- trunk/modeshape/releng/maps/project.map (rev 0)
+++ trunk/modeshape/releng/maps/project.map 2010-03-10 22:13:13 UTC (rev 20746)
@@ -0,0 +1,5 @@
+!*** Generated with org.eclipse.dash.common.releng/tools/scripts/buildAllHelper.xml#dir2svnmap task
+feature@org.jboss.tools.modeshape.rest.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature
+feature@org.jboss.tools.modeshape.rest.test.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature
+plugin@org.jboss.tools.modeshape.rest=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/modeshape/plugins/org.jboss.tools.modeshape.rest
+plugin@org.jboss.tools.modeshape.rest.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test
Added: trunk/modeshape/releng/maps/test.common.map
===================================================================
--- trunk/modeshape/releng/maps/test.common.map (rev 0)
+++ trunk/modeshape/releng/maps/test.common.map 2010-03-10 22:13:13 UTC (rev 20746)
@@ -0,0 +1,5 @@
+!*** required to run tests
+plugin@org.jboss.tools.common=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/common/plugins/org.jboss.tools.common
+plugin@org.jboss.tools.common.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/common/tests/org.jboss.tools.common.test
+
+plugin@org.jboss.tools.tests=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/tests/tests/org.jboss.tools.tests
Added: trunk/modeshape/releng/maps/test.eclipse.map
===================================================================
--- trunk/modeshape/releng/maps/test.eclipse.map (rev 0)
+++ trunk/modeshape/releng/maps/test.eclipse.map 2010-03-10 22:13:13 UTC (rev 20746)
@@ -0,0 +1,3 @@
+!*** required to run tests
+plugin@org.eclipse.test=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
+fragment@org.eclipse.ant.optional.junit=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
Added: trunk/modeshape/releng/modeshape build.xml.launch
===================================================================
--- trunk/modeshape/releng/modeshape build.xml.launch (rev 0)
+++ trunk/modeshape/releng/modeshape build.xml.launch 2010-03-10 22:13:13 UTC (rev 20746)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${container}"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/jbosstools-trunk/modeshape/releng/build.xml"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="${workspace_loc:/jbosstools-trunk/modeshape/releng}/buildlog.latest.txt"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jbosstools-trunk"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jbosstools-trunk/modeshape/releng/build.xml}"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+</launchConfiguration>
Added: trunk/modeshape/releng/psfs/project.subclipse.psf
===================================================================
--- trunk/modeshape/releng/psfs/project.subclipse.psf (rev 0)
+++ trunk/modeshape/releng/psfs/project.subclipse.psf 2010-03-10 22:13:13 UTC (rev 20746)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<psf version="2.0">
+<provider id="org.tigris.subversion.subclipse.core.svnnature">
+
+ <!-- !*** Generated with org.eclipse.dash.common.releng/tools/scripts/buildAllHelper.xml#dir2svnmap task -->
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/trunk/modeshape/features/..."/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/trunk/modeshape/features/..."/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/trunk/modeshape/plugins/o..."/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/trunk/modeshape/tests/org..."/>
+
+</provider>
+</psf>
Added: trunk/modeshape/releng/psfs/project.subversive.psf
===================================================================
--- trunk/modeshape/releng/psfs/project.subversive.psf (rev 0)
+++ trunk/modeshape/releng/psfs/project.subversive.psf 2010-03-10 22:13:13 UTC (rev 20746)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<psf version="2.0">
+<provider id="org.eclipse.team.svn.core.svnnature">
+
+ <!-- !*** Generated with org.eclipse.dash.common.releng/tools/scripts/buildAllHelper.xml#dir2svnmap task -->
+ <project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/trunk/modeshape/features/..."/>
+ <project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/trunk/modeshape/features/..."/>
+ <project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/trunk/modeshape/plugins/o..."/>
+ <project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/trunk/modeshape/tests/org..."/>
+
+</provider>
+</psf>
Added: trunk/modeshape/releng/psfs/test.common.subclipse.psf
===================================================================
--- trunk/modeshape/releng/psfs/test.common.subclipse.psf (rev 0)
+++ trunk/modeshape/releng/psfs/test.common.subclipse.psf 2010-03-10 22:13:13 UTC (rev 20746)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<psf version="2.0">
+<provider id="org.tigris.subversion.subclipse.core.svnnature">
+
+ <!-- !*** required to run tests -->
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/trunk/common/plugins/org...."/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/trunk/common/tests/org.jb..."/>
+
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos/jbosstools/trunk/tests/tests/org.jbo..."/>
+
+</provider>
+</psf>
Added: trunk/modeshape/releng/psfs/test.common.subversive.psf
===================================================================
--- trunk/modeshape/releng/psfs/test.common.subversive.psf (rev 0)
+++ trunk/modeshape/releng/psfs/test.common.subversive.psf 2010-03-10 22:13:13 UTC (rev 20746)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<psf version="2.0">
+<provider id="org.eclipse.team.svn.core.svnnature">
+
+ <!-- !*** required to run tests -->
+ <project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/trunk/common/plugins/org...."/>
+ <project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/trunk/common/tests/org.jb..."/>
+
+ <project reference="1.0.1,http://anonsvn.jboss.org/repos/jbosstools/trunk/tests/tests/org.jbo..."/>
+
+</provider>
+</psf>
Added: trunk/modeshape/releng/psfs/test.eclipse.cvs.psf
===================================================================
--- trunk/modeshape/releng/psfs/test.eclipse.cvs.psf (rev 0)
+++ trunk/modeshape/releng/psfs/test.eclipse.cvs.psf 2010-03-10 22:13:13 UTC (rev 20746)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<psf version="2.0">
+<provider id="org.eclipse.team.cvs.core.cvsnature">
+
+ <!-- !*** required to run tests -->
+ <project reference="1.0,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,org.eclipse.test,org.eclipse.test,HEAD"/>
+ <project reference="1.0,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,org.eclipse.ant.optional.junit,org.eclipse.ant.optional.junit,HEAD"/>
+
+</provider>
+</psf>
Added: trunk/modeshape/releng/testing.properties
===================================================================
--- trunk/modeshape/releng/testing.properties (rev 0)
+++ trunk/modeshape/releng/testing.properties 2010-03-10 22:13:13 UTC (rev 20746)
@@ -0,0 +1,10 @@
+#TODO: add/remove plugins from this csv list of test plugins to run
+testPluginsToRun=\
+org.jboss.tools.modeshape.rest.test
+
+# TODO: define which suite to run within each test plugin; or, include a test.xml script in
+# the test plugin to deviate from default one-suite-per-plugin operation
+org.jboss.tools.modeshape.rest.test.suite=org.jboss.tools.modeshape.rest.test.AllTests
+
+# could also add things like: -Xbootclasspath/a:/path/to/emma.jar ?
+Xflags= -Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r20745 - in trunk/modeshape/plugins/org.jboss.tools.modeshape.rest: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-03-10 17:00:51 -0500 (Wed, 10 Mar 2010)
New Revision: 20745
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/META-INF/MANIFEST.MF
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-5318 remove nested jar
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/META-INF/MANIFEST.MF
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/META-INF/MANIFEST.MF 2010-03-10 17:25:23 UTC (rev 20744)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/META-INF/MANIFEST.MF 2010-03-10 22:00:51 UTC (rev 20745)
@@ -15,7 +15,7 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: modeshape-web-jcr-rest-client-1.0.0-SNAPSHOT-jar-with-dependencies.jar,
- jcrRestClient.jar
+ .
Export-Package: org.jboss.tools.modeshape.rest,
org.modeshape.web.jcr.rest.client,
org.modeshape.web.jcr.rest.client.domain
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties 2010-03-10 17:25:23 UTC (rev 20744)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties 2010-03-10 22:00:51 UTC (rev 20745)
@@ -18,11 +18,11 @@
about.mappings,\
about.properties,\
feature.png,\
- jcrRestClient.jar,\
+ .,\
modeshape-web-jcr-rest-client-1.0.0-SNAPSHOT-jar-with-dependencies.jar,\
docs/,\
about.html
src.includes = src/
-jars.compile.order = jcrRestClient.jar
-source.jcrRestClient.jar = src/
-output.jcrRestClient.jar = bin/
+jars.compile.order = .
+source.. = src/
+output.. = bin/
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r20744 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test: tck and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-03-10 12:25:23 -0500 (Wed, 10 Mar 2010)
New Revision: 20744
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTestUtil.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5808
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java 2010-03-10 17:13:00 UTC (rev 20743)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSuite.java 2010-03-10 17:25:23 UTC (rev 20744)
@@ -15,6 +15,7 @@
import org.jboss.tools.cdi.core.test.tck.BeanDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.NameDefinitionTest;
+import org.jboss.tools.cdi.core.test.tck.QualifierDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.ValidationTest;
/**
@@ -26,6 +27,7 @@
TestSuite suite = new TestSuite("CDI Core Tests");
suite.addTestSuite(BeanDefinitionTest.class);
suite.addTestSuite(NameDefinitionTest.class);
+ suite.addTestSuite(QualifierDefinitionTest.class);
suite.addTestSuite(ValidationTest.class);
return suite;
}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2010-03-10 17:25:23 UTC (rev 20744)
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * 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.cdi.core.test.tck;
+
+import java.util.Set;
+
+import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IQualifier;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class QualifierDefinitionTest extends TCKTest {
+
+ /**
+ * section 2.3.1 a0)
+ * section 2.3.1 aa)
+ *
+ * @throws JavaModelException
+ */
+ public void testDefaultQualifierDeclaredInJava() throws JavaModelException {
+ Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.qualifier.Order");
+ assertEquals("Wrong number of beans with org.jboss.jsr299.tck.tests.definition.qualifier.Order type.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ Set<IQualifier> qualifiers = bean.getQualifiers();
+ assertEquals("Wrong number of qualifiers for org.jboss.jsr299.tck.tests.definition.qualifier.Order type.", 2, qualifiers.size());
+ assertContainsQualifierType(bean, "javax.enterprise.inject.Default");
+ assertContainsQualifierType(bean, "javax.enterprise.inject.Any");
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-03-10 17:13:00 UTC (rev 20743)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-03-10 17:25:23 UTC (rev 20744)
@@ -18,6 +18,7 @@
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IParametedType;
+import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.common.EclipseUtil;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.text.ITextSourceReference;
@@ -159,6 +160,19 @@
fail(bean.getResource().getFullPath() + " bean " + allTypes.toString() + " should have " + typeName + " type.");
}
+ protected void assertContainsQualifierType(IBean bean, String typeName) {
+ Set<IQualifier> qualifiers = bean.getQualifiers();
+ StringBuffer allTypes = new StringBuffer("[");
+ for (IQualifier qualifier : qualifiers) {
+ allTypes.append(" ").append(qualifier.getSourceType().getFullyQualifiedName()).append(";");
+ if (typeName.equals(qualifier.getSourceType().getFullyQualifiedName())) {
+ return;
+ }
+ }
+ allTypes.append("]");
+ fail(bean.getResource().getFullPath() + " bean (qualifiers - " + allTypes.toString() + ") should have the qualifier with " + typeName + " type.");
+ }
+
public static void assertLocationEquals(ITextSourceReference reference, int startPosition, int length) {
assertEquals("Wrong start position", startPosition, reference.getStartPosition());
assertEquals("Wrong length", length, reference.getLength());
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTestUtil.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTestUtil.java 2010-03-10 17:13:00 UTC (rev 20743)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTestUtil.java 2010-03-10 17:25:23 UTC (rev 20744)
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * 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.cdi.core.test.tck;
-
-/**
- * @author Alexey Kazakov
- */
-public class TCKTestUtil {
-
-}
\ No newline at end of file
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r20743 - trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-03-10 12:13:00 -0500 (Wed, 10 Mar 2010)
New Revision: 20743
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutswebapp.meta
trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/webapp30.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5975
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutswebapp.meta
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutswebapp.meta 2010-03-10 16:39:54 UTC (rev 20742)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutswebapp.meta 2010-03-10 17:13:00 UTC (rev 20743)
@@ -917,6 +917,8 @@
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
<XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
+ <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
+ ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
</XActionItem>
<XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
<XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
@@ -976,7 +978,7 @@
</XActionItem>
<XDependencies/>
</XModelEntity>
- <XModelEntity ImplementingClass="%Ordered%"
+ <XModelEntity ImplementingClass="%WebAppAuxFolder%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jst.web.ui.editors.webapp.form.WebAppFormLayoutData" name="WebAppFolderContextParams">
<XChildrenEntities>
<XChildEntity name="WebAppContextParam"/>
@@ -990,7 +992,8 @@
<XModelAttribute default="context params" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
- <XModelAttribute default="Context Params" name="name" xmlname="NAME">
+ <XModelAttribute PROPERTIES="id=true" default="Context Params"
+ name="name" xmlname="NAME">
<Editor name="Uneditable"/>
</XModelAttribute>
</XModelAttributes>
@@ -1028,7 +1031,7 @@
</XActionItem>
<XDependencies/>
</XModelEntity>
- <XModelEntity ImplementingClass="%Custom%"
+ <XModelEntity ImplementingClass="%WebAppAuxFolder%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jst.web.ui.editors.webapp.form.WebAppFormLayoutData;children=%Ordered%" name="WebAppFolderEJB">
<XChildrenEntities>
<XChildEntity name="WebAppEjbRef"/>
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/webapp30.meta
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/webapp30.meta 2010-03-10 16:39:54 UTC (rev 20742)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/webapp30.meta 2010-03-10 17:13:00 UTC (rev 20743)
@@ -80,24 +80,9 @@
name="xsi:schemaLocation" xmlname="xsi:schemaLocation"/>
<XModelAttribute PROPERTIES="save=always" default="3.0"
name="version" visibility="false" xmlname="version"/>
- <XModelAttribute PROPERTIES="category=advanced" name="small-icon" xmlname="icon.small-icon.#text">
- <Constraint loader="Tree">
- <value name="WebPageTree"/>
- <value name="extensions=gif,jpg"/>
- </Constraint>
- <Editor name="TreeChooser"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="category=advanced" name="large-icon" xmlname="icon.large-icon.#text">
- <Constraint loader="Tree">
- <value name="WebPageTree"/>
- <value name="extensions=gif,jpg"/>
- </Constraint>
- <Editor name="TreeChooser"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="category=general" name="display-name" xmlname="display-name.#text"/>
- <XModelAttribute PROPERTIES="category=general" name="description" xmlname="description.#text">
- <Editor name="Note"/>
- </XModelAttribute>
+ <XModelAttributeReference
+ attributes="description,display-name,small-icon,large-icon"
+ entity="WebAppFilter" name="description"/>
<XModelAttribute PROPERTIES="category=advanced" default="no"
name="distributable" xmlname="distributable">
<Constraint loader="List">
@@ -283,51 +268,13 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem kind="list" name="EditActions">
- <XActionItem HIDE="always" HandlerClassName="%RenameFile%"
- ICON="action.empty" PROPERTIES="validator.edit=true"
- WizardClassName="%Default%" displayName="Rename..." kind="action" name="Rename">
- <EntityData EntityName="FileWebApp">
- <AttributeData AttributeName="name"/>
- </EntityData>
- </XActionItem>
- <XActionItem
- HandlerClassName="org.jboss.tools.common.model.filesystems.impl.handlers.RenameEclipseFileHandler"
- ICON="action.empty" displayName="Rename..." kind="action" name="RenameEclipse"/>
- </XActionItem>
- <XActionItem kind="list" name="SaveActions">
- <XActionItem HIDE="always" HandlerClassName="%SaveFile%"
- ICON="action.save" displayName="Save" kind="action" name="Save"/>
- <XActionItem
- HandlerClassName="org.jboss.tools.jst.web.model.handlers.ResetFileDateHandler"
- ICON="action.save" displayName="Change Timestamp" kind="action" name="ChangeTimeStamp"/>
- </XActionItem>
- <XActionItem HIDE="always"
- HandlerClassName="org.jboss.tools.jst.web.tld.model.handlers.ExpandTLDHandler"
- ICON="action.empty" displayName="Set Expanded" kind="action" name="SetExpanded"/>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
- <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
- ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%DeleteFile%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem kind="list" name="DiscardActions">
- <XActionItem HIDE="always"
- HandlerClassName="org.jboss.tools.common.model.filesystems.impl.DiscardFileHandler"
- ICON="action.delete"
- PROPERTIES="significanceMessageClass=org.jboss.tools.common.model.filesystems.impl.DiscardFileSignificanceMessage"
- displayName="Discard Changes" kind="action" name="Discard"/>
- </XActionItem>
+ <XActionItemReference entity="FileWebApp" name="EditActions"/>
+ <XActionItemReference entity="FileWebApp" name="SaveActions"/>
+ <XActionItemReference entity="FileWebApp" name="SetExpanded"/>
+ <XActionItemReference entity="FileWebApp" name="CopyActions"/>
+ <XActionItemReference entity="FileWebApp" name="DeleteActions"/>
+ <XActionItemReference entity="FileWebApp" name="Properties"/>
+ <XActionItemReference entity="FileWebApp" name="DiscardActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -336,175 +283,12 @@
<XEntityRenderer/>
<XModelAttributes/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.mime_mapping"
- PROPERTIES="validator.add=true;sourcepath=Absolute Orderings;actionpath=CreateActions/CreateAbsoluteOrdering"
- WizardClassName="%Default%" displayName="Absolute Ordering..."
- kind="action" name="CreateAbsoluteOrdering"/>
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.param"
- PROPERTIES="validator.add=true;sourcepath=Context Params;actionpath=CreateActions/CreateContextParam"
- WizardClassName="%Default%" displayName="Context Param..."
- kind="action" name="CreateContextParam"/>
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.param"
- PROPERTIES="validator.add=true;sourcepath=Data Sources;actionpath=CreateActions/CreateDataSource"
- WizardClassName="%Default%" displayName="Data Source..."
- kind="action" name="CreateDataSource"/>
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.filter"
- PROPERTIES="validator.add=true;sourcepath=Filters;actionpath=CreateActions/CreateFilter"
- WizardClassName="%Default%" displayName="Filter..." kind="action" name="CreateFilter"/>
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.filter_mapping"
- PROPERTIES="validator.add=true;sourcepath=Filters;actionpath=CreateActions/CreateFilterMapping"
- WizardClassName="%Default%" displayName="Filter Mapping..."
- kind="action" name="CreateFilterMapping"/>
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.listener"
- PROPERTIES="validator.add=true;sourcepath=Listeners;actionpath=CreateActions/CreateListener"
- WizardClassName="%Default%" displayName="Listener..." kind="action" name="CreateListener"/>
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.servlet"
- PROPERTIES="validator.add=true;sourcepath=Servlets;actionpath=CreateActions/CreateServlet"
- WizardClassName="%Default%" displayName="Servlet..." kind="action" name="CreateServlet"/>
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.servlet_mapping"
- PROPERTIES="validator.add=true;sourcepath=Servlets;actionpath=CreateActions/CreateServletMapping"
- WizardClassName="%Default%" displayName="Servlet Mapping..."
- kind="action" name="CreateServletMapping"/>
- <XActionItem HIDE="always" HandlerClassName="%Create%"
- ICON="action.new.struts.webapp.session"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Session Config..." kind="action" name="CreateSessionConfig">
- <EntityData EntityName="WebAppSessionConfig">
- <AttributeData AttributeName="session-timeout" Mandatory="no"/>
- </EntityData>
- </XActionItem>
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.mime_mapping"
- PROPERTIES="validator.add=true;sourcepath=Mime Mappings;actionpath=CreateActions/CreateMimeMapping"
- WizardClassName="%Default%" displayName="Mime Mapping..."
- kind="action" name="CreateMimeMapping"/>
- <XActionItem HIDE="always" HandlerClassName="%Create%"
- ICON="action.new.struts.webapp.welcom_list"
- displayName="Welcome File List" kind="action" name="CreateWelcomeFileList">
- <EntityData EntityName="WebAppWelcomFileList"/>
- </XActionItem>
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.error"
- PROPERTIES="validator.add=true;sourcepath=Error Pages;actionpath=CreateActions/CreateErrorPage"
- displayName="Error Page..." kind="action" name="CreateErrorPage"/>
- <XActionItem HIDE="always" HandlerClassName="%Create%"
- ICON="action.new.struts.webapp.taglib"
- PROPERTIES="validator.add=true" displayName="JSP Config..."
- kind="action" name="CreateJspConfig">
- <EntityData EntityName="WebAppJspConfig"/>
- </XActionItem>
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.security_constraint"
- PROPERTIES="validator.add=true;sourcepath=Security Constraints;actionpath=CreateActions/CreateSecurityConstraint"
- WizardClassName="%Default%" displayName="Security Constraint..."
- kind="action" name="CreateSecurityConstraint"/>
- <XActionItem HIDE="always" HandlerClassName="%Create%"
- ICON="action.new.struts.webapp.login_config"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Login Config..." kind="action" name="CreateLoginConfig">
- <EntityData EntityName="WebAppLoginConfig">
- <AttributeData AttributeName="auth-method" Mandatory="no"/>
- <AttributeData AttributeName="realm-name" Mandatory="no"/>
- <AttributeData AttributeName="form-login-page" Mandatory="no"/>
- <AttributeData AttributeName="form-error-page" Mandatory="no"/>
- </EntityData>
- </XActionItem>
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.security_role"
- PROPERTIES="validator.add=true;sourcepath=Security Roles;actionpath=CreateActions/CreateSecurityRole"
- WizardClassName="%Default%" displayName="Security Role..."
- kind="action" name="CreateSecurityRole"/>
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.env_entry"
- PROPERTIES="validator.add=true;sourcepath=Env Entries;actionpath=CreateActions/CreateEnvEntry"
- WizardClassName="%Default%" displayName="Env Entry..."
- kind="action" name="CreateEnvEntry"/>
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.ejb_reference"
- PROPERTIES="validator.add=true;sourcepath=EJB;actionpath=CreateActions/CreateEjbRef"
- WizardClassName="%Default%" displayName="Ejb Ref..." kind="action" name="CreateEjbRef"/>
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.ejb_local_reference"
- PROPERTIES="validator.add=true;sourcepath=EJB;actionpath=CreateActions/CreateEjbLocalRef"
- WizardClassName="%Default%" displayName="Ejb Local Ref..."
- kind="action" name="CreateEjbLocalRef"/>
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.service"
- PROPERTIES="validator.add=true;sourcepath=Services;actionpath=CreateActions/CreateServiceRef"
- WizardClassName="%Default%" displayName="Service Ref..."
- kind="action" name="CreateServiceRef"/>
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.res_env_ref"
- PROPERTIES="validator.add=true;sourcepath=Resources;actionpath=CreateActions/CreateResourceEnvRef"
- WizardClassName="%Default%" displayName="Resource Env Ref..."
- kind="action" name="CreateResourceEnvRef"/>
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.res_ref"
- PROPERTIES="validator.add=true;sourcepath=Resources;actionpath=CreateActions/CreateResourceRef"
- WizardClassName="%Default%" displayName="Resource Ref..."
- kind="action" name="CreateResourceRef"/>
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.message"
- PROPERTIES="validator.add=true;sourcepath=Message Destinations;actionpath=CreateActions/CreateServiceMessageDestinationRef"
- WizardClassName="%Default%"
- displayName="Message Destination Ref..." kind="action" name="CreateServiceMessageDestinationRef"/>
- <XActionItem HandlerClassName="%Redirect%"
- ICON="action.new.struts.webapp.message"
- PROPERTIES="validator.add=true;sourcepath=Message Destinations;actionpath=CreateActions/CreateServiceMessageDestination"
- WizardClassName="%Default%" displayName="Message Destination..."
- kind="action" name="CreateServiceMessageDestination"/>
- <XActionItem HIDE="always" HandlerClassName="%Create%"
- ICON="action.new.struts.webapp.taglib"
- PROPERTIES="validator.add=true"
- displayName="Locale Encoding Mapping List..." kind="action" name="CreateLocaleEncodingMappingList">
- <EntityData EntityName="WebAppLocaleEncodingMappingList"/>
- </XActionItem>
- </XActionItem>
- <XActionItem kind="list" name="EditActions">
- <XActionItem HandlerClassName="%RenameFile%" ICON="action.empty"
- PROPERTIES="validator.edit=true" WizardClassName="%Default%"
- displayName="Rename..." kind="action" name="Rename">
- <EntityData EntityName="FileWebApp">
- <AttributeData AttributeName="name"/>
- </EntityData>
- </XActionItem>
- </XActionItem>
- <XActionItem kind="list" name="SaveActions">
- <XActionItem HIDE="always" HandlerClassName="%SaveFile%"
- ICON="action.save" displayName="Save" kind="action" name="Save"/>
- <XActionItem
- HandlerClassName="org.jboss.tools.jst.web.model.handlers.ResetFileDateHandler"
- ICON="action.save" displayName="Change Timestamp" kind="action" name="ChangeTimeStamp"/>
- </XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
- <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
- ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem kind="list" name="DiscardActions">
- <XActionItem HIDE="always"
- HandlerClassName="org.jboss.tools.common.model.filesystems.impl.DiscardFileHandler"
- ICON="action.delete"
- PROPERTIES="significanceMessageClass=org.jboss.tools.common.model.filesystems.impl.DiscardFileSignificanceMessage"
- displayName="Discard Changes" kind="action" name="Discard"/>
- </XActionItem>
+ <XActionItemReference entity="FileWebApp30" name="CreateActions"/>
+ <XActionItemReference entity="FileWebApp" name="EditActions"/>
+ <XActionItemReference entity="FileWebApp" name="SaveActions"/>
+ <XActionItemReference entity="FileWebApp_EditorActionList" name="CopyActions"/>
+ <XActionItemReference entity="FileWebApp" name="Properties"/>
+ <XActionItemReference entity="FileWebApp" name="DiscardActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -541,24 +325,10 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFilter" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFilter" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFilter" name="Properties"/>
+ <XActionItemReference entity="WebAppFilter" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -603,24 +373,10 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppContextParam" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFilter" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFilter" name="Properties"/>
+ <XActionItemReference entity="WebAppFilter" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -703,24 +459,10 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFilter" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFilter" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFilter" name="Properties"/>
+ <XActionItemReference entity="WebAppFilter" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -775,26 +517,10 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
- ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFilter" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFilter" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFilter" name="Properties"/>
+ <XActionItemReference entity="WebAppFilter" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -849,26 +575,10 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
- ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFilter" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFilter" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFilter" name="Properties"/>
+ <XActionItemReference entity="WebAppFilter" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -920,24 +630,10 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFilter" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFilter" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFilter" name="Properties"/>
+ <XActionItemReference entity="WebAppFilter" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -957,24 +653,9 @@
<XModelAttribute default="filter" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
- <XModelAttribute PROPERTIES="category=advanced" name="description" xmlname="description.#text">
- <Editor name="Note"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="category=advanced" name="display-name" xmlname="display-name.#text"/>
- <XModelAttribute PROPERTIES="category=advanced" name="small-icon" xmlname="icon.small-icon.#text">
- <Constraint loader="Tree">
- <value name="WebPageTree"/>
- <value name="extensions=gif,jpg"/>
- </Constraint>
- <Editor name="TreeChooser"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="category=advanced" name="large-icon" xmlname="icon.large-icon.#text">
- <Constraint loader="Tree">
- <value name="WebPageTree"/>
- <value name="extensions=gif,jpg"/>
- </Constraint>
- <Editor name="TreeChooser"/>
- </XModelAttribute>
+ <XModelAttributeReference
+ attributes="description,display-name,small-icon,large-icon"
+ entity="WebAppFilter" name="description"/>
<XModelAttribute PROPERTIES="id=true;save=always;category=general"
name="filter-name" xmlname="filter-name.#text"/>
<XModelAttribute PROPERTIES="save=always;category=general"
@@ -1007,24 +688,10 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFilter" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFilter" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFilter" name="Properties"/>
+ <XActionItemReference entity="WebAppFilter" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -1060,23 +727,9 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
- <XActionItem BaseActionName="Copy" HandlerClassName="%CopyChildren%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
- ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
- </XActionItem>
- <XActionItem kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete"
- HandlerClassName="%DeleteChildren%" ICON="action.delete"
- displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFolderContextParams" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="Properties"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -1111,23 +764,9 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
- <XActionItem BaseActionName="Copy" HandlerClassName="%CopyChildren%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
- ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
- </XActionItem>
- <XActionItem kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete"
- HandlerClassName="%DeleteChildren%" ICON="action.delete"
- displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFolderContextParams" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="Properties"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -1178,23 +817,9 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
- <XActionItem BaseActionName="Copy" HandlerClassName="%CopyChildren%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
- ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
- </XActionItem>
- <XActionItem kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete"
- HandlerClassName="%DeleteChildren%" ICON="action.delete"
- displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFolderContextParams" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="Properties"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -1231,23 +856,9 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
- <XActionItem BaseActionName="Copy" HandlerClassName="%CopyChildren%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
- ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
- </XActionItem>
- <XActionItem kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete"
- HandlerClassName="%DeleteChildren%" ICON="action.delete"
- displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFolderContextParams" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="Properties"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -1296,23 +907,9 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
- <XActionItem BaseActionName="Copy" HandlerClassName="%CopyChildren%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
- ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
- </XActionItem>
- <XActionItem kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete"
- HandlerClassName="%DeleteChildren%" ICON="action.delete"
- displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFolderContextParams" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="Properties"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -1358,23 +955,9 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
- <XActionItem BaseActionName="Copy" HandlerClassName="%CopyChildren%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
- ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
- </XActionItem>
- <XActionItem kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete"
- HandlerClassName="%DeleteChildren%" ICON="action.delete"
- displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFolderContextParams" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="Properties"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -1421,23 +1004,9 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
- <XActionItem BaseActionName="Copy" HandlerClassName="%CopyChildren%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
- ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
- </XActionItem>
- <XActionItem kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete"
- HandlerClassName="%DeleteChildren%" ICON="action.delete"
- displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFolderContextParams" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="Properties"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -1472,23 +1041,9 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
- <XActionItem BaseActionName="Copy" HandlerClassName="%CopyChildren%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
- ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
- </XActionItem>
- <XActionItem kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete"
- HandlerClassName="%DeleteChildren%" ICON="action.delete"
- displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFolderContextParams" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="Properties"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -1523,23 +1078,9 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
- <XActionItem BaseActionName="Copy" HandlerClassName="%CopyChildren%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
- ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
- </XActionItem>
- <XActionItem kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete"
- HandlerClassName="%DeleteChildren%" ICON="action.delete"
- displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFolderContextParams" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="Properties"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -1586,23 +1127,9 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
- <XActionItem BaseActionName="Copy" HandlerClassName="%CopyChildren%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
- ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
- </XActionItem>
- <XActionItem kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete"
- HandlerClassName="%DeleteChildren%" ICON="action.delete"
- displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFolderContextParams" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="Properties"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -1624,24 +1151,9 @@
<XModelAttribute default="handler" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
- <XModelAttribute PROPERTIES="category=general" name="description" xmlname="description.#text">
- <Editor name="Note"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="category=general" name="display-name" xmlname="display-name.#text"/>
- <XModelAttribute PROPERTIES="category=advanced" name="small-icon" xmlname="icon.small-icon.#text">
- <Constraint loader="Tree">
- <value name="WebPageTree"/>
- <value name="extensions=gif,jpg"/>
- </Constraint>
- <Editor name="TreeChooser"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="category=advanced" name="large-icon" xmlname="icon.large-icon.#text">
- <Constraint loader="Tree">
- <value name="WebPageTree"/>
- <value name="extensions=gif,jpg"/>
- </Constraint>
- <Editor name="TreeChooser"/>
- </XModelAttribute>
+ <XModelAttributeReference
+ attributes="description,display-name,small-icon,large-icon"
+ entity="WebAppFilter" name="description"/>
<XModelAttribute PROPERTIES="save=always;category=general"
name="handler-name" xmlname="handler-name.#text"/>
<XModelAttribute PROPERTIES="save=always;category=general"
@@ -1690,26 +1202,10 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
- ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFilter" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFilter" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFilter" name="Properties"/>
+ <XActionItemReference entity="WebAppFilter" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -1729,24 +1225,9 @@
<XModelAttribute name="name" visibility="false" xmlname="#text">
<Editor name="Note"/>
</XModelAttribute>
- <XModelAttribute PROPERTIES="category=advanced" name="description" xmlname="description.#text">
- <Editor name="Note"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="category=advanced" name="display-name" xmlname="display-name.#text"/>
- <XModelAttribute PROPERTIES="category=advanced" name="small-icon" xmlname="icon.small-icon.#text">
- <Constraint loader="Tree">
- <value name="WebPageTree"/>
- <value name="extensions=gif,jpg"/>
- </Constraint>
- <Editor name="TreeChooser"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="category=advanced" name="large-icon" xmlname="icon.large-icon.#text">
- <Constraint loader="Tree">
- <value name="WebPageTree"/>
- <value name="extensions=gif,jpg"/>
- </Constraint>
- <Editor name="TreeChooser"/>
- </XModelAttribute>
+ <XModelAttributeReference
+ attributes="description,display-name,small-icon,large-icon"
+ entity="WebAppFilter" name="description"/>
<XModelAttribute PROPERTIES="id=true;save=always;category=general"
name="url-pattern" xmlname="url-pattern.#text"/>
<XModelAttribute PROPERTIES="category=general" name="el-ignored" xmlname="el-ignored.#text">
@@ -1806,24 +1287,10 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppContextParam" name="CopyActions"/>
+ <XActionItemReference entity="WebAppContextParam" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppContextParam" name="Properties"/>
+ <XActionItemReference entity="WebAppContextParam" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -1870,25 +1337,10 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete"
- HandlerClassName="%DeleteChildren%" ICON="action.delete"
- displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFolderContextParams" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFilter" name="Properties"/>
+ <XActionItemReference entity="WebAppFilter" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -1905,24 +1357,9 @@
<XModelAttribute default="message destination" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
- <XModelAttribute name="description" xmlname="description.#text">
- <Editor name="Note"/>
- </XModelAttribute>
- <XModelAttribute name="display-name" xmlname="display-name.#text"/>
- <XModelAttribute name="small-icon" xmlname="icon.small-icon.#text">
- <Constraint loader="Tree">
- <value name="WebPageTree"/>
- <value name="extensions=gif,jpg"/>
- </Constraint>
- <Editor name="TreeChooser"/>
- </XModelAttribute>
- <XModelAttribute name="large-icon" xmlname="icon.large-icon.#text">
- <Constraint loader="Tree">
- <value name="WebPageTree"/>
- <value name="extensions=gif,jpg"/>
- </Constraint>
- <Editor name="TreeChooser"/>
- </XModelAttribute>
+ <XModelAttributeReference
+ attributes="description,display-name,small-icon,large-icon"
+ entity="WebAppFilter" name="description"/>
<XModelAttribute PROPERTIES="save=always;id=true"
name="message-destination-name" xmlname="message-destination-name.#text"/>
<XModelAttribute PROPERTIES="category=general" name="mapped-name" xmlname="mapped-name.#text"/>
@@ -1933,24 +1370,10 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppContextParam" name="CopyActions"/>
+ <XActionItemReference entity="WebAppContextParam" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppContextParam" name="Properties"/>
+ <XActionItemReference entity="WebAppContextParam" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -2008,24 +1431,10 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFilter" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFilter" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFilter" name="Properties"/>
+ <XActionItemReference entity="WebAppFilter" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -2041,45 +1450,20 @@
<XModelAttribute default="multipart config" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
- <XModelAttribute PROPERTIES="id=true;save=always" name="location" xmlname="location.#text">
- <Constraint loader="JavaName"/>
- <Editor name="Name"/>
- </XModelAttribute>
- <XModelAttribute name="max-file-size" xmlname="max-file-size.#text">
- <Editor name="Note"/>
- </XModelAttribute>
- <XModelAttribute name="max-request-size" xmlname="max-request-size.#text">
- <Constraint loader="ListString"/>
- <Editor name="WebRoleList"/>
- </XModelAttribute>
- <XModelAttribute name="file-size-threshold" xmlname="file-size-threshold.#text">
- <Constraint loader="ListString"/>
- <Editor name="WebRoleList"/>
- </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;save=always" name="location" xmlname="location.#text"/>
+ <XModelAttribute name="max-file-size" xmlname="max-file-size.#text"/>
+ <XModelAttribute name="max-request-size" xmlname="max-request-size.#text"/>
+ <XModelAttribute name="file-size-threshold" xmlname="file-size-threshold.#text"/>
<XModelAttribute name="id" xmlname="id"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppContextParam" name="CopyActions"/>
+ <XActionItemReference entity="WebAppContextParam" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppContextParam" name="Properties"/>
+ <XActionItemReference entity="WebAppContextParam" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -2152,24 +1536,10 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppContextParam" name="CopyActions"/>
+ <XActionItemReference entity="WebAppContextParam" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppContextParam" name="Properties"/>
+ <XActionItemReference entity="WebAppContextParam" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -2194,24 +1564,10 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppContextParam" name="CopyActions"/>
+ <XActionItemReference entity="WebAppContextParam" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppContextParam" name="Properties"/>
+ <XActionItemReference entity="WebAppContextParam" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -2240,24 +1596,10 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppContextParam" name="CopyActions"/>
+ <XActionItemReference entity="WebAppContextParam" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppContextParam" name="Properties"/>
+ <XActionItemReference entity="WebAppContextParam" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -2309,24 +1651,10 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppContextParam" name="CopyActions"/>
+ <XActionItemReference entity="WebAppContextParam" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppContextParam" name="Properties"/>
+ <XActionItemReference entity="WebAppContextParam" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -2374,24 +1702,10 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFilter" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFilter" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFilter" name="Properties"/>
+ <XActionItemReference entity="WebAppFilter" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -2451,24 +1765,10 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFilter" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFilter" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFilter" name="Properties"/>
+ <XActionItemReference entity="WebAppFilter" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -2524,26 +1824,10 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
- ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFilter" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFilter" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFilter" name="Properties"/>
+ <XActionItemReference entity="WebAppFilter" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -2564,24 +1848,9 @@
<XModelAttribute default="service reference" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
- <XModelAttribute PROPERTIES="category=general" name="description" xmlname="description.#text">
- <Editor name="Note"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="category=general" name="display-name" xmlname="display-name.#text"/>
- <XModelAttribute PROPERTIES="category=advanced" name="small-icon" xmlname="icon.small-icon.#text">
- <Constraint loader="Tree">
- <value name="WebPageTree"/>
- <value name="extensions=gif,jpg"/>
- </Constraint>
- <Editor name="TreeChooser"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="category=advanced" name="large-icon" xmlname="icon.large-icon.#text">
- <Constraint loader="Tree">
- <value name="WebPageTree"/>
- <value name="extensions=gif,jpg"/>
- </Constraint>
- <Editor name="TreeChooser"/>
- </XModelAttribute>
+ <XModelAttributeReference
+ attributes="description,display-name,small-icon,large-icon"
+ entity="WebAppFilter" name="description"/>
<XModelAttribute PROPERTIES="save=always;category=general;id=true"
name="service-ref-name" xmlname="service-ref-name.#text"/>
<XModelAttribute PROPERTIES="save=always;category=general"
@@ -2626,24 +1895,10 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFilter" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFilter" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFilter" name="Properties"/>
+ <XActionItemReference entity="WebAppFilter" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -2666,26 +1921,11 @@
<XModelAttribute default="servlet" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
- <XModelAttribute PROPERTIES="category=advanced" name="small-icon" xmlname="icon.small-icon.#text">
- <Constraint loader="Tree">
- <value name="WebPageTree"/>
- <value name="extensions=gif,jpg"/>
- </Constraint>
- <Editor name="TreeChooser"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="category=advanced" name="large-icon" xmlname="icon.large-icon.#text">
- <Constraint loader="Tree">
- <value name="WebPageTree"/>
- <value name="extensions=gif,jpg"/>
- </Constraint>
- <Editor name="TreeChooser"/>
- </XModelAttribute>
+ <XModelAttributeReference
+ attributes="description,display-name,small-icon,large-icon"
+ entity="WebAppFilter" name="description"/>
<XModelAttribute PROPERTIES="id=true;save=always;category=general"
name="servlet-name" xmlname="servlet-name.#text"/>
- <XModelAttribute PROPERTIES="category=advanced" name="display-name" xmlname="display-name.#text"/>
- <XModelAttribute PROPERTIES="category=advanced" name="description" xmlname="description.#text">
- <Editor name="Note"/>
- </XModelAttribute>
<XModelAttribute PROPERTIES="category=general" name="servlet-class" xmlname="servlet-class.#text">
<Editor name="AccessibleJava"/>
</XModelAttribute>
@@ -2760,26 +2000,10 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
- ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFilter" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFilter" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFilter" name="Properties"/>
+ <XActionItemReference entity="WebAppFilter" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -2826,21 +2050,10 @@
</EntityData>
</XActionItem>
</XActionItem>
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"/>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppFolderContextParams" name="CopyActions"/>
+ <XActionItemReference entity="WebAppFolderContextParams" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppFilter" name="Properties"/>
+ <XActionItemReference entity="WebAppFilter" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -2865,24 +2078,10 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppContextParam" name="CopyActions"/>
+ <XActionItemReference entity="WebAppContextParam" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppContextParam" name="Properties"/>
+ <XActionItemReference entity="WebAppContextParam" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -2907,24 +2106,10 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
- <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
- <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
- ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
- <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
- ICON="action.copy" displayName="Cut" kind="action" name="Cut"/>
- </XActionItem>
- <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
- ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
- </XActionItem>
- <XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
- </XActionItem>
- <XActionItem displayName="move" kind="list" name="MoveActions">
- <XActionItem HIDE="always" HandlerClassName="%Move%"
- ICON="action.move" displayName="Move" kind="action" name="Move"/>
- </XActionItem>
+ <XActionItemReference entity="WebAppContextParam" name="CopyActions"/>
+ <XActionItemReference entity="WebAppContextParam" name="DeleteActions"/>
+ <XActionItemReference entity="WebAppContextParam" name="Properties"/>
+ <XActionItemReference entity="WebAppContextParam" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r20742 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-03-10 11:39:54 -0500 (Wed, 10 Mar 2010)
New Revision: 20742
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NameDefinitionTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5808
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NameDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NameDefinitionTest.java 2010-03-10 16:36:41 UTC (rev 20741)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NameDefinitionTest.java 2010-03-10 16:39:54 UTC (rev 20742)
@@ -30,13 +30,41 @@
// IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/name/Moose.java");
// Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.name.Moose");
- assertEquals("org.jboss.jsr299.tck.tests.definition.name.Moose should have the only bean.", 1, beans.size());
+ assertEquals("There should be the only bean with org.jboss.jsr299.tck.tests.definition.name.Moose type.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong EL name of org.jboss.jsr299.tck.tests.definition.name.Moose bean.", "aMoose", bean.getName());
assertLocationEquals(bean.getNameLocation(), 918, 16);
}
/**
+ * section 2.5.2 a)
+ * section 3.1.5 a)
+ * section 2.5.1 d)
+ *
+ * @throws JavaModelException
+ */
+ public void testDefaultNamed() throws JavaModelException {
+ Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.name.Haddock");
+ assertEquals("There should be the only bean with org.jboss.jsr299.tck.tests.definition.name.Haddock type.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ assertNotNull("org.jboss.jsr299.tck.tests.definition.name.Haddock bean should have an EL name.", bean.getName());
+ assertEquals("Wrong EL name of org.jboss.jsr299.tck.tests.definition.name.Haddock bean.", "haddock", bean.getName());
+ }
+
+ /**
+ * section 2.7 a)
+ * section 2.7.1.3 aaa)
+ *
+ * @throws JavaModelException
+ */
+ public void testStereotypeDefaultsName() throws JavaModelException {
+ Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.name.RedSnapper");
+ assertEquals("There should be the only bean with org.jboss.jsr299.tck.tests.definition.name.RedSnapper type.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ assertEquals("Wrong EL name of org.jboss.jsr299.tck.tests.definition.name.RedSnapper bean.", "redSnapper", bean.getName());
+ }
+
+ /**
* Section 2 - Concepts
* e) A bean comprises of an optional bean EL name (continue).
*
@@ -44,8 +72,20 @@
*/
public void testNotNamedInJava() throws JavaModelException {
Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.name.SeaBass");
- assertEquals("org.jboss.jsr299.tck.tests.definition.name.SeaBass should have the only bean.", 1, beans.size());
+ assertEquals("There should be the only bean with org.jboss.jsr299.tck.tests.definition.name.SeaBass type.", 1, beans.size());
IBean bean = beans.iterator().next();
assertNull("org.jboss.jsr299.tck.tests.definition.name.SeaBass bean should not have any EL name.", bean.getName());
}
+
+ /**
+ * section 2.5.3 a)
+ *
+ * @throws JavaModelException
+ */
+ public void testNotNamedInStereotype() throws JavaModelException {
+ Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.name.Minnow");
+ assertEquals("There should be the only bean with org.jboss.jsr299.tck.tests.definition.name.Minnow type.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ assertNull("org.jboss.jsr299.tck.tests.definition.name.Minnow bean should not have any EL name.", bean.getName());
+ }
}
\ No newline at end of file
14 years, 3 months
- 1
- 0