Merge branch 'R3_2_maintenance' of ssh://bvosburgh@git.eclipse.org/gitroot/dali/webtools.dali.git into R3_2_maintenance

36 files changed, 20 insertions, 11 deletions

diff --git a/common/plugins/org.eclipse.jpt.common.core/.cvsignore b/common/plugins/org.eclipse.jpt.common.core/.gitignore
index ba077a4031..ba077a4031 100644
--- a/common/plugins/org.eclipse.jpt.common.core/.cvsignore
+++ b/common/plugins/org.eclipse.jpt.common.core/.gitignore
diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.core/.cvsignore b/common/plugins/org.eclipse.jpt.common.eclipselink.core/.gitignore
index ba077a4031..ba077a4031 100644
--- a/common/plugins/org.eclipse.jpt.common.eclipselink.core/.cvsignore
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/.gitignore
diff --git a/common/plugins/org.eclipse.jpt.common.ui/.cvsignore b/common/plugins/org.eclipse.jpt.common.ui/.gitignore
index ba077a4031..ba077a4031 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/.cvsignore
+++ b/common/plugins/org.eclipse.jpt.common.ui/.gitignore
diff --git a/common/plugins/org.eclipse.jpt.common.utility/.cvsignore b/common/plugins/org.eclipse.jpt.common.utility/.gitignore
index ba077a4031..ba077a4031 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/.cvsignore
+++ b/common/plugins/org.eclipse.jpt.common.utility/.gitignore
diff --git a/common/tests/org.eclipse.jpt.common.core.tests/.cvsignore b/common/tests/org.eclipse.jpt.common.core.tests/.gitignore
index ba077a4031..ba077a4031 100644
--- a/common/tests/org.eclipse.jpt.common.core.tests/.cvsignore
+++ b/common/tests/org.eclipse.jpt.common.core.tests/.gitignore
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/.cvsignore b/common/tests/org.eclipse.jpt.common.ui.tests/.gitignore
index ba077a4031..ba077a4031 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/.cvsignore
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/.gitignore
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/.cvsignore b/common/tests/org.eclipse.jpt.common.utility.tests/.gitignore
index ba077a4031..ba077a4031 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/.cvsignore
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/.gitignore
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/.cvsignore b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/.cvsignore
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/.gitignore
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/.cvsignore b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/.cvsignore
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/.gitignore
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/.cvsignore b/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/.cvsignore
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core.schemagen/.gitignore
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/.cvsignore b/jaxb/plugins/org.eclipse.jpt.jaxb.core/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/.cvsignore
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/.gitignore
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/.cvsignore b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/.cvsignore
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core.schemagen/.gitignore
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/.cvsignore b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/.cvsignore
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/.gitignore
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/.cvsignore b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/.cvsignore
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/.gitignore
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/.cvsignore b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/.cvsignore
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/.gitignore
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.cvsignore b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.cvsignore
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.gitignore
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/.cvsignore b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/.cvsignore
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/.gitignore
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/.cvsignore b/jpa/plugins/org.eclipse.jpt.jpa.core/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/.cvsignore
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/.gitignore
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.jpa.core/META-INF/MANIFEST.MF
index 09b3bb385c..3643cfc69c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.jpt.jpa.core;singleton:=true
 Bundle-Version: 3.2.0.qualifier
 Bundle-Activator: org.eclipse.jpt.jpa.core.JptJpaCorePlugin
-Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.jpt.core.internal.resource.contenttypes"
+Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.jpt.jpa.core.internal.resource.contenttypes"
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/property_files/jpa_jpql_validation.properties b/jpa/plugins/org.eclipse.jpt.jpa.core/property_files/jpa_jpql_validation.properties
index 9754e8664a..850677b495 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/property_files/jpa_jpql_validation.properties
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/property_files/jpa_jpql_validation.properties
@@ -229,8 +229,8 @@ EXTRACT_EXPRESSION_INVALID_EXPRESSION = The date expression is not a valid expre
 EXTRACT_EXPRESSION_INVALID_JPA_VERSION = An EXTRACT expression is only supported by EclipseLink.
 EXTRACT_EXPRESSION_MISSING_DATE_PART = The date part must be specified.
 EXTRACT_EXPRESSION_MISSING_EXPRESSION = The date expression is missing from the EXTRACT expression.
-EXTRACT_EXPRESSION_MISSING_LEFT_PARENTHESIS = The date part must be specified.
-EXTRACT_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The left parenthesis is missing from the EXTRACT expression.
+EXTRACT_EXPRESSION_MISSING_LEFT_PARENTHESIS = The left parenthesis is missing from the EXTRACT expression.
+EXTRACT_EXPRESSION_MISSING_RIGHT_PARENTHESIS = The right parenthesis is missing from the EXTRACT expression.
 
 # FunctionExpression - Grammar
 FUNCTION_EXPRESSION_HAS_EXPRESSION = The function {0} should not have any argument.
