JBoss Tools SVN: r20628 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-03-03 15:02:53 -0500 (Wed, 03 Mar 2010)
New Revision: 20628
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/.classpath
Log:
classpath altered to fix errors in dependent plugins in eclipse 3.5.2
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/.classpath
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/.classpath 2010-03-03 19:51:49 UTC (rev 20627)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/.classpath 2010-03-03 20:02:53 UTC (rev 20628)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="lib" path="lib/hibernate-tools-tests.jar"/>
<classpathentry exported="true" kind="lib" path="lib/hsqldb.jar"/>
14 years, 2 months
JBoss Tools SVN: r20627 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-03-03 14:51:49 -0500 (Wed, 03 Mar 2010)
New Revision: 20627
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefinitionTest.java
Log:
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefinitionTest.java 2010-03-03 19:38:05 UTC (rev 20626)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefinitionTest.java 2010-03-03 19:51:49 UTC (rev 20627)
@@ -93,7 +93,7 @@
assertEquals("org.jboss.jsr299.tck.tests.definition.name.Moose should have the only bean.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong EL name of org.jboss.jsr299.tck.tests.definition.name.Moose bean.", "aMoose", bean.getName());
- assertLocationEquals(bean.getNameLocation(), 918, 6);
+ assertLocationEquals(bean.getNameLocation(), 918, 16);
}
/**
@@ -122,7 +122,7 @@
}
private void assertLocationEquals(ITextSourceReference reference, int startPosition, int length) {
- assertEquals("Wrong start position", reference.getStartPosition(), startPosition);
- assertEquals("Wrong length", reference.getLength(), length);
+ assertEquals("Wrong start position", startPosition, reference.getStartPosition());
+ assertEquals("Wrong length", length, reference.getLength());
}
}
\ No newline at end of file
14 years, 2 months
JBoss Tools SVN: r20626 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-03-03 14:38:05 -0500 (Wed, 03 Mar 2010)
New Revision: 20626
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefinitionTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5808
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefinitionTest.java 2010-03-03 19:10:40 UTC (rev 20625)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefinitionTest.java 2010-03-03 19:38:05 UTC (rev 20626)
@@ -93,6 +93,7 @@
assertEquals("org.jboss.jsr299.tck.tests.definition.name.Moose should have the only bean.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong EL name of org.jboss.jsr299.tck.tests.definition.name.Moose bean.", "aMoose", bean.getName());
+ assertLocationEquals(bean.getNameLocation(), 918, 6);
}
/**
14 years, 2 months
JBoss Tools SVN: r20625 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-03-03 14:10:40 -0500 (Wed, 03 Mar 2010)
New Revision: 20625
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefinitionTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5808
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefinitionTest.java 2010-03-03 18:36:42 UTC (rev 20624)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DefinitionTest.java 2010-03-03 19:10:40 UTC (rev 20625)
@@ -13,11 +13,9 @@
import java.util.Set;
import org.eclipse.core.resources.IFile;
-import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IScope;
-import org.jboss.tools.cdi.core.IProducer;
-import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.ITypeDeclaration;
import org.jboss.tools.common.text.ITextSourceReference;
@@ -86,6 +84,28 @@
assertEquals("Wrong scope type for org.jboss.jsr299.tck.tests.definition.bean.RedSnapper bean.", "javax.enterprise.context.RequestScoped", scope.getSourceType().getFullyQualifiedName());
}
+ /**
+ * e) A bean comprises of an optional bean EL name.
+ */
+ public void testNonDefaultNamed() {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/name/Moose.java");
+ Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ assertEquals("org.jboss.jsr299.tck.tests.definition.name.Moose should have the only bean.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ assertEquals("Wrong EL name of org.jboss.jsr299.tck.tests.definition.name.Moose bean.", "aMoose", bean.getName());
+ }
+
+ /**
+ * e) A bean comprises of an optional bean EL name (continue).
+ */
+ public void testNotNamedInJava() {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/definition/name/SeaBass.java");
+ Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ assertEquals("org.jboss.jsr299.tck.tests.definition.name.SeaBass should have the only bean.", 1, beans.size());
+ IBean bean = beans.iterator().next();
+ assertNull("org.jboss.jsr299.tck.tests.definition.name.Moose bean should not have any EL name.", bean.getName());
+ }
+
private void assertLocationEquals(Set<? extends ITextSourceReference> references, int startPosition, int length) {
for (ITextSourceReference reference : references) {
if(reference.getStartPosition()==startPosition) {
14 years, 2 months
JBoss Tools SVN: r20624 - branches/jbosstools-3.1.x/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-03-03 13:36:42 -0500 (Wed, 03 Mar 2010)
New Revision: 20624
Modified:
branches/jbosstools-3.1.x/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5989
Modified: branches/jbosstools-3.1.x/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java
===================================================================
--- branches/jbosstools-3.1.x/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2010-03-03 18:18:49 UTC (rev 20623)
+++ branches/jbosstools-3.1.x/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2010-03-03 18:36:42 UTC (rev 20624)
@@ -102,6 +102,9 @@
List<IComponent> list = new ArrayList<IComponent>();
IComponent[] comps = getComponents();
for (int i = 0; i < comps.length; i++) {
+ if(comps[i].getName()==null) {
+ continue;
+ }
if(ignoreCase) {
if(!(comps[i] instanceof CustomComponentExtension) && comps[i].getName().toLowerCase().startsWith(nameTemplate.toLowerCase()) && (context==null || checkExtended(comps[i], context))) {
list.add(comps[i]);
14 years, 2 months
JBoss Tools SVN: r20623 - in branches/jbosstools-3.1.x/seam: tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-03-03 13:18:49 -0500 (Wed, 03 Mar 2010)
New Revision: 20623
Modified:
branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.3
branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5976
Modified: branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2010-03-03 18:12:26 UTC (rev 20622)
+++ branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2010-03-03 18:18:49 UTC (rev 20623)
@@ -612,8 +612,8 @@
}
String className = declaration.getClassName();
+ IType type = null;
if(className!=null) {
- IType type = null;
// validate class name
try {
IProject p = seamProject.getProject();
@@ -640,16 +640,24 @@
} catch (JavaModelException e) {
SeamCorePlugin.getDefault().logError(SeamCoreMessages.SEAM_CORE_VALIDATOR_ERROR_VALIDATING_SEAM_CORE, e);
}
- // validate properties
- Collection<ISeamProperty> properties = declaration.getProperties();
- for (ISeamProperty property : properties) {
- if(SeamUtil.isJar(property)) {
- return;
+ }
+ // validate properties
+ Collection<ISeamProperty> properties = declaration.getProperties();
+ for (ISeamProperty property : properties) {
+ if(SeamUtil.isJar(property)) {
+ return;
+ }
+ String name = property.getName();
+ if(name==null) {
+ return;
+ }
+ if(type==null && component.getJavaDeclaration()!=null) {
+ IMember member = component.getJavaDeclaration().getSourceMember();
+ if(member instanceof IType) {
+ type = (IType)member;
}
- String name = property.getName();
- if(name==null) {
- return;
- }
+ }
+ if(type!=null) {
boolean ok = type.isBinary() || SeamUtil.findProperty(type, name)!=null;
if(!ok) {
addError(SeamValidationMessages.UNKNOWN_COMPONENT_PROPERTY, SeamPreferences.UNKNOWN_COMPONENT_PROPERTY, new String[]{type.getElementName(), componentName, name}, property, declaration.getResource());
Modified: branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.3
===================================================================
--- branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.3 2010-03-03 18:12:26 UTC (rev 20622)
+++ branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.3 2010-03-03 18:18:49 UTC (rev 20623)
@@ -10,12 +10,16 @@
http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-1.1.xsd
http://jboss.com/products/seam/security http://jboss.com/products/seam/security-1.1.xsd
http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-1.2.xsd
- http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.1.xsd">
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.1.xsd">
<component class="org.domain.SeamWebWarTestProject.session.StatefulComponent" scope="application">
<property name="abc">value1</property>
</component>
+ <component name="statefulComponent">
+ <property name="abc">value1</property>
+ </component>
+
<core:init debug="true" jndi-pattern="@jndiPattern@"/>
<core:manager concurrent-request-timeout="500"
Modified: branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
--- branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2010-03-03 18:12:26 UTC (rev 20622)
+++ branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2010-03-03 18:18:49 UTC (rev 20623)
@@ -306,7 +306,7 @@
assertMarkerIsCreated(
componentsFile,
MARKER_TYPE,
- "Class \"StatefulComponent\" of component \"statefulComponent\" does not have a setter or a field for the property \"abc\"", 16);
+ "Class \"StatefulComponent\" of component \"statefulComponent\" does not have a setter or a field for the property \"abc\"", 16, 20);
}
public void testEntityHasWrongScope_Validator() throws CoreException {
14 years, 2 months
JBoss Tools SVN: r20622 - in trunk/seam: tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-03-03 13:12:26 -0500 (Wed, 03 Mar 2010)
New Revision: 20622
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.3
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5976
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2010-03-03 17:03:13 UTC (rev 20621)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2010-03-03 18:12:26 UTC (rev 20622)
@@ -620,8 +620,8 @@
}
String className = declaration.getClassName();
+ IType type = null;
if(className!=null) {
- IType type = null;
// validate class name
try {
IProject p = seamProject.getProject();
@@ -648,16 +648,24 @@
} catch (JavaModelException e) {
SeamCorePlugin.getDefault().logError(SeamCoreMessages.SEAM_CORE_VALIDATOR_ERROR_VALIDATING_SEAM_CORE, e);
}
- // validate properties
- Collection<ISeamProperty> properties = declaration.getProperties();
- for (ISeamProperty property : properties) {
- if(SeamUtil.isJar(property)) {
- return;
+ }
+ // validate properties
+ Collection<ISeamProperty> properties = declaration.getProperties();
+ for (ISeamProperty property : properties) {
+ if(SeamUtil.isJar(property)) {
+ return;
+ }
+ String name = property.getName();
+ if(name==null) {
+ return;
+ }
+ if(type==null && component.getJavaDeclaration()!=null) {
+ IMember member = component.getJavaDeclaration().getSourceMember();
+ if(member instanceof IType) {
+ type = (IType)member;
}
- String name = property.getName();
- if(name==null) {
- return;
- }
+ }
+ if(type!=null) {
boolean ok = type.isBinary() || SeamUtil.findProperty(type, name)!=null;
if(!ok) {
addError(SeamValidationMessages.UNKNOWN_COMPONENT_PROPERTY, SeamPreferences.UNKNOWN_COMPONENT_PROPERTY, new String[]{type.getElementName(), componentName, name}, property, declaration.getResource());
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.3
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.3 2010-03-03 17:03:13 UTC (rev 20621)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.3 2010-03-03 18:12:26 UTC (rev 20622)
@@ -16,6 +16,10 @@
<property name="abc">value1</property>
</component>
+ <component name="statefulComponent">
+ <property name="abc">value1</property>
+ </component>
+
<core:init debug="true" jndi-pattern="@jndiPattern@"/>
<core:manager concurrent-request-timeout="500"
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2010-03-03 17:03:13 UTC (rev 20621)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2010-03-03 18:12:26 UTC (rev 20622)
@@ -306,7 +306,7 @@
assertMarkerIsCreated(
componentsFile,
MARKER_TYPE,
- "Class \"StatefulComponent\" of component \"statefulComponent\" does not have a setter or a field for the property \"abc\"", 16);
+ "Class \"StatefulComponent\" of component \"statefulComponent\" does not have a setter or a field for the property \"abc\"", 16, 20);
}
public void testEntityHasWrongScope_Validator() throws CoreException {
14 years, 2 months
JBoss Tools SVN: r20621 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-03-03 12:03:13 -0500 (Wed, 03 Mar 2010)
New Revision: 20621
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5989
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2010-03-03 15:21:36 UTC (rev 20620)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2010-03-03 17:03:13 UTC (rev 20621)
@@ -102,6 +102,9 @@
List<IComponent> list = new ArrayList<IComponent>();
IComponent[] comps = getComponents();
for (int i = 0; i < comps.length; i++) {
+ if(comps[i].getName()==null) {
+ continue;
+ }
if(ignoreCase) {
if(!(comps[i] instanceof CustomComponentExtension) && comps[i].getName().toLowerCase().startsWith(nameTemplate.toLowerCase()) && (context==null || checkExtended(comps[i], context))) {
list.add(comps[i]);
14 years, 2 months
JBoss Tools SVN: r20620 - documentation/trunk/movies/java_hql_editing_and_validation.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2010-03-03 10:21:36 -0500 (Wed, 03 Mar 2010)
New Revision: 20620
Modified:
documentation/trunk/movies/java_hql_editing_and_validation/java_hql_editing_and_validation.wnk
Log:
JBDS-1100 Hibernate demos update - java_hql_editing_and_validation demo is updated
Modified: documentation/trunk/movies/java_hql_editing_and_validation/java_hql_editing_and_validation.wnk
===================================================================
(Binary files differ)
14 years, 2 months