Attachment 216196 Details for Bug 380150 – proposed patch against HEAD

[patch] proposed patch against HEAD

380182.txt (text/plain), 14.64 KB, created by Karen Butzke

on 2012-05-24 10:12:40 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Karen Butzke

Created: 2012-05-24 10:12:40 EDT

Size: 14.64 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jpt.jpa.eclipselink.core
>Index: src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_0JpaAnnotationDefinitionProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_0JpaAnnotationDefinitionProvider.java,v
>retrieving revision 1.2
>diff -u -r1.2 EclipseLink2_0JpaAnnotationDefinitionProvider.java
>--- src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_0JpaAnnotationDefinitionProvider.java	5 Dec 2011 17:49:02 -0000	1.2
>+++ src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_0JpaAnnotationDefinitionProvider.java	23 May 2012 15:08:21 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2011 Oracle. All rights reserved.
>+ * Copyright (c) 2011, 2012 Oracle. All rights reserved.
>  * This program and the accompanying materials are 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.
>@@ -21,19 +21,23 @@
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkChangeTrackingAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConvertAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConverterAnnotationDefinition;
>+import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConverters2_2AnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkCustomizerAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkExistenceCheckingAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkJoinFetchAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkMapKeyConvert2_0AnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkMutableAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkObjectTypeConverterAnnotationDefinition;
>+import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkObjectTypeConverters2_2AnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkPrimaryKeyAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkPrivateOwnedAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkReadOnlyAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkReadTransformerAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkStructConverterAnnotationDefinition;
>+import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkStructConverters2_2AnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTransformationAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTypeConverterAnnotationDefinition;
>+import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTypeConverters2_2AnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkVariableOneToOneAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkWriteTransformerAnnotationDefinition;
> 
>@@ -71,16 +75,20 @@
> 		EclipseLinkCacheAnnotationDefinition.instance(),
> 		EclipseLinkChangeTrackingAnnotationDefinition.instance(),
> 		EclipseLinkConvertAnnotationDefinition.instance(),
>+		EclipseLinkConverters2_2AnnotationDefinition.instance(), //Bug 380182 - not supported before EL 2.2, but can handle with validation
> 		EclipseLinkCustomizerAnnotationDefinition.instance(),
> 		EclipseLinkExistenceCheckingAnnotationDefinition.instance(),
> 		EclipseLinkJoinFetchAnnotationDefinition.instance(),
> 		EclipseLinkMapKeyConvert2_0AnnotationDefinition.instance(),
> 		EclipseLinkMutableAnnotationDefinition.instance(),
>+		EclipseLinkObjectTypeConverters2_2AnnotationDefinition.instance(), //Bug 380182 - not supported before EL 2.2, but can handle with validation
> 		EclipseLinkPrimaryKeyAnnotationDefinition.instance(),
> 		EclipseLinkPrivateOwnedAnnotationDefinition.instance(),
> 		EclipseLinkReadOnlyAnnotationDefinition.instance(),
> 		EclipseLinkReadTransformerAnnotationDefinition.instance(),
>+		EclipseLinkStructConverters2_2AnnotationDefinition.instance(), //Bug 380182 - not supported before EL 2.2, but can handle with validation
> 		EclipseLinkTransformationAnnotationDefinition.instance(),
>+		EclipseLinkTypeConverters2_2AnnotationDefinition.instance(), //Bug 380182 - not supported before EL 2.2, but can handle with validation
> 		EclipseLinkVariableOneToOneAnnotationDefinition.instance(),
> 		EclipseLinkWriteTransformerAnnotationDefinition.instance()
> 	};
>Index: src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_1JpaAnnotationDefinitionProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_1JpaAnnotationDefinitionProvider.java,v
>retrieving revision 1.2
>diff -u -r1.2 EclipseLink2_1JpaAnnotationDefinitionProvider.java
>--- src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_1JpaAnnotationDefinitionProvider.java	5 Dec 2011 17:49:02 -0000	1.2
>+++ src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_1JpaAnnotationDefinitionProvider.java	23 May 2012 15:08:21 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
>+ * Copyright (c) 2010, 2012 Oracle. All rights reserved.
>  * This program and the accompanying materials are 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.
>@@ -22,18 +22,22 @@
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkClassExtractor2_1AnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConvertAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConverterAnnotationDefinition;
>+import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConverters2_2AnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkCustomizerAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkExistenceCheckingAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkJoinFetchAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkMutableAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkObjectTypeConverterAnnotationDefinition;
>+import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkObjectTypeConverters2_2AnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkPrimaryKeyAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkPrivateOwnedAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkReadOnlyAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkReadTransformerAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkStructConverterAnnotationDefinition;
>+import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkStructConverters2_2AnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTransformationAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTypeConverterAnnotationDefinition;
>+import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTypeConverters2_2AnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkVariableOneToOneAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkWriteTransformerAnnotationDefinition;
> 
>@@ -72,15 +76,19 @@
> 		EclipseLinkChangeTrackingAnnotationDefinition.instance(),
> 		EclipseLinkClassExtractor2_1AnnotationDefinition.instance(),
> 		EclipseLinkConvertAnnotationDefinition.instance(),
>+		EclipseLinkConverters2_2AnnotationDefinition.instance(), //Bug 380182 - not supported before EL 2.2, but can handle with validation
> 		EclipseLinkCustomizerAnnotationDefinition.instance(),
> 		EclipseLinkExistenceCheckingAnnotationDefinition.instance(),
> 		EclipseLinkJoinFetchAnnotationDefinition.instance(),
> 		EclipseLinkMutableAnnotationDefinition.instance(),
>+		EclipseLinkObjectTypeConverters2_2AnnotationDefinition.instance(), //Bug 380182 - not supported before EL 2.2, but can handle with validation
> 		EclipseLinkPrimaryKeyAnnotationDefinition.instance(),
> 		EclipseLinkPrivateOwnedAnnotationDefinition.instance(),
> 		EclipseLinkReadOnlyAnnotationDefinition.instance(),
> 		EclipseLinkReadTransformerAnnotationDefinition.instance(),
>+		EclipseLinkStructConverters2_2AnnotationDefinition.instance(), //Bug 380182 - not supported before EL 2.2, but can handle with validation
> 		EclipseLinkTransformationAnnotationDefinition.instance(),
>+		EclipseLinkTypeConverters2_2AnnotationDefinition.instance(), //Bug 380182 - not supported before EL 2.2, but can handle with validation
> 		EclipseLinkVariableOneToOneAnnotationDefinition.instance(),
> 		EclipseLinkWriteTransformerAnnotationDefinition.instance()
> 	};
>Index: src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaAnnotationDefinitionProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaAnnotationDefinitionProvider.java,v
>retrieving revision 1.3
>diff -u -r1.3 EclipseLinkJpaAnnotationDefinitionProvider.java
>--- src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaAnnotationDefinitionProvider.java	5 Dec 2011 17:49:02 -0000	1.3
>+++ src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaAnnotationDefinitionProvider.java	23 May 2012 15:08:21 -0000
>@@ -21,18 +21,22 @@
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkChangeTrackingAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConvertAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConverterAnnotationDefinition;
>+import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConverters2_2AnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkCustomizerAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkExistenceCheckingAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkJoinFetchAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkMutableAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkObjectTypeConverterAnnotationDefinition;
>+import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkObjectTypeConverters2_2AnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkPrimaryKeyAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkPrivateOwnedAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkReadOnlyAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkReadTransformerAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkStructConverterAnnotationDefinition;
>+import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkStructConverters2_2AnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTransformationAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTypeConverterAnnotationDefinition;
>+import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTypeConverters2_2AnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkVariableOneToOneAnnotationDefinition;
> import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkWriteTransformerAnnotationDefinition;
> 
>@@ -71,15 +75,19 @@
> 		EclipseLinkCacheAnnotationDefinition.instance(),
> 		EclipseLinkChangeTrackingAnnotationDefinition.instance(),
> 		EclipseLinkConvertAnnotationDefinition.instance(),
>+		EclipseLinkConverters2_2AnnotationDefinition.instance(), //Bug 380182 - not supported before EL 2.2, but can handle with validation
> 		EclipseLinkCustomizerAnnotationDefinition.instance(),
> 		EclipseLinkExistenceCheckingAnnotationDefinition.instance(),
> 		EclipseLinkJoinFetchAnnotationDefinition.instance(),
> 		EclipseLinkMutableAnnotationDefinition.instance(),
>+		EclipseLinkObjectTypeConverters2_2AnnotationDefinition.instance(), //Bug 380182 - not supported before EL 2.2, but can handle with validation
> 		EclipseLinkPrimaryKeyAnnotationDefinition.instance(),
> 		EclipseLinkPrivateOwnedAnnotationDefinition.instance(),
> 		EclipseLinkReadOnlyAnnotationDefinition.instance(),
> 		EclipseLinkReadTransformerAnnotationDefinition.instance(),
>+		EclipseLinkStructConverters2_2AnnotationDefinition.instance(), //Bug 380182 - not supported before EL 2.2, but can handle with validation
> 		EclipseLinkTransformationAnnotationDefinition.instance(),
>+		EclipseLinkTypeConverters2_2AnnotationDefinition.instance(), //Bug 380182 - not supported before EL 2.2, but can handle with validation
> 		EclipseLinkVariableOneToOneAnnotationDefinition.instance(),
> 		EclipseLinkWriteTransformerAnnotationDefinition.instance()
> 	};

Actions: View | Diff

Attachments on bug 380150: 216171 | 216196 | 216199 | 216200 | 216202 | 216208