@@ -497,8 +497,8 @@ SUBSTRING_EXPRESSION_MISSING_SECOND_EXPRESSION = The second argument is missing
 SUBSTRING_EXPRESSION_MISSING_THIRD_EXPRESSION = The third argument is missing from the SUBSTRING expression.
 # SubstringExpression - Semantic
 SUBSTRING_EXPRESSION_FIRST_EXPRESSION_WRONG_TYPE = The first argument is not a String value.
-SUBSTRING_EXPRESSION_SECOND_EXPRESSION_WRONG_TYPE = The first argument is not an integer value.
-SUBSTRING_EXPRESSION_THIRD_EXPRESSION_WRONG_TYPE = The first argument is not an integer value.
+SUBSTRING_EXPRESSION_SECOND_EXPRESSION_WRONG_TYPE = The second argument is not an integer value.
+SUBSTRING_EXPRESSION_THIRD_EXPRESSION_WRONG_TYPE = The third argument is not an integer value.
 
 # SumFunction - Grammar
 SUM_FUNCTION_INVALID_EXPRESSION = The encapsulated expression is not a valid expression.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaMapping.java
index 0ae0971e4e..05c50266ac 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaMapping.java
@@ -26,6 +26,7 @@ import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.RelationshipMapping;
 import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
 import org.eclipse.jpt.jpa.core.jpa2.MappingKeys2_0;
+import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0;
 import org.eclipse.persistence.jpa.jpql.spi.IEntity;
 import org.eclipse.persistence.jpa.jpql.spi.IManagedType;
 import org.eclipse.persistence.jpa.jpql.spi.IMapping;
@@ -123,12 +124,20 @@ public abstract class JpaMapping implements IMapping {
 		// For relationship mapping, make sure to check the target entity first
 		if (isRelationship()) {
 
-			String entityName = ((RelationshipMapping) mapping).getTargetEntity();
-
-			if (StringTools.stringIsNotEmpty(entityName)) {
-				IEntity entity = getParent().getProvider().getEntityNamed(entityName);
-				if (entity != null) {
-					return entity.getType();
+			if (mappingType == ELEMENT_COLLECTION) {
+				String targetClass = ((ElementCollectionMapping2_0) mapping).getTargetClass();
+				if (StringTools.stringIsNotEmpty(targetClass)) {
+					return getTypeRepository().getType(targetClass);
+				}
+			}
+			else {
+				String entityName = ((RelationshipMapping) mapping).getTargetEntity();
+
+				if (StringTools.stringIsNotEmpty(entityName)) {
+					IEntity entity = getParent().getProvider().getEntityNamed(entityName);
+					if (entity != null) {
+						return entity.getType();
+					}
 				}
 			}
 		}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.db.ui/.cvsignore b/jpa/plugins/org.eclipse.jpt.jpa.db.ui/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.db.ui/.cvsignore
+++ b/jpa/plugins/org.eclipse.jpt.jpa.db.ui/.gitignore
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.db/.cvsignore b/jpa/plugins/org.eclipse.jpt.jpa.db/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.db/.cvsignore
+++ b/jpa/plugins/org.eclipse.jpt.jpa.db/.gitignore
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core.ddlgen/.cvsignore b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core.ddlgen/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core.ddlgen/.cvsignore
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core.ddlgen/.gitignore
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/.cvsignore b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/.cvsignore
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/.gitignore
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/.cvsignore b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/.cvsignore
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/.gitignore
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.gen/.cvsignore b/jpa/plugins/org.eclipse.jpt.jpa.gen/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.gen/.cvsignore
+++ b/jpa/plugins/org.eclipse.jpt.jpa.gen/.gitignore
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/.cvsignore b/jpa/plugins/org.eclipse.jpt.jpa.ui/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/.cvsignore
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/.gitignore
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/.cvsignore b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/.cvsignore
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/.gitignore
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/.cvsignore b/jpa/tests/org.eclipse.jpt.jpa.core.tests/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/.cvsignore
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/.gitignore
diff --git a/jpa/tests/org.eclipse.jpt.jpa.db.tests/.cvsignore b/jpa/tests/org.eclipse.jpt.jpa.db.tests/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.db.tests/.cvsignore
+++ b/jpa/tests/org.eclipse.jpt.jpa.db.tests/.gitignore
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/.cvsignore b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/.cvsignore
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/.gitignore
diff --git a/jpa/tests/org.eclipse.jpt.jpa.gen.tests/.cvsignore b/jpa/tests/org.eclipse.jpt.jpa.gen.tests/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.gen.tests/.cvsignore
+++ b/jpa/tests/org.eclipse.jpt.jpa.gen.tests/.gitignore
diff --git a/jpa/tests/org.eclipse.jpt.jpa.ui.tests/.cvsignore b/jpa/tests/org.eclipse.jpt.jpa.ui.tests/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.ui.tests/.cvsignore
+++ b/jpa/tests/org.eclipse.jpt.jpa.ui.tests/.gitignore
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/.cvsignore b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/.cvsignore
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/.gitignore
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/.cvsignore b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/.gitignore
index ba077a4031..ba077a4031 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/.cvsignore
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/.gitignore