JBoss Tools SVN: r24699 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common: model/util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-03 11:15:21 -0400 (Fri, 03 Sep 2010)
New Revision: 24699
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/AddAttributeToAnyElementSupport.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java
Log:
https://jira.jboss.org/browse/JBIDE-6983
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/AddAttributeToAnyElementSupport.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/AddAttributeToAnyElementSupport.java 2010-09-03 14:48:25 UTC (rev 24698)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/AddAttributeToAnyElementSupport.java 2010-09-03 15:15:21 UTC (rev 24699)
@@ -17,6 +17,7 @@
import org.jboss.tools.common.model.XModelObjectConstants;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.impl.AnyElementObjectImpl;
+import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
public class AddAttributeToAnyElementSupport extends SpecialWizardSupport {
static String ATTRIBUTES = "attributes"; //$NON-NLS-1$
@@ -111,7 +112,7 @@
public String[][] getAttributes() {
XModelObject o = getTarget();
if(!(o instanceof AnyElementObjectImpl)) {
- o = o.getModel().createModelObject("AnyElement", null); //$NON-NLS-1$
+ o = o.getModel().createModelObject(XModelObjectLoaderUtil.ENT_ANY_ELEMENT, null);
o.setAttributeValue(ATTRIBUTES, getTarget().getAttributeValue(ATTRIBUTES));
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java 2010-09-03 14:48:25 UTC (rev 24698)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java 2010-09-03 15:15:21 UTC (rev 24699)
@@ -57,6 +57,7 @@
import org.jboss.tools.common.xml.XMLUtilities;
public class XModelObjectLoaderUtil {
+ public static String ENT_ANY_ELEMENT = "AnyElement"; //$NON-NLS-1$
public static String ATTR_ID_NAME = "_id_"; //$NON-NLS-1$
private Hashtable<String,String> singular = null;
private boolean saveentity = true;
@@ -90,7 +91,7 @@
}
public void load(Element element, XModelObject o) {
- if("AnyElement".equals(o.getModelEntity().getName())) { //$NON-NLS-1$
+ if(ENT_ANY_ELEMENT.equals(o.getModelEntity().getName())) {
loadAnyElement(element, o);
} else {
loadAttributes(element, o);
@@ -111,7 +112,7 @@
static Map<XModelEntity, Set<String>> allowedChildren = new HashMap<XModelEntity, Set<String>>();
protected Set<String> getAllowedChildren(XModelEntity entity) {
- if(entity.getChild("AnyElement") != null) return null; //$NON-NLS-1$
+ if(entity.getChild(ENT_ANY_ELEMENT) != null) return null;
Set<String> x = allowedChildren.get(entity);
if(x != null) return x;
Set<String> children = new HashSet<String>();
@@ -154,7 +155,7 @@
}
protected Set<String> getAllowedAttributes(XModelEntity entity) {
- if(entity.getChild("AnyElement") != null) return null; //$NON-NLS-1$
+ if(entity.getChild(ENT_ANY_ELEMENT) != null) return null;
Set<String> attributes = new HashSet<String>();
if(saveentity) {
attributes.add(XModelConstants.XMODEL_ENTITY_ATTR);
@@ -312,7 +313,7 @@
if(n.getNodeType() != Node.ELEMENT_NODE) continue;
Element e = (Element)n;
String en = getChildEntity(entity, e);
- if(en == null && entity.getChild("AnyElement") != null) en = "AnyElement"; //$NON-NLS-1$ //$NON-NLS-2$
+ if(en == null && entity.getChild(ENT_ANY_ELEMENT) != null) en = ENT_ANY_ELEMENT;
if(en == null) continue;
XModelObject co = model.createModelObject(en, null);
if(co == null) continue;
@@ -425,7 +426,7 @@
}
public boolean save(Element parent, XModelObject o) {
- if("AnyElement".equals(o.getModelEntity().getName())) { //$NON-NLS-1$
+ if(ENT_ANY_ELEMENT.equals(o.getModelEntity().getName())) {
saveAnyElement(parent, o);
return true;
} else {
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24698 - trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-03 10:48:25 -0400 (Fri, 03 Sep 2010)
New Revision: 24698
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDINamespaces.java
Log:
https://jira.jboss.org/browse/JBIDE-6983
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDINamespaces.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDINamespaces.java 2010-09-03 14:39:24 UTC (rev 24697)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDINamespaces.java 2010-09-03 14:48:25 UTC (rev 24698)
@@ -101,12 +101,20 @@
if(namespaceMapping == null) namespaceMapping = new NamespaceMapping();
StringBuffer loc = new StringBuffer();
loc.append(object.getAttributeValue("xsi:schemaLocation")); //$NON-NLS-1$
+
+ doValidateNamespaces(object, element, namespaceMapping, loc);
+
+ object.setAttributeValue("xsi:schemaLocation", loc.toString()); //$NON-NLS-1$
+ }
+
+ void doValidateNamespaces(XModelObject object, Element element, NamespaceMapping namespaceMapping, StringBuffer loc) {
XModelObject[] cs = object.getChildren();
Set<String> ns = new HashSet<String>();
for (int i = 0; i < cs.length; i++) {
String n = null;
if(cs[i].getModelEntity().getName().equals(XModelObjectLoaderUtil.ENT_ANY_ELEMENT)) {
n = cs[i].getAttributeValue("tag");
+ doValidateNamespaces(cs[i], element, namespaceMapping, loc);
} else {
n = cs[i].getModelEntity().getXMLSubPath();
}
@@ -124,12 +132,11 @@
if(actualNamespace == null) actualNamespace = defaultNamespace;
element.setAttribute(XMLNS_PREFIX + actualNamespace, uri);
String schema = getSchema(defaultNamespace);
- if(loc.indexOf(uri) < 0) {
+ if(loc.indexOf(uri) < 0 && schema != null) {
loc.append(' ').append(uri).append(' ').append(schema);
}
}
- object.setAttributeValue("xsi:schemaLocation", loc.toString()); //$NON-NLS-1$
}
}
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24697 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-03 10:39:24 -0400 (Fri, 03 Sep 2010)
New Revision: 24697
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/BeansXMLTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6983
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/BeansXMLTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/BeansXMLTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/BeansXMLTest.java 2010-09-03 14:39:24 UTC (rev 24697)
@@ -0,0 +1,72 @@
+package org.jboss.tools.cdi.core.test;
+
+import java.io.IOException;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+/**
+ *
+ * @author V.Kabanovich
+ *
+ */
+public class BeansXMLTest extends TestCase {
+ protected static String PLUGIN_ID = "org.jboss.tools.cdi.core.test";
+ IProject project = null;
+
+ public BeansXMLTest() {}
+
+ public void setUp() throws Exception {
+ project = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest1");
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ JobUtils.waitForIdle();
+ }
+
+ public void testBeansXML() throws CoreException, IOException {
+ IFile file = project.getFile(new Path("META-INF/beans.xml"));
+ assertNotNull(file);
+ XModelObject beansXML = EclipseResourceUtil.createObjectForResource(file);
+ assertNotNull(beansXML);
+
+ assertEquals("FileCDIBeans", beansXML.getModelEntity().getName());
+
+ XModelObject o = findTag(beansXML, "drools:RuleResources");
+ assertNotNull(o);
+
+ o = findTag(beansXML, "drools:DroolsConfig/drools:ruleResources/s:Inject");
+ assertNotNull(o);
+ }
+
+ public void tearDown() throws Exception {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ JobUtils.waitForIdle();
+ project.delete(true, true, null);
+ JobUtils.waitForIdle();
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ }
+
+ XModelObject findTag(XModelObject parent, String path) {
+ XModelObject[] cs = parent.getChildren(XModelObjectLoaderUtil.ENT_ANY_ELEMENT);
+ for (XModelObject o: cs) {
+ String name = o.getAttributeValue("tag");
+ if(name == null) continue;
+ if(path.equals(name)) return o;
+ if(path.startsWith(name + "/")) {
+ return findTag(o, path.substring(name.length() + 1));
+ }
+ }
+ return null;
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/BeansXMLTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-09-03 14:19:04 UTC (rev 24696)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-09-03 14:39:24 UTC (rev 24697)
@@ -82,6 +82,7 @@
suite.addTestSuite(AnnotationsValidationTest.class);
suite.addTestSuite(CoreValidationTest.class);
+ suiteAll.addTestSuite(BeansXMLTest.class);
suiteAll.addTestSuite(DependentProjectTest.class);
suiteAll.addTest(new CDICoreTestSetup(suite));
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2010-09-03 14:19:04 UTC (rev 24696)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2010-09-03 14:39:24 UTC (rev 24697)
@@ -43,10 +43,13 @@
IClassBean cb = null;
for (IBean b: beans) {
if(b instanceof IClassBean) {
- cb = (IClassBean)b;
- System.out.println(cb.getBeanClass().getFullyQualifiedName());
+ IClassBean cb1 = (IClassBean)b;
+ if("cdi.test.MyBean".equals(cb1.getBeanClass().getFullyQualifiedName())) {
+ cb = cb1;
+ }
}
}
+ assertNotNull(cb);
}
public void tearDown() throws Exception {
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24696 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: projects/CDITest1 and 13 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-03 10:19:04 -0400 (Fri, 03 Sep 2010)
New Revision: 24696
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.classpath
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.project
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.settings/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.settings/org.eclipse.jdt.core.prefs
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/META-INF/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/META-INF/beans.xml
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/bin/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/bin/cdi/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/bin/cdi/test/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/bin/cdi/test/MyBean.class
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/bin/cdi/test/MyQualifier.class
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/cdi-api.jar
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/javax.inject.jar
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyBean.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyQualifier.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.classpath
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.project
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.settings/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.settings/org.eclipse.jdt.core.prefs
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/bin/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/lib/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/lib/cdi-api.jar
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/lib/javax.inject.jar
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
Log:
https://jira.jboss.org/browse/JBIDE-6950
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.classpath
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.classpath (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.classpath 2010-09-03 14:19:04 UTC (rev 24696)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="lib" path="lib/cdi-api.jar"/>
+ <classpathentry kind="lib" path="lib/javax.inject.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.project
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.project (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.project 2010-09-03 14:19:04 UTC (rev 24696)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>CDITest1</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.cdi.core.cdibuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.jboss.tools.cdi.core.cdinature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.settings/org.eclipse.jdt.core.prefs 2010-09-03 14:19:04 UTC (rev 24696)
@@ -0,0 +1,12 @@
+#Thu Sep 02 19:40:42 MSD 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/META-INF/beans.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/META-INF/beans.xml (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/META-INF/beans.xml 2010-09-03 14:19:04 UTC (rev 24696)
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:s="urn:java:ee"
+ xmlns:drools="urn:java:org.jboss.seam.drools:org.jboss.seam.drools.config"
+ xmlns:security="urn:java:org.jboss.seam.security.permission"
+ xmlns:plidm="urn:java:org.jboss.seam.security.management.picketlink"
+ xsi:schemaLocation="
+ http://java.sun.com/xml/ns/javaee
+ http://jboss.org/schema/cdi/beans_1_0.xsd">
+
+ <drools:RuleResources>
+ <s:replaces/>
+ <security:SecurityRulesConfig/>
+ <drools:resources>
+ <s:value>classpath;security-rules.drl;DRL</s:value>
+ </drools:resources>
+ </drools:RuleResources>
+
+ <drools:DroolsConfig>
+ <s:modifies/>
+ <security:SecurityRulesConfig/>
+ <drools:ruleResources>
+ <s:Inject/>
+ <security:SecurityRulesConfig/>
+ </drools:ruleResources>
+ </drools:DroolsConfig>
+
+ <!--security:RuleBasedPermissionResolver>
+ <s:modifies/>
+ <security:securityRules>
+ <s:Inject/>
+ <security:SecurityRulesConfig/>
+ <s:Default/>
+ </security:securityRules>
+ </security:RuleBasedPermissionResolver-->
+
+ <plidm:JpaIdentityStoreConfiguration>
+ <s:replaces/>
+ <plidm:identityClass>org.jboss.seam.example.ticketmonster.model.IdentityObject</plidm:identityClass>
+ <plidm:credentialClass>org.jboss.seam.example.ticketmonster.model.IdentityObjectCredential</plidm:credentialClass>
+ <plidm:relationshipClass>org.jboss.seam.example.ticketmonster.model.IdentityObjectRelationship</plidm:relationshipClass>
+ <plidm:roleTypeClass>org.jboss.seam.example.ticketmonster.model.IdentityRoleName</plidm:roleTypeClass>
+ </plidm:JpaIdentityStoreConfiguration>
+
+</beans>
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/META-INF/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/bin/cdi/test/MyBean.class
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/bin/cdi/test/MyBean.class
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/bin/cdi/test/MyQualifier.class
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/bin/cdi/test/MyQualifier.class
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/cdi-api.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/cdi-api.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/javax.inject.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/lib/javax.inject.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyBean.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyBean.java 2010-09-03 14:19:04 UTC (rev 24696)
@@ -0,0 +1,6 @@
+package cdi.test;
+
+@MyQualifier
+public class MyBean {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyQualifier.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyQualifier.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyQualifier.java 2010-09-03 14:19:04 UTC (rev 24696)
@@ -0,0 +1,21 @@
+package cdi.test;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface MyQualifier {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/MyQualifier.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.classpath
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.classpath (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.classpath 2010-09-03 14:19:04 UTC (rev 24696)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="lib" path="lib/cdi-api.jar"/>
+ <classpathentry kind="lib" path="lib/javax.inject.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/CDITest1"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.project
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.project (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.project 2010-09-03 14:19:04 UTC (rev 24696)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>CDITest2</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.cdi.core.cdibuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.jboss.tools.cdi.core.cdinature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.settings/org.eclipse.jdt.core.prefs 2010-09-03 14:19:04 UTC (rev 24696)
@@ -0,0 +1,12 @@
+#Fri Sep 03 17:44:12 MSD 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/lib/cdi-api.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/lib/cdi-api.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/lib/javax.inject.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/lib/javax.inject.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-09-03 13:44:45 UTC (rev 24695)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2010-09-03 14:19:04 UTC (rev 24696)
@@ -49,8 +49,11 @@
public static Test suite() {
// it could be done here because it is not needed to be enabled back
JavaModelManager.getIndexManager().disable();
+
+
+ TestSuite suiteAll = new TestSuite("CDI Core Tests");
- TestSuite suite = new TestSuite("CDI Core Tests");
+ TestSuite suite = new TestSuite("TCK Tests");
suite.addTestSuite(BeanDefinitionTest.class);
suite.addTestSuite(NameDefinitionTest.class);
suite.addTestSuite(QualifierDefinitionTest.class);
@@ -78,7 +81,10 @@
suite.addTestSuite(BeansXmlValidationTest.class);
suite.addTestSuite(AnnotationsValidationTest.class);
suite.addTestSuite(CoreValidationTest.class);
+
+ suiteAll.addTestSuite(DependentProjectTest.class);
+ suiteAll.addTest(new CDICoreTestSetup(suite));
- return new CDICoreTestSetup(suite);
+ return suiteAll;
}
}
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2010-09-03 14:19:04 UTC (rev 24696)
@@ -0,0 +1,61 @@
+package org.jboss.tools.cdi.core.test;
+
+import java.io.IOException;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.cdi.core.IClassBean;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+/**
+ *
+ * @author V.Kabanovich
+ *
+ */
+public class DependentProjectTest extends TestCase {
+ protected static String PLUGIN_ID = "org.jboss.tools.cdi.core.test";
+ IProject project1 = null;
+ IProject project2 = null;
+
+ public DependentProjectTest() {}
+
+ public void setUp() throws Exception {
+ project1 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest1");
+ project1.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ JobUtils.waitForIdle();
+
+ project2 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest2");
+ project2.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ JobUtils.waitForIdle();
+ }
+
+ public void testDependentProject() throws CoreException, IOException {
+ ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true);
+ IBean[] beans = cdi2.getBeans();
+ IClassBean cb = null;
+ for (IBean b: beans) {
+ if(b instanceof IClassBean) {
+ cb = (IClassBean)b;
+ System.out.println(cb.getBeanClass().getFullyQualifiedName());
+ }
+ }
+ }
+
+ public void tearDown() throws Exception {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ JobUtils.waitForIdle();
+ project1.delete(true, true, null);
+ project2.delete(true, true, null);
+ JobUtils.waitForIdle();
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24695 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-09-03 09:44:45 -0400 (Fri, 03 Sep 2010)
New Revision: 24695
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java
Log:
JBIDE-6285: Don't invoke code assist automaticly if user inserts <tag></tag>.
Issue is fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java 2010-09-03 13:32:14 UTC (rev 24694)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java 2010-09-03 13:44:45 UTC (rev 24695)
@@ -326,7 +326,8 @@
for (int i = 0; proposals != null && i < proposals.length; i++) {
TextProposal textProposal = proposals[i];
-
+ boolean useAutoActivation = true;
+
String replacementString = textProposal.getReplacementString();
String closingTag = textProposal.getLabel();
if (closingTag != null && closingTag.startsWith("<")) { //$NON-NLS-1$
@@ -339,6 +340,7 @@
}
if (!replacementString.endsWith("/>")) { //$NON-NLS-1$
replacementString += "</" + closingTag + ">"; //$NON-NLS-1$ //$NON-NLS-2$
+ useAutoActivation = false; // JBIDE-6285: Don't invoke code assist automaticly if user inserts <tag></tag>.
}
@@ -358,7 +360,7 @@
relevance = defaultRelevance == TextProposal.R_NONE? TextProposal.R_TAG_INSERTION : defaultRelevance;
}
- AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(true, replacementString,
+ AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(useAutoActivation, replacementString,
replacementOffset, replacementLength, cursorPosition, image, displayString,
contextInformation, additionalProposalInfo, relevance);
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24694 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-09-03 09:32:14 -0400 (Fri, 03 Sep 2010)
New Revision: 24694
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6287 , JUnit was updated.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2010-09-03 12:57:06 UTC (rev 24693)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2010-09-03 13:32:14 UTC (rev 24694)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.vpe.ui.bot.test.wizard;
+import java.awt.event.KeyEvent;
+
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
@@ -20,12 +22,14 @@
import org.jboss.tools.vpe.messages.VpeUIMessages;
import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper;
import org.jboss.tools.ui.bot.test.WidgetVariables;
public class ExternalizeStringsDialogTest extends VPEAutoTestCase {
private final String FOLDER_TEXT_LABEL = "Enter or select the parent folder:"; //$NON-NLS-1$
private final String INCORRECT_TABLE_VALUE = "Table value is incorrect"; //$NON-NLS-1$
+ private final String TOOLBAR_ICON_ENABLED = "Toolbar buttion should be enabled"; //$NON-NLS-1$
private final String CANNOT_FIND_PROPERTY_VALUE = "Cannot find 'Property Value' text field"; //$NON-NLS-1$
private final String COMPLEX_TEXT = "!! HELLO ~ Input User, Name.Page ?" //$NON-NLS-1$
+ " \r\n and some more text \r\n" //$NON-NLS-1$
@@ -76,6 +80,9 @@
/*
* Get toolbar button
*/
+ assertTrue(TOOLBAR_ICON_ENABLED, bot
+ .toolbarButtonWithTooltip(VpeUIMessages.EXTERNALIZE_STRINGS)
+ .isEnabled());
bot.toolbarButtonWithTooltip(VpeUIMessages.EXTERNALIZE_STRINGS).click();
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
@@ -164,6 +171,9 @@
/*
* Get toolbar button
*/
+ assertTrue(TOOLBAR_ICON_ENABLED, bot
+ .toolbarButtonWithTooltip(VpeUIMessages.EXTERNALIZE_STRINGS)
+ .isEnabled());
bot.toolbarButtonWithTooltip(VpeUIMessages.EXTERNALIZE_STRINGS).click();
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
@@ -198,6 +208,9 @@
/*
* Get toolbar button
*/
+ assertTrue(TOOLBAR_ICON_ENABLED, bot
+ .toolbarButtonWithTooltip(VpeUIMessages.EXTERNALIZE_STRINGS)
+ .isEnabled());
bot.toolbarButtonWithTooltip(VpeUIMessages.EXTERNALIZE_STRINGS).click();
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
@@ -283,6 +296,9 @@
/*
* Get toolbar button
*/
+ assertTrue(TOOLBAR_ICON_ENABLED, bot
+ .toolbarButtonWithTooltip(VpeUIMessages.EXTERNALIZE_STRINGS)
+ .isEnabled());
bot.toolbarButtonWithTooltip(VpeUIMessages.EXTERNALIZE_STRINGS).click();
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
@@ -348,8 +364,25 @@
*/
setException(null);
/*
+ * Check that the toolbar buttion is disabled
+ */
+ assertFalse("Toolbar buttion should be disabled", bot //$NON-NLS-1$
+ .toolbarButtonWithTooltip(VpeUIMessages.EXTERNALIZE_STRINGS)
+ .isEnabled());
+ /*
+ * Select some text
+ */
+ editor.toTextEditor().navigateTo(21, 40);
+ /*
+ * Send key press event to fire VPE listeners
+ */
+ KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_LEFT);
+ /*
* Activate the dialog
*/
+ assertTrue(TOOLBAR_ICON_ENABLED, bot
+ .toolbarButtonWithTooltip(VpeUIMessages.EXTERNALIZE_STRINGS)
+ .isEnabled());
bot.toolbarButtonWithTooltip(VpeUIMessages.EXTERNALIZE_STRINGS).click();
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
@@ -361,7 +394,7 @@
VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE,
VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP);
assertNotNull(CANNOT_FIND_PROPERTY_VALUE, defValueText);
- assertText("", defValueText); //$NON-NLS-1$
+ assertText("Say Hello!", defValueText); //$NON-NLS-1$
/*
* Close the dialog
*/
@@ -382,6 +415,7 @@
bot.toolbarButtonWithTooltip(VpeUIMessages.EXTERNALIZE_STRINGS).click();
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
+ isUnusedDialogOpened = true;
/*
* Check that the property key and value text
*/
@@ -399,6 +433,7 @@
* Close the dialog
*/
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).close();
+ isUnusedDialogOpened = false;
/*
* Check selection in the attribute's value
*/
@@ -409,6 +444,7 @@
bot.toolbarButtonWithTooltip(VpeUIMessages.EXTERNALIZE_STRINGS).click();
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
+ isUnusedDialogOpened = true;
/*
* Check that the property value text is empty
*/
@@ -421,5 +457,6 @@
* Close the dialog
*/
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).close();
+ isUnusedDialogOpened = false;
}
}
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24693 - in trunk/cdi/plugins/org.jboss.tools.cdi.xml: resources/meta and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-03 08:57:06 -0400 (Fri, 03 Sep 2010)
New Revision: 24693
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDINamespaces.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/help/keys-cdi.properties
trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta
trunk/cdi/plugins/org.jboss.tools.cdi.xml/schemas/beans.xsd
trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDIBeansFileLoader.java
Log:
https://jira.jboss.org/browse/JBIDE-6983
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/help/keys-cdi.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/help/keys-cdi.properties 2010-09-03 12:23:10 UTC (rev 24692)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/help/keys-cdi.properties 2010-09-03 12:57:06 UTC (rev 24693)
@@ -1,2 +1 @@
-FileDSConnectionFactories.editorTitle=Connection Factories 1.5 Editor
-FileDSDatasources.editorTitle=Datasources 1.5 Editor
\ No newline at end of file
+FileCDIBeans.editorTitle=Beans XML 1.0 Editor
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta 2010-09-03 12:23:10 UTC (rev 24692)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta 2010-09-03 12:57:06 UTC (rev 24693)
@@ -1,443 +1,443 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN"
- "meta.dtd">
-<XModelEntityGroup>
- <VERSION DEPENDS="Model:1.0" MODULE="CDI" VERSION="1.0"/>
- <MAPPINGS>
- <MAPPING name="FileVersions">
- <PAIR name="CDIBeans1.0" value="FileCDIBeans"/>
- </MAPPING>
- <MAPPING name="Recognizers">
- <PAIR name="xml$43" value="org.jboss.tools.cdi.xml.beans.model.CDIBeansEntityRecognizer"/>
- </MAPPING>
- </MAPPINGS>
- <ICONS>
- <GROUP name="action">
- <GROUP name="new">
- <GROUP name="cdi">
- <ICON name="case" path="images/jsf/transition.gif"/>
- <ICON name="file" path="images/jsf/new-jsf-config.gif"/>
- </GROUP>
- </GROUP>
- </GROUP>
- <GROUP name="main">
- <GROUP name="cdi">
- <ICON name="bean" path="images/struts/form_bean.gif"/>
- <ICON name="file" path="images/jsf/jsf-config.gif"/>
- </GROUP>
- </GROUP>
- </ICONS>
- <GlobalActions kind="list"/>
- <XModelEntity ImplementingClass="%Custom%"
- PROPERTIES="saveDefault=false;formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData;children=%Ordered%"
- XMLSUBPATH="alternatives" name="CDIAlternatives">
- <XChildrenEntities>
- <XChildEntity name="CDIClass"/>
- <XChildEntity name="CDIStereotype"/>
- </XChildrenEntities>
- <XEntityRenderer>
- <ICONS>
- <ICON info="main.cdi.bean" type="main"/>
- </ICONS>
- </XEntityRenderer>
- <XModelAttributes>
- <XModelAttribute default="decorators" loader="ElementType" name="element type">
- <Editor name="Uneditable"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="id=true;category=general"
- default="Alternatives" name="name" visibility="false"/>
- <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
- <Editor name="Note"/>
- </XModelAttribute>
- </XModelAttributes>
- <XActionItem kind="list">
- <XActionItem kind="list" name="CreateActions">
- <XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="entity=CDIClass" WizardClassName="%Default%"
- displayName="Add Class..." kind="action" name="CreateClass">
- <EntityData EntityName="CDIClass">
- <AttributeData AttributeName="class"/>
- </EntityData>
- </XActionItem>
- <XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="entity=CDIStereotype" WizardClassName="%Default%"
- displayName="Add Stereotype..." kind="action" name="CreateStereotype">
- <EntityData EntityName="CDIStereotype">
- <AttributeData AttributeName="stereotype"/>
- </EntityData>
- </XActionItem>
- </XActionItem>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
- <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="%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>
- </XActionItem>
- <XDependencies/>
- </XModelEntity>
- <XModelEntity ImplementingClass="%Custom%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData"
- XMLSUBPATH="class" name="CDIClass">
- <XChildrenEntities/>
- <XEntityRenderer>
- <ICONS>
- <ICON info="main.cdi.bean" type="main"/>
- </ICONS>
- </XEntityRenderer>
- <XModelAttributes>
- <XModelAttribute default="class" loader="ElementType" name="element type">
- <Editor name="Uneditable"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="id=true;save=always;category=general"
- name="class" xmlname="#text">
- <Editor name="AccessibleJava"/>
- </XModelAttribute>
- <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.cut" 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>
- </XActionItem>
- <XDependencies/>
- </XModelEntity>
- <XModelEntity ImplementingClass="%Custom%"
- PROPERTIES="saveDefault=false;formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData;children=%Ordered%"
- XMLSUBPATH="decorators" name="CDIDecorators">
- <XChildrenEntities>
- <XChildEntity name="CDIClass"/>
- </XChildrenEntities>
- <XEntityRenderer>
- <ICONS>
- <ICON info="main.cdi.bean" type="main"/>
- </ICONS>
- </XEntityRenderer>
- <XModelAttributes>
- <XModelAttribute default="decorators" loader="ElementType" name="element type">
- <Editor name="Uneditable"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="id=true;category=general"
- default="Decorators" name="name" visibility="false"/>
- <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
- <Editor name="Note"/>
- </XModelAttribute>
- </XModelAttributes>
- <XActionItem kind="list">
- <XActionItem kind="list" name="CreateActions">
- <XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="entity=CDIClass" WizardClassName="%Default%"
- displayName="Add Class..." kind="action" name="CreateClass">
- <EntityData EntityName="CDIClass">
- <AttributeData AttributeName="class"/>
- </EntityData>
- </XActionItem>
- </XActionItem>
- <XActionItemReference entity="CDIAlternatives" name="CopyActions"/>
- <XActionItemReference entity="CDIAlternatives" name="DeleteActions"/>
- <XActionItemReference entity="CDIAlternatives" name="Properties"/>
- <XActionItemReference entity="CDIAlternatives" name="MoveActions"/>
- </XActionItem>
- <XDependencies/>
- </XModelEntity>
- <XModelEntity ImplementingClass="%Custom%"
- PROPERTIES="saveDefault=false;formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData;children=%Ordered%"
- XMLSUBPATH="interceptors" name="CDIInterceptors">
- <XChildrenEntities>
- <XChildEntity name="CDIClass"/>
- </XChildrenEntities>
- <XEntityRenderer>
- <ICONS>
- <ICON info="main.cdi.bean" type="main"/>
- </ICONS>
- </XEntityRenderer>
- <XModelAttributes>
- <XModelAttribute default="interceptors" loader="ElementType" name="element type">
- <Editor name="Uneditable"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="id=true;category=general"
- default="Interceptors" name="name" visibility="false"/>
- <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
- <Editor name="Note"/>
- </XModelAttribute>
- </XModelAttributes>
- <XActionItem kind="list">
- <XActionItem kind="list" name="CreateActions">
- <XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="entity=CDIClass" WizardClassName="%Default%"
- displayName="Add Class..." kind="action" name="CreateClass">
- <EntityData EntityName="CDIClass">
- <AttributeData AttributeName="class"/>
- </EntityData>
- </XActionItem>
- </XActionItem>
- <XActionItemReference entity="CDIAlternatives" name="CopyActions"/>
- <XActionItemReference entity="CDIAlternatives" name="DeleteActions"/>
- <XActionItemReference entity="CDIAlternatives" name="Properties"/>
- <XActionItemReference entity="CDIAlternatives" name="MoveActions"/>
- </XActionItem>
- <XDependencies/>
- </XModelEntity>
- <XModelEntity ImplementingClass="%Custom%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData"
- XMLSUBPATH="stereotype" name="CDIStereotype">
- <XChildrenEntities/>
- <XEntityRenderer>
- <ICONS>
- <ICON info="main.cdi.bean" type="main"/>
- </ICONS>
- </XEntityRenderer>
- <XModelAttributes>
- <XModelAttribute default="stereotype" loader="ElementType" name="element type">
- <Editor name="Uneditable"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="id=true;save=always;category=general"
- name="stereotype" xmlname="#text">
- <Editor name="AccessibleJava"/>
- </XModelAttribute>
- <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.cut" 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>
- </XActionItem>
- <XDependencies/>
- </XModelEntity>
- <XModelEntity
- ImplementationLoadingClass="org.jboss.tools.cdi.xml.beans.model.CDIBeansFileLoader"
- ImplementingClass="org.jboss.tools.cdi.xml.beans.model.FileCDIBeansImpl"
- ObjectEditorClass="%XML%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData"
- XMLSUBPATH="beans" name="FileCDIBeans">
- <XChildrenEntities>
- <XChildEntity maxCount="1" name="CDIInterceptors" required="yes"/>
- <XChildEntity maxCount="1" name="CDIDecorators" required="yes"/>
- <XChildEntity maxCount="1" name="CDIAlternatives" required="yes"/>
- </XChildrenEntities>
- <XEntityRenderer>
- <ICONS>
- <ICON info="main.cdi.file" type="main"/>
- </ICONS>
- </XEntityRenderer>
- <XModelAttributes>
- <XModelAttribute default="cdi beans" loader="ElementType" name="element type">
- <Editor name="Uneditable"/>
- </XModelAttribute>
- <XModelAttribute PROPERTIES="category=general" name="name" xmlname="NAME"/>
- <XModelAttribute default="xml" name="extension" xmlname="EXTENSION">
- <Editor name="Uneditable"/>
- </XModelAttribute>
- <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
- <Editor name="Note"/>
- </XModelAttribute>
- <XModelAttribute loader="ElementType" name="_lateload" visibility="false">
- <Editor name="Uneditable"/>
- </XModelAttribute>
- <XModelAttribute default="no" name="isIncorrect" visibility="false">
- <Constraint loader="List">
- <value name="yes"/>
- <value name="no"/>
- </Constraint>
- <Editor name="Uneditable"/>
- </XModelAttribute>
- <XModelAttribute name="incorrectBody" visibility="false"/>
- <XModelAttribute PROPERTIES="save=always"
- default="http://java.sun.com/xml/ns/javaee" name="xmlns" xmlname="xmlns"/>
- <XModelAttribute PROPERTIES="save=always"
- default="http://www.w3.org/2001/XMLSchema-instance" name="xmlns:xsi" xmlname="xmlns:xsi"/>
- <XModelAttribute PROPERTIES="save=always"
- default="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans.xsd"
- name="xsi:schemaLocation" xmlname="xsi:schemaLocation"/>
- <XModelAttribute name="encoding">
- <Constraint loader="ListString">
- <value name="ISO-8859-1"/>
- <value name="UTF-8"/>
- </Constraint>
- <Editor name="ListString"/>
- </XModelAttribute>
- </XModelAttributes>
- <XActionItem kind="list">
- <XActionItem BaseActionName="Open" HandlerClassName="%Open%"
- ICON="action.empty" displayName="Open" kind="action" name="Open"/>
- <XActionItem displayName="Open With" group="1" kind="list" name="OpenWith">
- <XActionItem HIDE="always"
- HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithExternalHandler"
- ICON="action.empty" PROPERTIES="extension=struts-config"
- displayName="Open with External Program" kind="action" name="OpenWithSelected"/>
- <XActionItem HIDE="always"
- HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithChoiceHandler"
- ICON="action.empty" PROPERTIES="extension=struts-config"
- displayName="Choose Program..." kind="action" name="OpenWithChoice">
- <EntityData EntityName="OpenWithHelper">
- <AttributeData AttributeName="name"/>
- <AttributeData AttributeName="default"/>
- </EntityData>
- </XActionItem>
- </XActionItem>
- <XActionItem kind="list" name="EditActions">
- <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>
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions"/>
- <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>
- </XActionItem>
- <XDependencies/>
- </XModelEntity>
- <XModelEntity name="FileCDIBeans_EditorActionList">
- <XChildrenEntities/>
- <XEntityRenderer/>
- <XModelAttributes/>
- <XActionItem kind="list">
- <XActionItemReference entity="FileCDIBeans"
- name="CreateActions" path="CreateActions"/>
- <XActionItemReference entity="FileCDIBeans" name="Properties" path="Properties"/>
- <XActionItem kind="list" name="VerifyActions">
- <XActionItem kind="list" name="StaticActions"/>
- </XActionItem>
- </XActionItem>
- <XDependencies/>
- </XModelEntity>
- <XEntityExtension name="FileFolder">
- <XChildrenEntities>
- <XChildEntity name="FileCDIBeans"/>
- </XChildrenEntities>
- <XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
- <XActionItem ICON="action.newattribute" displayName="File" group="1"
- kind="list" name="CreateFiles">
- <XActionItem displayName="CDI" kind="list" name="CDI">
- <XActionItem HandlerClassName="%SpecialWizard%"
- ICON="action.new.cdi.file"
- PROPERTIES="entity=FileCDIBeans;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.common.model.files.handlers.CreateFileSupport;extension=xml;entityVersion=CDIBeans"
- displayName="CDI Beans File..." kind="action" name="CreateFileCDIBeans">
- <EntityData EntityName="NewFileWizard">
- <AttributeData AttributeName="folder"/>
- <AttributeData AttributeName="separator" Mandatory="no"/>
- <AttributeData AttributeName="name"/>
- <AttributeData AttributeName="version"/>
- </EntityData>
- </XActionItem>
- </XActionItem>
- </XActionItem>
- </XActionItem>
- </XActionItem>
- </XEntityExtension>
- <XEntityExtension name="FileSystemFolder">
- <XChildrenEntities>
- <XChildEntity name="FileCDIBeans"/>
- </XChildrenEntities>
- <XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
- <XActionItem ICON="action.newattribute" displayName="File" group="1"
- kind="list" name="CreateFiles">
- <XActionItem displayName="CDI" kind="list" name="CDI">
- <XActionItem HandlerClassName="%SpecialWizard%"
- ICON="action.new.cdi.file"
- PROPERTIES="entity=FileCDIBeans;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.common.model.files.handlers.CreateFileSupport;extension=xml;entityVersion=CDIBeans"
- displayName="CDI Beans File..." kind="action" name="CreateFileCDIBeans">
- <EntityData EntityName="NewFileWizard">
- <AttributeData AttributeName="folder"/>
- <AttributeData AttributeName="separator" Mandatory="no"/>
- <AttributeData AttributeName="name"/>
- <AttributeData AttributeName="version"/>
- </EntityData>
- </XActionItem>
- </XActionItem>
- </XActionItem>
- </XActionItem>
- </XActionItem>
- </XEntityExtension>
- <XEntityExtension name="FileSystemJar">
- <XChildrenEntities>
- <XChildEntity name="FileCDIBeans"/>
- </XChildrenEntities>
- <XActionItem kind="list"/>
- </XEntityExtension>
- <XEntityExtension name="JarFolder">
- <XChildrenEntities>
- <XChildEntity name="FileCDIBeans"/>
- </XChildrenEntities>
- <XActionItem kind="list"/>
- </XEntityExtension>
-</XModelEntityGroup>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN"
+ "meta.dtd">
+<XModelEntityGroup>
+ <VERSION DEPENDS="Model:1.0" MODULE="CDI" VERSION="1.0"/>
+ <MAPPINGS>
+ <MAPPING name="FileVersions">
+ <PAIR name="CDIBeans1.0" value="FileCDIBeans"/>
+ </MAPPING>
+ <MAPPING name="Recognizers">
+ <PAIR name="xml$43" value="org.jboss.tools.cdi.xml.beans.model.CDIBeansEntityRecognizer"/>
+ </MAPPING>
+ </MAPPINGS>
+ <ICONS>
+ <GROUP name="action">
+ <GROUP name="new">
+ <GROUP name="cdi">
+ <ICON name="case" path="images/jsf/transition.gif"/>
+ <ICON name="file" path="images/jsf/new-jsf-config.gif"/>
+ </GROUP>
+ </GROUP>
+ </GROUP>
+ <GROUP name="main">
+ <GROUP name="cdi">
+ <ICON name="bean" path="images/struts/form_bean.gif"/>
+ <ICON name="file" path="images/jsf/jsf-config.gif"/>
+ </GROUP>
+ </GROUP>
+ </ICONS>
+ <GlobalActions kind="list"/>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="saveDefault=false;formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData;children=%Ordered%"
+ XMLSUBPATH="alternatives" name="CDIAlternatives">
+ <XChildrenEntities>
+ <XChildEntity name="CDIClass"/>
+ <XChildEntity name="CDIStereotype"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.cdi.bean" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="decorators" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;category=general"
+ default="Alternatives" name="name" visibility="false"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="entity=CDIClass" WizardClassName="%Default%"
+ displayName="Add Class..." kind="action" name="CreateClass">
+ <EntityData EntityName="CDIClass">
+ <AttributeData AttributeName="class"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="entity=CDIStereotype" WizardClassName="%Default%"
+ displayName="Add Stereotype..." kind="action" name="CreateStereotype">
+ <EntityData EntityName="CDIStereotype">
+ <AttributeData AttributeName="stereotype"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <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="%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>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData"
+ XMLSUBPATH="class" name="CDIClass">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.cdi.bean" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="class" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;save=always;category=general"
+ name="class" xmlname="#text">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <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.cut" 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>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="saveDefault=false;formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData;children=%Ordered%"
+ XMLSUBPATH="decorators" name="CDIDecorators">
+ <XChildrenEntities>
+ <XChildEntity name="CDIClass"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.cdi.bean" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="decorators" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;category=general"
+ default="Decorators" name="name" visibility="false"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="entity=CDIClass" WizardClassName="%Default%"
+ displayName="Add Class..." kind="action" name="CreateClass">
+ <EntityData EntityName="CDIClass">
+ <AttributeData AttributeName="class"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItemReference entity="CDIAlternatives" name="CopyActions"/>
+ <XActionItemReference entity="CDIAlternatives" name="DeleteActions"/>
+ <XActionItemReference entity="CDIAlternatives" name="Properties"/>
+ <XActionItemReference entity="CDIAlternatives" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="saveDefault=false;formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData;children=%Ordered%"
+ XMLSUBPATH="interceptors" name="CDIInterceptors">
+ <XChildrenEntities>
+ <XChildEntity name="CDIClass"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.cdi.bean" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="interceptors" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;category=general"
+ default="Interceptors" name="name" visibility="false"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="entity=CDIClass" WizardClassName="%Default%"
+ displayName="Add Class..." kind="action" name="CreateClass">
+ <EntityData EntityName="CDIClass">
+ <AttributeData AttributeName="class"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItemReference entity="CDIAlternatives" name="CopyActions"/>
+ <XActionItemReference entity="CDIAlternatives" name="DeleteActions"/>
+ <XActionItemReference entity="CDIAlternatives" name="Properties"/>
+ <XActionItemReference entity="CDIAlternatives" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData"
+ XMLSUBPATH="stereotype" name="CDIStereotype">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.cdi.bean" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="stereotype" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;save=always;category=general"
+ name="stereotype" xmlname="#text">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <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.cut" 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>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity
+ ImplementationLoadingClass="org.jboss.tools.cdi.xml.beans.model.CDIBeansFileLoader"
+ ImplementingClass="org.jboss.tools.cdi.xml.beans.model.FileCDIBeansImpl"
+ ObjectEditorClass="%XML%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData"
+ XMLSUBPATH="beans" name="FileCDIBeans">
+ <XChildrenEntities>
+ <XChildEntity maxCount="1" name="CDIInterceptors" required="yes"/>
+ <XChildEntity maxCount="1" name="CDIDecorators" required="yes"/>
+ <XChildEntity maxCount="1" name="CDIAlternatives" required="yes"/>
+ <XChildEntity name="AnyElement"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.cdi.file" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="cdi beans" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="name" xmlname="NAME"/>
+ <XModelAttribute default="xml" name="extension" xmlname="EXTENSION">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ <XModelAttribute loader="ElementType" name="_lateload" visibility="false">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute default="no" name="isIncorrect" visibility="false">
+ <Constraint loader="List">
+ <value name="yes"/>
+ <value name="no"/>
+ </Constraint>
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute name="incorrectBody" visibility="false"/>
+ <XModelAttribute PROPERTIES="save=always"
+ default="http://java.sun.com/xml/ns/javaee" name="xmlns" xmlname="xmlns"/>
+ <XModelAttribute PROPERTIES="save=always"
+ default="http://www.w3.org/2001/XMLSchema-instance" name="xmlns:xsi" xmlname="xmlns:xsi"/>
+ <XModelAttribute PROPERTIES="save=always"
+ default="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans.xsd"
+ name="xsi:schemaLocation" xmlname="xsi:schemaLocation"/>
+ <XModelAttribute name="namespaceMapping"/>
+ <XModelAttribute name="encoding">
+ <Constraint loader="ListString">
+ <value name="ISO-8859-1"/>
+ <value name="UTF-8"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem BaseActionName="Open" HandlerClassName="%Open%"
+ ICON="action.empty" displayName="Open" kind="action" name="Open"/>
+ <XActionItem displayName="Open With" group="1" kind="list" name="OpenWith">
+ <XActionItem HIDE="always"
+ HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithExternalHandler"
+ ICON="action.empty" PROPERTIES="extension=struts-config"
+ displayName="Open with External Program" kind="action" name="OpenWithSelected"/>
+ <XActionItem HIDE="always"
+ HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithChoiceHandler"
+ ICON="action.empty" PROPERTIES="extension=struts-config"
+ displayName="Choose Program..." kind="action" name="OpenWithChoice">
+ <EntityData EntityName="OpenWithHelper">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="default"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItem kind="list" name="EditActions">
+ <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>
+ <XActionItem ICON="action.empty" displayName="New" group="1"
+ kind="list" name="CreateActions"/>
+ <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>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity name="FileCDIBeans_EditorActionList">
+ <XChildrenEntities/>
+ <XEntityRenderer/>
+ <XModelAttributes/>
+ <XActionItem kind="list">
+ <XActionItemReference entity="FileCDIBeans" name="CreateActions" path="CreateActions"/>
+ <XActionItemReference entity="FileCDIBeans" name="Properties" path="Properties"/>
+ <XActionItem kind="list" name="VerifyActions">
+ <XActionItem kind="list" name="StaticActions"/>
+ </XActionItem>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XEntityExtension name="FileFolder">
+ <XChildrenEntities>
+ <XChildEntity name="FileCDIBeans"/>
+ </XChildrenEntities>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="New" group="1"
+ kind="list" name="CreateActions">
+ <XActionItem ICON="action.newattribute" displayName="File" group="1"
+ kind="list" name="CreateFiles">
+ <XActionItem displayName="CDI" kind="list" name="CDI">
+ <XActionItem HandlerClassName="%SpecialWizard%"
+ ICON="action.new.cdi.file"
+ PROPERTIES="entity=FileCDIBeans;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.common.model.files.handlers.CreateFileSupport;extension=xml;entityVersion=CDIBeans"
+ displayName="CDI Beans File..." kind="action" name="CreateFileCDIBeans">
+ <EntityData EntityName="NewFileWizard">
+ <AttributeData AttributeName="folder"/>
+ <AttributeData AttributeName="separator" Mandatory="no"/>
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="version"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ </XActionItem>
+ </XActionItem>
+ </XActionItem>
+ </XEntityExtension>
+ <XEntityExtension name="FileSystemFolder">
+ <XChildrenEntities>
+ <XChildEntity name="FileCDIBeans"/>
+ </XChildrenEntities>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="New" group="1"
+ kind="list" name="CreateActions">
+ <XActionItem ICON="action.newattribute" displayName="File" group="1"
+ kind="list" name="CreateFiles">
+ <XActionItem displayName="CDI" kind="list" name="CDI">
+ <XActionItem HandlerClassName="%SpecialWizard%"
+ ICON="action.new.cdi.file"
+ PROPERTIES="entity=FileCDIBeans;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.common.model.files.handlers.CreateFileSupport;extension=xml;entityVersion=CDIBeans"
+ displayName="CDI Beans File..." kind="action" name="CreateFileCDIBeans">
+ <EntityData EntityName="NewFileWizard">
+ <AttributeData AttributeName="folder"/>
+ <AttributeData AttributeName="separator" Mandatory="no"/>
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="version"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ </XActionItem>
+ </XActionItem>
+ </XActionItem>
+ </XEntityExtension>
+ <XEntityExtension name="FileSystemJar">
+ <XChildrenEntities>
+ <XChildEntity name="FileCDIBeans"/>
+ </XChildrenEntities>
+ <XActionItem kind="list"/>
+ </XEntityExtension>
+ <XEntityExtension name="JarFolder">
+ <XChildrenEntities>
+ <XChildEntity name="FileCDIBeans"/>
+ </XChildrenEntities>
+ <XActionItem kind="list"/>
+ </XEntityExtension>
+</XModelEntityGroup>
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/schemas/beans.xsd
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml/schemas/beans.xsd 2010-09-03 12:23:10 UTC (rev 24692)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/schemas/beans.xsd 2010-09-03 12:57:06 UTC (rev 24693)
@@ -44,11 +44,12 @@
</xs:documentation>
</xs:annotation>
<xs:complexType>
- <xs:all>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element ref="javaee:interceptors" />
<xs:element ref="javaee:decorators" />
<xs:element ref="javaee:alternatives" />
- </xs:all>
+ <xs:any namespace="##other" processContents="lax"/>
+ </xs:choice>
</xs:complexType>
</xs:element>
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDIBeansFileLoader.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDIBeansFileLoader.java 2010-09-03 12:23:10 UTC (rev 24692)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDIBeansFileLoader.java 2010-09-03 12:57:06 UTC (rev 24693)
@@ -10,8 +10,11 @@
******************************************************************************/
package org.jboss.tools.cdi.xml.beans.model;
+import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.loaders.impl.SimpleWebFileLoader;
+import org.jboss.tools.common.model.util.NamespaceMapping;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
+import org.w3c.dom.Element;
public class CDIBeansFileLoader extends SimpleWebFileLoader {
@@ -29,4 +32,26 @@
return false;
}
+ protected String loadNamespace(Element element, XModelObject object) {
+ NamespaceMapping namespaceMapping = CDINamespaces.getInstance(object.getModel().getMetaData(), getVersionSuffix(object)).getNamespaceMapping(element);
+ object.set(NamespaceMapping.ATTR_NAMESPACE_MAPPING, namespaceMapping.toString()); //$NON-NLS-1$
+ util.setNamespaceMapping(namespaceMapping);
+
+ return super.loadNamespace(element, object);
+ }
+
+ public String serializeObject(XModelObject object) {
+ String rootName = getRootName(object);
+ Element element = createRootElement(rootName, null, null);
+ CDINamespaces.getInstance(object.getModel().getMetaData(), getVersionSuffix(object)).validateNamespaces(object, element);
+ NamespaceMapping namespaceMapping = NamespaceMapping.load(object);
+ util.setNamespaceMapping(namespaceMapping);
+ return serializeToElement(element, object);
+ }
+
+ private String getVersionSuffix(XModelObject o) {
+// String entity = o.getModelEntity().getName();
+ return ""; //$NON-NLS-1$
+ }
+
}
Added: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDINamespaces.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDINamespaces.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDINamespaces.java 2010-09-03 12:57:06 UTC (rev 24693)
@@ -0,0 +1,135 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.xml.beans.model;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.jboss.tools.common.meta.XMapping;
+import org.jboss.tools.common.meta.XModelMetaData;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.util.NamespaceMapping;
+import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+public class CDINamespaces {
+ private static Map<String,CDINamespaces> map = new HashMap<String, CDINamespaces>();
+
+ public static CDINamespaces getInstance(XModelMetaData meta, String version) {
+ CDINamespaces instance = map.get(version);
+ if(instance == null) {
+ instance = new CDINamespaces(meta, version);
+ }
+ return instance;
+ }
+
+ String versionSuffix = null;
+
+ private Map<String, String> namespaceToURI = new HashMap<String, String>();
+ private Map<String, String> uriToNamespace = new HashMap<String, String>();
+ private Map<String, String> namespaceToSchema = new HashMap<String, String>();
+
+ private CDINamespaces(XModelMetaData meta, String versionSuffix) {
+ XMapping m = meta.getMapping("CDINamespaces"); //$NON-NLS-1$
+ if(m == null) return;
+ this.versionSuffix = versionSuffix;
+ String[] keys = m.getKeys();
+ for (int i = 0; i < keys.length; i++) {
+ String v = m.getValue(keys[i]);
+ namespaceToURI.put(keys[i], v);
+ uriToNamespace.put(v, keys[i]);
+ }
+ m = meta.getMapping("CDISchemas"); //$NON-NLS-1$
+ if(m == null) return;
+ keys = m.getKeys();
+ for (int i = 0; i < keys.length; i++) {
+ if(!keys[i].endsWith(versionSuffix)) continue;
+ String v = m.getValue(keys[i]);
+ String key = keys[i].substring(0, keys[i].length() - versionSuffix.length());
+ namespaceToSchema.put(key, v);
+ }
+ }
+
+ static String XMLNS_PREFIX = "xmlns:"; //$NON-NLS-1$
+
+ public NamespaceMapping getNamespaceMapping(Element element) {
+ NamespaceMapping mapping = new NamespaceMapping();
+ NamedNodeMap as = element.getAttributes();
+ for (int i = 0; i < as.getLength(); i++) {
+ Node n = as.item(i);
+ String name = n.getNodeName();
+ if(name.startsWith(XMLNS_PREFIX)) {
+ String actualNamespace = name.substring(XMLNS_PREFIX.length());
+ String uri = n.getNodeValue();
+ String defaultNamespace = getDefaultNamespace(uri);
+ if(defaultNamespace == null) {
+ defaultNamespace = name.substring(XMLNS_PREFIX.length());
+ }
+ if(defaultNamespace == null) continue;
+ mapping.addNamespace(defaultNamespace, actualNamespace, uri);
+ }
+ }
+ return mapping;
+ }
+
+ public String getDefaultNamespace(String uri) {
+ return uriToNamespace.get(uri);
+ }
+
+ public String getURI(String namespace) {
+ return namespaceToURI.get(namespace);
+ }
+
+ public String getSchema(String namespace) {
+ return namespaceToSchema.get(namespace);
+ }
+
+ public void validateNamespaces(XModelObject object, Element element) {
+ NamespaceMapping namespaceMapping = NamespaceMapping.load(object);
+ if(namespaceMapping == null) namespaceMapping = new NamespaceMapping();
+ StringBuffer loc = new StringBuffer();
+ loc.append(object.getAttributeValue("xsi:schemaLocation")); //$NON-NLS-1$
+ XModelObject[] cs = object.getChildren();
+ Set<String> ns = new HashSet<String>();
+ for (int i = 0; i < cs.length; i++) {
+ String n = null;
+ if(cs[i].getModelEntity().getName().equals(XModelObjectLoaderUtil.ENT_ANY_ELEMENT)) {
+ n = cs[i].getAttributeValue("tag");
+ } else {
+ n = cs[i].getModelEntity().getXMLSubPath();
+ }
+ int k = n.indexOf(':');
+ if(k < 0) continue;
+ String defaultNamespace = n.substring(0, k);
+ if(ns.contains(defaultNamespace)) continue;
+ ns.add(defaultNamespace);
+ String uri = getURI(defaultNamespace);
+ if(uri == null) {
+ uri = namespaceMapping.getURIForDefaultNamespace(defaultNamespace);
+ }
+ if(uri == null) continue;
+ String actualNamespace = namespaceMapping.getActualNamespace(defaultNamespace);
+ if(actualNamespace == null) actualNamespace = defaultNamespace;
+ element.setAttribute(XMLNS_PREFIX + actualNamespace, uri);
+ String schema = getSchema(defaultNamespace);
+ if(loc.indexOf(uri) < 0) {
+ loc.append(' ').append(uri).append(' ').append(schema);
+ }
+
+ }
+ object.setAttributeValue("xsi:schemaLocation", loc.toString()); //$NON-NLS-1$
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/CDINamespaces.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24692 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE: 6922 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-09-03 08:23:10 -0400 (Fri, 03 Sep 2010)
New Revision: 24692
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/6922/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/6922/jbide6922.xhtml
Log:
https://jira.jboss.org/browse/JBIDE-6922, junit tests
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/6922/jbide6922.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/6922/jbide6922.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/6922/jbide6922.xhtml 2010-09-03 12:23:10 UTC (rev 24692)
@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ >
+<body>
+
+</body>
+</html>
\ No newline at end of file
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24691 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-09-03 08:19:50 -0400 (Fri, 03 Sep 2010)
New Revision: 24691
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2SourceValidator.java
Log:
https://jira.jboss.org/browse/JBIDE-6922, code adjustment
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2SourceValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2SourceValidator.java 2010-09-03 12:12:11 UTC (rev 24690)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2SourceValidator.java 2010-09-03 12:19:50 UTC (rev 24691)
@@ -120,16 +120,16 @@
public LocalizedMessage(IJSF2ValidationComponent component,
IFile validateFile) {
this.component = component;
- setAttribute("problemType", JSF2XMLValidator.JSF2_PROBLEM_ID); //$NON-NLS-1$ //$NON-NLS-2$
+ setAttribute("problemType", JSF2XMLValidator.JSF2_PROBLEM_ID); //$NON-NLS-1$
setAttribute(IJSF2ValidationComponent.JSF2_TYPE_KEY, component
.getType());
setAttribute(
"validateResourcePath", validateFile == null ? "" : validateFile.getFullPath().toString()); //$NON-NLS-1$//$NON-NLS-2$
setAttribute(JSF2ResourceUtil.COMPONENT_RESOURCE_PATH_KEY,
component.getComponentResourceLocation());
- setAttribute("lineNumber", getLineNumber());
- setAttribute("severity", 1);
- setAttribute(ValidatorMessage.ValidationId, "org.jboss.tools.jsf.jsf2.source");
+ setAttribute(IMarker.LINE_NUMBER, getLineNumber());
+ setAttribute(IMarker.SEVERITY, 1);
+ setAttribute(ValidatorMessage.ValidationId, "org.jboss.tools.jsf.jsf2.source"); //$NON-NLS-1$
if (component instanceof JSF2URITempComponent) {
setAttribute(IJSF2ValidationComponent.JSF2_URI_NAME_KEY,
((JSF2URITempComponent) component).getURI());
@@ -149,7 +149,7 @@
setAttribute(JSF2ResourceUtil.JSF2_COMPONENT_NAME, ((JSF2CompositeTempComponent) component).getElement().getLocalName());
}
}
- setAttribute("message",getText());
+ setAttribute(IMarker.MESSAGE,getText());
}
@Override
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24690 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test: jbide and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-09-03 08:12:11 -0400 (Fri, 03 Sep 2010)
New Revision: 24690
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
Log:
https://jira.jboss.org/browse/JBIDE-6922
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-09-03 11:58:30 UTC (rev 24689)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-09-03 12:12:11 UTC (rev 24690)
@@ -73,6 +73,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE924Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JSF2ValidatorTest;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1467Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1501Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1568Test;
@@ -134,6 +135,7 @@
/*
* Other tests
*/
+ suite.addTestSuite(JSF2ValidatorTest.class);
suite.addTestSuite(DocBookTemplatesTest.class);
suite.addTestSuite(DnD_JBIDE5042_JBIDE6229_Test.class);
suite.addTestSuite(UnclosedELExpressionTest.class);
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java 2010-09-03 12:12:11 UTC (rev 24690)
@@ -0,0 +1,57 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+
+/**
+ * JUnit test class for https://jira.jboss.org/browse/JBIDE-6965
+ *
+ * @author mareshkau
+ *
+ */
+public class JSF2ValidatorTest extends VpeTest{
+
+ private static final String MARKER_TYPE="org.jboss.tools.jsf.jsf2problemmarker"; //$NON-NLS-1$
+ public JSF2ValidatorTest(String name) {
+ super(name);
+ }
+
+ public void testCAforIncludeTaglibInInenerNodes() throws Throwable {
+ IFile file = (IFile) TestUtil.getComponentPath("JBIDE/6922/jbide6922.xhtml", //$NON-NLS-1$
+ JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
+ IEditorInput input = new FileEditorInput(file);
+ JSPMultiPageEditor multiPageEditor = openEditor(input);
+ IMarker[] problemMarkers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
+ assertEquals("There shouldn't be any problems on page", 0,problemMarkers.length); //$NON-NLS-1$
+ StyledText styledText = multiPageEditor.getSourceEditor().getTextViewer()
+ .getTextWidget();
+ int caretOffcet = TestUtil.getLinePositionOffcet(multiPageEditor.getSourceEditor().getTextViewer(), 4, 5);
+ styledText.setCaretOffset(caretOffcet);
+ styledText.insert("xmlns:test=\"http://java.sun.com/jsf/composite/test\""); //$NON-NLS-1$
+ TestUtil.delay(200);
+ TestUtil.waitForJobs();
+ problemMarkers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
+ assertEquals("res folder marker is expected", 1, problemMarkers.length); //$NON-NLS-1$
+ String message = (String) problemMarkers[0].getAttribute(IMarker.MESSAGE);
+ assertEquals("Error messages should be","JSF 2 Resources folder \"/resources/test\" is missing in a project root directory",message); //$NON-NLS-1$ //$NON-NLS-2$
+ caretOffcet = TestUtil.getLinePositionOffcet(multiPageEditor.getSourceEditor().getTextViewer(), 6, 1);
+ styledText.setCaretOffset(caretOffcet);
+ styledText.insert("<test:testElement />"); //$NON-NLS-1$
+ TestUtil.delay(1200);
+ TestUtil.waitForJobs();
+ problemMarkers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE);
+ assertEquals("Number of markers should be",2, problemMarkers.length); //$NON-NLS-1$
+ }
+
+}
15 years, 7 months
- 1
- 0