May 2011 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r31352 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core: src/org/jboss/tools/hibernate/jpt/core/internal and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2011-05-18 06:18:56 -0400 (Wed, 18 May 2011) New Revision: 31352 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java.tmp Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformProvider.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaBasicMappingDefinition.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaIdMappingDefinition.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToManyMappingDefinition.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToOneMappingDefinition.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/HibernateJpa2_0PlatformProvider.java Log: https://issues.jboss.org/browse/JBIDE-8947 Mode hibernate tools to Eclipse3.7M7 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2011-05-18 10:18:56 UTC (rev 31352) @@ -17,7 +17,7 @@ org.eclipse.jpt.common.utility, org.eclipse.jpt.common.core, org.eclipse.jpt.jpa.db, - org.eclipse.jpt.jpa.core, + org.eclipse.jpt.jpa.core;bundle-version="3.0.0", org.eclipse.text;bundle-version="3.5.100", org.eclipse.jst.j2ee;bundle-version="1.1.500" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformProvider.java 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformProvider.java 2011-05-18 10:18:56 UTC (rev 31352) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007-2008 Red Hat, Inc. + * Copyright (c) 2007-2011 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, @@ -28,7 +28,6 @@ import org.eclipse.jpt.jpa.core.internal.JavaResourceModelProvider; import org.eclipse.jpt.jpa.core.internal.OrmResourceModelProvider; import org.eclipse.jpt.jpa.core.internal.PersistenceResourceModelProvider; -import org.eclipse.jpt.jpa.core.internal.context.java.JavaBasicMappingDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddableDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddedIdMappingDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddedMappingDefinition; @@ -133,7 +132,7 @@ // order matches that used by the Reference Implementation (EclipseLink) protected static final DefaultJavaAttributeMappingDefinition[] DEFAULT_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new DefaultJavaAttributeMappingDefinition[] { JavaEmbeddedMappingDefinition.instance(), - JavaBasicMappingDefinition.instance() + HibernateJavaBasicMappingDefinition.instance() }; @Override Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaBasicMappingDefinition.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaBasicMappingDefinition.java 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaBasicMappingDefinition.java 2011-05-18 10:18:56 UTC (rev 31352) @@ -12,14 +12,23 @@ import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaBasicMappingDefinition; +import org.eclipse.jpt.jpa.core.JpaFactory; +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition; +import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.jpa.core.resource.java.BasicAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.EnumeratedAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.LobAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.TemporalAnnotation; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; /** * @author Dmitry Geraskov (geraskov(a)gmail.com) * */ -public class HibernateJavaBasicMappingDefinition extends AbstractJavaBasicMappingDefinition +public class HibernateJavaBasicMappingDefinition implements DefaultJavaAttributeMappingDefinition { // singleton private static final HibernateJavaBasicMappingDefinition INSTANCE = new HibernateJavaBasicMappingDefinition(); @@ -31,22 +40,55 @@ return INSTANCE; } - /** * Enforce singleton usage */ private HibernateJavaBasicMappingDefinition() { super(); } + + public String getKey() { + return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; + } + public String getAnnotationName() { + return BasicAnnotation.ANNOTATION_NAME; + } + + public boolean isSpecified(JavaPersistentAttribute persistentAttribute) { + return persistentAttribute.getResourcePersistentAttribute().getAnnotation(this.getAnnotationName()) != null; + } + protected static final String[] HIBERNATE_ANNOTATION_NAMES_ARRAY = new String[] { Hibernate.GENERATED, Hibernate.INDEX, Hibernate.TYPE }; + + private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] { + ColumnAnnotation.ANNOTATION_NAME, + LobAnnotation.ANNOTATION_NAME, + TemporalAnnotation.ANNOTATION_NAME, + EnumeratedAnnotation.ANNOTATION_NAME + }; + private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY); + @Override public Iterable<String> getSupportingAnnotationNames() { - return new CompositeIterable<String>(super.getSupportingAnnotationNames(), new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY)); + return new CompositeIterable<String>(SUPPORTING_ANNOTATION_NAMES, new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY)); } + + public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) { + return factory.buildJavaBasicMapping(persistentAttribute); + } + + public boolean isDefault(JavaPersistentAttribute persistentAttribute) { + return persistentAttribute.typeIsBasic(); + } + + @Override + public String toString() { + return this.getClass().getSimpleName(); + } } \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaIdMappingDefinition.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaIdMappingDefinition.java 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaIdMappingDefinition.java 2011-05-18 10:18:56 UTC (rev 31352) @@ -12,14 +12,24 @@ import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaIdMappingDefinition; +import org.eclipse.jpt.jpa.core.JpaFactory; +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; +import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.GeneratedValueAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.IdAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.SequenceGeneratorAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.TableGeneratorAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.TemporalAnnotation; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; /** * @author Dmitry Geraskov (geraskov(a)gmail.com) * */ -public class HibernateJavaIdMappingDefinition extends AbstractJavaIdMappingDefinition +public class HibernateJavaIdMappingDefinition implements JavaAttributeMappingDefinition { // singleton private static final HibernateJavaIdMappingDefinition INSTANCE = new HibernateJavaIdMappingDefinition(); @@ -31,21 +41,52 @@ return INSTANCE; } - /** * Enforce singleton usage */ private HibernateJavaIdMappingDefinition() { super(); } + + public String getKey() { + return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY; + } + public String getAnnotationName() { + return IdAnnotation.ANNOTATION_NAME; + } + + public boolean isSpecified(JavaPersistentAttribute persistentAttribute) { + return persistentAttribute.getResourcePersistentAttribute().getAnnotation(this.getAnnotationName()) != null; + } + protected static final String[] HIBERNATE_ANNOTATION_NAMES_ARRAY = new String[] { Hibernate.INDEX, Hibernate.TYPE }; + + private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] { + ColumnAnnotation.ANNOTATION_NAME, + GeneratedValueAnnotation.ANNOTATION_NAME, + TemporalAnnotation.ANNOTATION_NAME, + TableGeneratorAnnotation.ANNOTATION_NAME, + SequenceGeneratorAnnotation.ANNOTATION_NAME + }; + private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY); @Override public Iterable<String> getSupportingAnnotationNames() { - return new CompositeIterable<String>(super.getSupportingAnnotationNames(), new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY)); + return new CompositeIterable<String>(SUPPORTING_ANNOTATION_NAMES, new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY)); } + + @Override + public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) { + return factory.buildJavaIdMapping(persistentAttribute); + } + + @Override + public String toString() { + return this.getClass().getSimpleName(); + } + } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToManyMappingDefinition.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToManyMappingDefinition.java 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToManyMappingDefinition.java 2011-05-18 10:18:56 UTC (rev 31352) @@ -10,22 +10,32 @@ ******************************************************************************/ package org.jboss.tools.hibernate.jpt.core.internal.context.definition; -import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaManyToManyMappingDefinition; +import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.jpa.core.JpaFactory; +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; +import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.JoinColumnsAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.ManyToOneAnnotation; +import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; - /** * @author Dmitry Geraskov (geraskov(a)gmail.com) * */ -public class HibernateJavaManyToManyMappingDefinition extends AbstractJavaManyToManyMappingDefinition { - +public class HibernateJavaManyToManyMappingDefinition implements JavaAttributeMappingDefinition +{ // singleton - private static final HibernateJavaManyToManyMappingDefinition INSTANCE = new HibernateJavaManyToManyMappingDefinition(); + private static final JavaAttributeMappingDefinition INSTANCE = new HibernateJavaManyToManyMappingDefinition(); /** * Return the singleton. */ - public static HibernateJavaManyToManyMappingDefinition instance() { + public static JavaAttributeMappingDefinition instance() { return INSTANCE; } @@ -37,4 +47,40 @@ super(); } -} + public String getKey() { + return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; + } + + public String getAnnotationName() { + return ManyToOneAnnotation.ANNOTATION_NAME; + } + + public boolean isSpecified(JavaPersistentAttribute persistentAttribute) { + return persistentAttribute.getResourcePersistentAttribute().getAnnotation(this.getAnnotationName()) != null; + } + + @Override + public Iterable<String> getSupportingAnnotationNames() { + return new CompositeIterable<String>(SUPPORTING_ANNOTATION_NAMES, new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY)); + } + + protected static final String[] HIBERNATE_ANNOTATION_NAMES_ARRAY = new String[] { + Hibernate.FOREIGN_KEY, + }; + + private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] { + JoinTableAnnotation.ANNOTATION_NAME, + JoinColumnAnnotation.ANNOTATION_NAME, + JoinColumnsAnnotation.ANNOTATION_NAME + }; + private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY); + + public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) { + return factory.buildJavaManyToOneMapping(persistentAttribute); + } + + @Override + public String toString() { + return this.getClass().getSimpleName(); + } +} \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToOneMappingDefinition.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToOneMappingDefinition.java 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToOneMappingDefinition.java 2011-05-18 10:18:56 UTC (rev 31352) @@ -12,15 +12,22 @@ import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.jpa.core.JpaFactory; +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaManyToOneMappingDefinition; +import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.JoinColumnsAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.ManyToOneAnnotation; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; /** * @author Dmitry Geraskov (geraskov(a)gmail.com) * */ -public class HibernateJavaManyToOneMappingDefinition extends AbstractJavaManyToOneMappingDefinition +public class HibernateJavaManyToOneMappingDefinition implements JavaAttributeMappingDefinition { // singleton private static final HibernateJavaManyToOneMappingDefinition INSTANCE = new HibernateJavaManyToOneMappingDefinition(); @@ -32,20 +39,47 @@ return INSTANCE; } - /** * Enforce singleton usage */ private HibernateJavaManyToOneMappingDefinition() { super(); } + + public String getKey() { + return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; + } + public String getAnnotationName() { + return ManyToOneAnnotation.ANNOTATION_NAME; + } + + public boolean isSpecified(JavaPersistentAttribute persistentAttribute) { + return persistentAttribute.getResourcePersistentAttribute().getAnnotation(this.getAnnotationName()) != null; + } + protected static final String[] HIBERNATE_ANNOTATION_NAMES_ARRAY = new String[] { Hibernate.FOREIGN_KEY, }; + + private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] { + JoinTableAnnotation.ANNOTATION_NAME, + JoinColumnAnnotation.ANNOTATION_NAME, + JoinColumnsAnnotation.ANNOTATION_NAME + }; + private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY); @Override public Iterable<String> getSupportingAnnotationNames() { - return new CompositeIterable<String>(super.getSupportingAnnotationNames(), new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY)); + return new CompositeIterable<String>(SUPPORTING_ANNOTATION_NAMES, new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY)); } + + public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) { + return factory.buildJavaManyToOneMapping(persistentAttribute); + } + + @Override + public String toString() { + return this.getClass().getSimpleName(); + } } \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java 2011-05-18 10:18:56 UTC (rev 31352) @@ -12,14 +12,24 @@ import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaOneToOneMappingDefinition; +import org.eclipse.jpt.jpa.core.JpaFactory; +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; +import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.JoinColumnsAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.OneToOneAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnAnnotation; +import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnsAnnotation; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; /** * @author Dmitry Geraskov (geraskov(a)gmail.com) * */ -public class HibernateJavaOneToOneMappingDefinition extends AbstractJavaOneToOneMappingDefinition +public class HibernateJavaOneToOneMappingDefinition implements JavaAttributeMappingDefinition { // singleton private static final HibernateJavaOneToOneMappingDefinition INSTANCE = new HibernateJavaOneToOneMappingDefinition(); @@ -31,7 +41,6 @@ return INSTANCE; } - /** * Enforce singleton usage */ @@ -39,12 +48,44 @@ super(); } + public String getKey() { + return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; + } + + public String getAnnotationName() { + return OneToOneAnnotation.ANNOTATION_NAME; + } + + public boolean isSpecified(JavaPersistentAttribute persistentAttribute) { + return persistentAttribute.getResourcePersistentAttribute().getAnnotation(this.getAnnotationName()) != null; + } + protected static final String[] HIBERNATE_ANNOTATION_NAMES_ARRAY = new String[] { Hibernate.FOREIGN_KEY, }; + private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] { + JoinTableAnnotation.ANNOTATION_NAME, + JoinColumnAnnotation.ANNOTATION_NAME, + JoinColumnsAnnotation.ANNOTATION_NAME, + PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, + PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME + }; + private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY); + @Override public Iterable<String> getSupportingAnnotationNames() { - return new CompositeIterable<String>(super.getSupportingAnnotationNames(), new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY)); + return new CompositeIterable<String>(SUPPORTING_ANNOTATION_NAMES, new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY)); } + + public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) { + return factory.buildJavaOneToOneMapping(persistentAttribute); + } + + @Override + public String toString() { + return this.getClass().getSimpleName(); + } + + } \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java 2011-05-18 10:18:56 UTC (rev 31352) @@ -195,7 +195,6 @@ } } - // ********** hibernateNamed native queries ********** public ListIterator<HibernateJavaNamedNativeQuery> hibernateNamedNativeQueries() { @@ -305,71 +304,10 @@ } } - - // ********** validation ********** - @Override - public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) { - super.validate(messages, reporter, astRoot); - this.validateQueries(messages, astRoot); - } - - @Override - protected void validateQueries(List<IMessage> messages, CompilationUnit astRoot) { - for (Iterator<JavaQuery> localQueries = this.queries(); localQueries.hasNext(); ) { - JavaQuery localQuery = localQueries.next(); - String name = localQuery.getName(); - if (StringTools.stringIsEmpty(name)){ - messages.add( - DefaultJpaValidationMessages.buildMessage( - IMessage.HIGH_SEVERITY, - JpaValidationMessages.QUERY_NAME_UNDEFINED, - new String[] {}, - localQuery, - localQuery.getNameTextRange(astRoot) - ) - ); - } else { - List<String> reportedNames = new ArrayList<String>(); - for (Iterator<Query> globalQueries = this.getPersistenceUnit().queries(); globalQueries.hasNext(); ) { - if (localQuery.duplicates(globalQueries.next()) && !reportedNames.contains(name)) { - messages.add( - DefaultJpaValidationMessages.buildMessage( - IMessage.HIGH_SEVERITY, - JpaValidationMessages.QUERY_DUPLICATE_NAME, - new String[] {name}, - localQuery, - localQuery.getNameTextRange(astRoot) - ) - ); - reportedNames.add(name); - } - } - } - String query = localQuery.getQuery(); - if (StringTools.stringIsEmpty(query)){ - messages.add( - DefaultJpaValidationMessages.buildMessage( - IMessage.HIGH_SEVERITY, - JpaValidationMessages.QUERY_STATEMENT_UNDEFINED, - new String[] {name}, - localQuery, - localQuery.getNameTextRange(astRoot) - ) - ); - } - } - } - - - @Override @SuppressWarnings("unchecked") public Iterator<JavaQuery> queries() { - return new CompositeIterator<JavaQuery>(this.hibernateNamedNativeQueries(), this.hibernateNamedQueries()); + return new CompositeIterator<JavaQuery>(queries(), this.hibernateNamedNativeQueries(), this.hibernateNamedQueries()); } - @Override - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.owner.getResourceAnnotatedElement().getTextRange(astRoot); - } } Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java.tmp =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java.tmp (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java.tmp 2011-05-18 10:18:56 UTC (rev 31352) @@ -0,0 +1,314 @@ +/******************************************************************************* + * Copyright (c) 2010-2011 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.jpt.core.internal.context.java; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; +import java.util.Vector; + +import org.eclipse.jdt.core.dom.CompilationUnit; +import org.eclipse.jpt.common.core.utility.TextRange; +import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.StringTools; +import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterables.SubIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterators.CompositeIterator; +import org.eclipse.jpt.jpa.core.context.Query; +import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.jpa.core.context.java.JavaQuery; +import org.eclipse.jpt.jpa.core.internal.context.ContextContainerTools; +import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaQueryContainer; +import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; +import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.jpa.core.resource.java.NestableAnnotation; +import org.eclipse.wst.validation.internal.provisional.core.IMessage; +import org.eclipse.wst.validation.internal.provisional.core.IReporter; +import org.jboss.tools.hibernate.jpt.core.internal.HibernateAbstractJpaFactory; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedNativeQuery; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedQuery; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.HibernateNamedNativeQueriesAnnotation; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.HibernateNamedNativeQueryAnnotation; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.HibernateNamedQueriesAnnotation; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.HibernateNamedQueryAnnotation; + +/** + * + * @author Dmitry Geraskov + * + */ +public class HibernateJavaQueryContainerImpl extends GenericJavaQueryContainer +implements HibernateJavaQueryContainer{ + + protected final Vector<HibernateJavaNamedQuery> hibernateNamedQueries = new Vector<HibernateJavaNamedQuery>(); + protected HibernateNamedQueryContainerAdapter hibernateNamedQueryContainerAdapter = new HibernateNamedQueryContainerAdapter(); + + protected final Vector<HibernateJavaNamedNativeQuery> hibernateNamedNativeQueries = new Vector<HibernateJavaNamedNativeQuery>(); + protected HibernateNamedNativeQueryContainerAdapter hibernateNamedNativeQueryContainerAdapter = new HibernateNamedNativeQueryContainerAdapter(); + + + public HibernateJavaQueryContainerImpl(JavaJpaContextNode parent, Owner owner) { + super(parent, owner); + this.initializeHibernateNamedQueries(); + this.initializeHibernateNamedNativeQueries(); + } + + @Override + protected HibernateAbstractJpaFactory getJpaFactory() { + return (HibernateAbstractJpaFactory) super.getJpaFactory(); + } + + + // ********** synchronize/update ********** + + @Override + public void synchronizeWithResourceModel() { + super.synchronizeWithResourceModel(); + this.syncHibernateNamedQueries(); + this.syncHibernateNamedNativeQueries(); + } + + @Override + public void update() { + super.update(); + this.updateNodes(this.getHibernateNamedQueries()); + this.updateNodes(this.getHibernateNamedNativeQueries()); + } + + + // ********** hibernateNamed queries ********** + + public ListIterator<HibernateJavaNamedQuery> hibernateNamedQueries() { + return this.getHibernateNamedQueries().iterator(); + } + + protected ListIterable<HibernateJavaNamedQuery> getHibernateNamedQueries() { + return new LiveCloneListIterable<HibernateJavaNamedQuery>(this.hibernateNamedQueries); + } + + public int hibernateNamedQueriesSize() { + return this.hibernateNamedQueries.size(); + } + + public HibernateNamedQuery addHibernateNamedQuery() { + return this.addHibernateNamedQuery(this.hibernateNamedQueries.size()); + } + + public HibernateJavaNamedQuery addHibernateNamedQuery(int index) { + HibernateNamedQueryAnnotation annotation = this.buildHibernateNamedQueryAnnotation(index); + return this.addHibernateNamedQuery_(index, annotation); + } + + protected HibernateNamedQueryAnnotation buildHibernateNamedQueryAnnotation(int index) { + return (HibernateNamedQueryAnnotation) this.owner.getResourceAnnotatedElement().addAnnotation(index, HibernateNamedQueryAnnotation.ANNOTATION_NAME, HibernateNamedQueriesAnnotation.ANNOTATION_NAME); + } + + public void removeHibernateNamedQuery(HibernateNamedQuery hibernateNamedQuery) { + this.removeHibernateNamedQuery(this.hibernateNamedQueries.indexOf(hibernateNamedQuery)); + } + + public void removeHibernateNamedQuery(int index) { + this.owner.getResourceAnnotatedElement().removeAnnotation(index, HibernateNamedQueryAnnotation.ANNOTATION_NAME, HibernateNamedQueriesAnnotation.ANNOTATION_NAME); + this.removeHibernateNamedQuery_(index); + } + + protected void removeHibernateNamedQuery_(int index) { + this.removeItemFromList(index, this.hibernateNamedQueries, NAMED_QUERIES_LIST); + } + + public void moveHibernateNamedQuery(int targetIndex, int sourceIndex) { + this.owner.getResourceAnnotatedElement().moveAnnotation(targetIndex, sourceIndex, HibernateNamedQueriesAnnotation.ANNOTATION_NAME); + this.moveItemInList(targetIndex, sourceIndex, this.hibernateNamedQueries, NAMED_QUERIES_LIST); + } + + protected void initializeHibernateNamedQueries() { + for (HibernateNamedQueryAnnotation annotation : this.getHibernateNamedQueryAnnotations()) { + this.hibernateNamedQueries.add(this.buildHibernateNamedQuery(annotation)); + } + } + + protected HibernateJavaNamedQuery buildHibernateNamedQuery(HibernateNamedQueryAnnotation hibernateNamedQueryAnnotation) { + return this.getJpaFactory().buildHibernateJavaNamedQuery(this, hibernateNamedQueryAnnotation); + } + + protected void syncHibernateNamedQueries() { + ContextContainerTools.synchronizeWithResourceModel(this.hibernateNamedQueryContainerAdapter); + } + + protected Iterable<HibernateNamedQueryAnnotation> getHibernateNamedQueryAnnotations() { + return new SubIterableWrapper<NestableAnnotation, HibernateNamedQueryAnnotation>( + CollectionTools.iterable(this.hibernateNamedQueryAnnotations()) + ); + } + + protected Iterator<NestableAnnotation> hibernateNamedQueryAnnotations() { + return this.owner.getResourceAnnotatedElement().annotations(HibernateNamedQueryAnnotation.ANNOTATION_NAME, HibernateNamedQueriesAnnotation.ANNOTATION_NAME); + } + + protected void moveHibernateNamedQuery_(int index, HibernateJavaNamedQuery hibernateNamedQuery) { + this.moveItemInList(index, hibernateNamedQuery, this.hibernateNamedQueries, NAMED_QUERIES_LIST); + } + + protected HibernateJavaNamedQuery addHibernateNamedQuery_(int index, HibernateNamedQueryAnnotation hibernateNamedQueryAnnotation) { + HibernateJavaNamedQuery query = this.buildHibernateNamedQuery(hibernateNamedQueryAnnotation); + this.addItemToList(index, query, this.hibernateNamedQueries, NAMED_QUERIES_LIST); + return query; + } + + protected void removeHibernateNamedQuery_(HibernateNamedQuery hibernateNamedQuery) { + this.removeHibernateNamedQuery_(this.hibernateNamedQueries.indexOf(hibernateNamedQuery)); + } + + /** + * hibernateNamed query container adapter + */ + protected class HibernateNamedQueryContainerAdapter + implements ContextContainerTools.Adapter<HibernateJavaNamedQuery, HibernateNamedQueryAnnotation> + { + public Iterable<HibernateJavaNamedQuery> getContextElements() { + return HibernateJavaQueryContainerImpl.this.getHibernateNamedQueries(); + } + public Iterable<HibernateNamedQueryAnnotation> getResourceElements() { + return HibernateJavaQueryContainerImpl.this.getHibernateNamedQueryAnnotations(); + } + public HibernateNamedQueryAnnotation getResourceElement(HibernateJavaNamedQuery contextElement) { + return contextElement.getQueryAnnotation(); + } + public void moveContextElement(int index, HibernateJavaNamedQuery element) { + HibernateJavaQueryContainerImpl.this.moveHibernateNamedQuery_(index, element); + } + public void addContextElement(int index, HibernateNamedQueryAnnotation resourceElement) { + HibernateJavaQueryContainerImpl.this.addHibernateNamedQuery_(index, resourceElement); + } + public void removeContextElement(HibernateJavaNamedQuery element) { + HibernateJavaQueryContainerImpl.this.removeHibernateNamedQuery_(element); + } + } + + + // ********** hibernateNamed native queries ********** + + public ListIterator<HibernateJavaNamedNativeQuery> hibernateNamedNativeQueries() { + return this.getHibernateNamedNativeQueries().iterator(); + } + + protected ListIterable<HibernateJavaNamedNativeQuery> getHibernateNamedNativeQueries() { + return new LiveCloneListIterable<HibernateJavaNamedNativeQuery>(this.hibernateNamedNativeQueries); + } + + public int hibernateNamedNativeQueriesSize() { + return this.hibernateNamedNativeQueries.size(); + } + + public HibernateNamedNativeQuery addHibernateNamedNativeQuery() { + return this.addHibernateNamedNativeQuery(this.hibernateNamedNativeQueries.size()); + } + + public HibernateJavaNamedNativeQuery addHibernateNamedNativeQuery(int index) { + HibernateNamedNativeQueryAnnotation annotation = this.buildHibernateNamedNativeQueryAnnotation(index); + return this.addHibernateNamedNativeQuery_(index, annotation); + } + + protected HibernateNamedNativeQueryAnnotation buildHibernateNamedNativeQueryAnnotation(int index) { + return (HibernateNamedNativeQueryAnnotation) this.owner.getResourceAnnotatedElement().addAnnotation(index, HibernateNamedNativeQueryAnnotation.ANNOTATION_NAME, HibernateNamedNativeQueriesAnnotation.ANNOTATION_NAME); + } + + public void removeHibernateNamedNativeQuery(HibernateNamedNativeQuery hibernateNamedNativeQuery) { + this.removeHibernateNamedNativeQuery(this.hibernateNamedNativeQueries.indexOf(hibernateNamedNativeQuery)); + } + + public void removeHibernateNamedNativeQuery(int index) { + this.owner.getResourceAnnotatedElement().removeAnnotation(index, HibernateNamedNativeQueryAnnotation.ANNOTATION_NAME, HibernateNamedNativeQueriesAnnotation.ANNOTATION_NAME); + this.removeHibernateNamedNativeQuery_(index); + } + + protected void removeHibernateNamedNativeQuery_(int index) { + this.removeItemFromList(index, this.hibernateNamedNativeQueries, NAMED_NATIVE_QUERIES_LIST); + } + + public void moveHibernateNamedNativeQuery(int targetIndex, int sourceIndex) { + this.owner.getResourceAnnotatedElement().moveAnnotation(targetIndex, sourceIndex, HibernateNamedNativeQueriesAnnotation.ANNOTATION_NAME); + this.moveItemInList(targetIndex, sourceIndex, this.hibernateNamedNativeQueries, NAMED_NATIVE_QUERIES_LIST); + } + + protected void initializeHibernateNamedNativeQueries() { + for (HibernateNamedNativeQueryAnnotation annotation : this.getHibernateNamedNativeQueryAnnotations()) { + this.hibernateNamedNativeQueries.add(this.buildHibernateNamedNativeQuery(annotation)); + } + } + + protected HibernateJavaNamedNativeQuery buildHibernateNamedNativeQuery(HibernateNamedNativeQueryAnnotation hibernateNamedNativeQueryAnnotation) { + return this.getJpaFactory().buildHibernateJavaNamedNativeQuery(this, hibernateNamedNativeQueryAnnotation); + } + + protected void syncHibernateNamedNativeQueries() { + ContextContainerTools.synchronizeWithResourceModel(this.hibernateNamedNativeQueryContainerAdapter); + } + + protected Iterable<HibernateNamedNativeQueryAnnotation> getHibernateNamedNativeQueryAnnotations() { + return new SubIterableWrapper<NestableAnnotation, HibernateNamedNativeQueryAnnotation>( + CollectionTools.iterable(this.hibernateNamedNativeQueryAnnotations()) + ); + } + + protected Iterator<NestableAnnotation> hibernateNamedNativeQueryAnnotations() { + return this.owner.getResourceAnnotatedElement().annotations(HibernateNamedNativeQueryAnnotation.ANNOTATION_NAME, HibernateNamedNativeQueriesAnnotation.ANNOTATION_NAME); + } + + protected void moveHibernateNamedNativeQuery_(int index, HibernateJavaNamedNativeQuery hibernateNamedNativeQuery) { + this.moveItemInList(index, hibernateNamedNativeQuery, this.hibernateNamedNativeQueries, NAMED_NATIVE_QUERIES_LIST); + } + + protected HibernateJavaNamedNativeQuery addHibernateNamedNativeQuery_(int index, HibernateNamedNativeQueryAnnotation hibernateNamedNativeQueryAnnotation) { + HibernateJavaNamedNativeQuery query = this.buildHibernateNamedNativeQuery(hibernateNamedNativeQueryAnnotation); + this.addItemToList(index, query, this.hibernateNamedNativeQueries, NAMED_NATIVE_QUERIES_LIST); + return query; + } + + protected void removeHibernateNamedNativeQuery_(HibernateNamedNativeQuery hibernateNamedNativeQuery) { + this.removeHibernateNamedNativeQuery_(this.hibernateNamedNativeQueries.indexOf(hibernateNamedNativeQuery)); + } + + /** + * hibernateNamed native query container adapter + */ + protected class HibernateNamedNativeQueryContainerAdapter + implements ContextContainerTools.Adapter<HibernateJavaNamedNativeQuery, HibernateNamedNativeQueryAnnotation> + { + public Iterable<HibernateJavaNamedNativeQuery> getContextElements() { + return HibernateJavaQueryContainerImpl.this.getHibernateNamedNativeQueries(); + } + public Iterable<HibernateNamedNativeQueryAnnotation> getResourceElements() { + return HibernateJavaQueryContainerImpl.this.getHibernateNamedNativeQueryAnnotations(); + } + public HibernateNamedNativeQueryAnnotation getResourceElement(HibernateJavaNamedNativeQuery contextElement) { + return contextElement.getQueryAnnotation(); + } + public void moveContextElement(int index, HibernateJavaNamedNativeQuery element) { + HibernateJavaQueryContainerImpl.this.moveHibernateNamedNativeQuery_(index, element); + } + public void addContextElement(int index, HibernateNamedNativeQueryAnnotation resourceElement) { + HibernateJavaQueryContainerImpl.this.addHibernateNamedNativeQuery_(index, resourceElement); + } + public void removeContextElement(HibernateJavaNamedNativeQuery element) { + HibernateJavaQueryContainerImpl.this.removeHibernateNamedNativeQuery_(element); + } + } + + @Override + @SuppressWarnings("unchecked") + public Iterator<JavaQuery> queries() { + return new CompositeIterator<JavaQuery>(queries(), this.hibernateNamedNativeQueries(), this.hibernateNamedQueries()); + } + +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java 2011-05-18 10:18:56 UTC (rev 31352) @@ -38,7 +38,7 @@ import org.jboss.tools.hibernate.jpt.core.internal.resource.java.ParameterAnnotation; /** - * @author Dmitry Geraskov + * @author Dmitry Geraskov (geraskov(a)gmail.com) * */ public class JavaGenericGeneratorImpl extends AbstractJavaGenerator<GenericGeneratorAnnotation> @@ -101,11 +101,6 @@ } @Override - public TextRange getSelectionTextRange(CompilationUnit astRoot) { - return this.generatorAnnotation.getTextRange(astRoot); - } - - @Override public TextRange getNameTextRange(CompilationUnit astRoot) { return this.generatorAnnotation.getNameTextRange(astRoot); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/HibernateJpa2_0PlatformProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/HibernateJpa2_0PlatformProvider.java 2011-05-17 18:56:15 UTC (rev 31351) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/HibernateJpa2_0PlatformProvider.java 2011-05-18 10:18:56 UTC (rev 31352) @@ -28,24 +28,24 @@ import org.eclipse.jpt.jpa.core.internal.JavaResourceModelProvider; import org.eclipse.jpt.jpa.core.internal.OrmResourceModelProvider; import org.eclipse.jpt.jpa.core.internal.PersistenceResourceModelProvider; -import org.eclipse.jpt.jpa.core.internal.context.java.JavaBasicMappingDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddableDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddedIdMappingDefinition; -import org.eclipse.jpt.jpa.core.internal.context.java.JavaEntityDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaMappedSuperclassDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaTransientMappingDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaVersionMappingDefinition; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaElementCollectionMappingDefinition2_0; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaEmbeddedMappingDefinition2_0; -import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaIdMappingDefinition2_0; -import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaManyToManyMappingDefinition2_0; -import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaManyToOneMappingDefinition2_0; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaOneToManyMappingDefinition2_0; -import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaOneToOneMappingDefinition2_0; +import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaBasicMappingDefinition; +import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaEntityDefinition; import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOrmXmlDefinition; import org.jboss.tools.hibernate.jpt.core.internal.context.orm.jpa2.HibernateOrmXml2_0Definition; import org.jboss.tools.hibernate.jpt.core.internal.context.persistence.HibernatePersistenceXmlDefinition; import org.jboss.tools.hibernate.jpt.core.internal.context.persistence.jpa2.Hibernate2_0PersistenceXmlDefinition; +import org.jboss.tools.hibernate.jpt.core.internal.jpa2.context.definition.HibernateJavaIdMappingDefinition2_0; +import org.jboss.tools.hibernate.jpt.core.internal.jpa2.context.definition.HibernateJavaManyToManyMappingDefinition2_0; +import org.jboss.tools.hibernate.jpt.core.internal.jpa2.context.definition.HibernateJavaManyToOneMappingDefinition2_0; +import org.jboss.tools.hibernate.jpt.core.internal.jpa2.context.definition.HibernateJavaOneToOneMappingDefinition2_0; /** * @author Dmitry Geraskov @@ -67,7 +67,6 @@ return INSTANCE; } - /** * Enforce singleton usage */ @@ -119,7 +118,7 @@ // order matches that used by the Reference Implementation (EclipseLink) protected static final JavaTypeMappingDefinition[] JAVA_TYPE_MAPPING_DEFINITIONS = new JavaTypeMappingDefinition[] { - JavaEntityDefinition.instance(), + HibernateJavaEntityDefinition.instance(), JavaEmbeddableDefinition.instance(), JavaMappedSuperclassDefinition.instance() }; @@ -135,7 +134,7 @@ // order matches that used by the Reference Implementation (EclipseLink) protected static final DefaultJavaAttributeMappingDefinition[] DEFAULT_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new DefaultJavaAttributeMappingDefinition[] { JavaEmbeddedMappingDefinition2_0.instance(), - JavaBasicMappingDefinition.instance() + HibernateJavaBasicMappingDefinition.instance() }; @Override @@ -147,15 +146,15 @@ protected static final JavaAttributeMappingDefinition[] SPECIFIED_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new JavaAttributeMappingDefinition[] { JavaTransientMappingDefinition.instance(), JavaElementCollectionMappingDefinition2_0.instance(), - JavaIdMappingDefinition2_0.instance(), + HibernateJavaIdMappingDefinition2_0.instance(), JavaVersionMappingDefinition.instance(), - JavaBasicMappingDefinition.instance(), + HibernateJavaBasicMappingDefinition.instance(), JavaEmbeddedMappingDefinition2_0.instance(), JavaEmbeddedIdMappingDefinition.instance(), - JavaManyToManyMappingDefinition2_0.instance(), - JavaManyToOneMappingDefinition2_0.instance(), + HibernateJavaManyToManyMappingDefinition2_0.instance(), + HibernateJavaManyToOneMappingDefinition2_0.instance(), JavaOneToManyMappingDefinition2_0.instance(), - JavaOneToOneMappingDefinition2_0.instance() + HibernateJavaOneToOneMappingDefinition2_0.instance() };

13 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r31351 - in trunk/maven: plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet and 5 other directories.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2011-05-17 14:56:15 -0400 (Tue, 17 May 2011) New Revision: 31351 Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java Log: JBIDE-8955 Upgrade JBoss Maven Integration feature to use m2e 0.13.x M7 Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2011-05-17 15:51:31 UTC (rev 31350) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2011-05-17 18:56:15 UTC (rev 31351) @@ -55,11 +55,9 @@ import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperationConfig; import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants; import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.core.IMavenConstants; -import org.eclipse.m2e.core.embedder.IMavenConfiguration; import org.eclipse.m2e.core.embedder.MavenModelManager; +import org.eclipse.m2e.core.internal.IMavenConstants; import org.eclipse.m2e.core.project.IProjectConfigurationManager; -import org.eclipse.m2e.core.project.ResolverConfiguration; import org.eclipse.m2e.jdt.internal.BuildPathManager; import org.eclipse.m2e.model.edit.pom.Dependency; import org.eclipse.m2e.model.edit.pom.PomFactory; Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java 2011-05-17 15:51:31 UTC (rev 31350) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java 2011-05-17 18:56:15 UTC (rev 31351) @@ -28,8 +28,8 @@ import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants; import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils; import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.core.IMavenConstants; import org.eclipse.m2e.core.embedder.MavenModelManager; +import org.eclipse.m2e.core.internal.IMavenConstants; import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IDelegate; Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java 2011-05-17 15:51:31 UTC (rev 31350) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java 2011-05-17 18:56:15 UTC (rev 31351) @@ -31,13 +31,10 @@ import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider; import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperation; import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperationConfig; -import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.core.IMavenConstants; -import org.eclipse.m2e.core.embedder.MavenModelManager; +import org.eclipse.m2e.core.internal.IMavenConstants; import org.eclipse.m2e.model.edit.pom.Model; import org.eclipse.m2e.model.edit.pom.util.PomResourceFactoryImpl; import org.eclipse.m2e.model.edit.pom.util.PomResourceImpl; -import org.eclipse.osgi.util.NLS; import org.eclipse.wst.common.project.facet.core.IFacetedProjectBase; import org.jboss.tools.maven.core.MavenCoreActivator; Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2011-05-17 15:51:31 UTC (rev 31350) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2011-05-17 18:56:15 UTC (rev 31351) @@ -44,9 +44,11 @@ import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.core.IMavenConstants; import org.eclipse.m2e.core.embedder.MavenModelManager; -import org.eclipse.m2e.core.project.MavenProjectManager; +import org.eclipse.m2e.core.internal.IMavenConstants; +import org.eclipse.m2e.core.internal.MavenPluginActivator; +import org.eclipse.m2e.core.internal.project.ResolverConfigurationIO; +import org.eclipse.m2e.core.internal.project.registry.MavenProjectManager; import org.eclipse.m2e.core.project.ResolverConfiguration; import org.eclipse.m2e.model.edit.pom.Configuration; import org.eclipse.m2e.model.edit.pom.Plugin; @@ -961,11 +963,11 @@ location = location.append(parentProjectName); MavenCoreActivator.createMavenProject(parentProjectName, null, model, false, location); // disable workspace resolution - MavenProjectManager projectManager = MavenPlugin.getDefault().getMavenProjectManager(); + MavenProjectManager projectManager = MavenPluginActivator.getDefault().getMavenProjectManager(); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(parentProjectName); - ResolverConfiguration configuration = projectManager.getResolverConfiguration(project); + ResolverConfiguration configuration = ResolverConfigurationIO.readResolverConfiguration(project); configuration.setResolveWorkspaceProjects(false); - projectManager.setResolverConfiguration(project, configuration); + ResolverConfigurationIO.saveResolverConfiguration(project, configuration); } catch (Exception e) { log(e); } finally { Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2011-05-17 15:51:31 UTC (rev 31350) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2011-05-17 18:56:15 UTC (rev 31351) @@ -45,11 +45,11 @@ import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater; import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities; -import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.core.IMavenConstants; +import org.eclipse.m2e.core.internal.IMavenConstants; +import org.eclipse.m2e.core.internal.MavenPluginActivator; +import org.eclipse.m2e.core.internal.project.registry.MavenProjectManager; import org.eclipse.m2e.core.project.IMavenProjectFacade; import org.eclipse.m2e.core.project.MavenProjectChangedEvent; -import org.eclipse.m2e.core.project.MavenProjectManager; import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator; import org.eclipse.m2e.core.project.configurator.ProjectConfigurationRequest; import org.eclipse.wst.common.componentcore.ComponentCore; @@ -413,7 +413,7 @@ if (refProject.hasNature(IMavenConstants.NATURE_ID)) { IFile pom = refProject.getFile(IMavenConstants.POM_FILE_NAME); if (pom.exists()) { - MavenProjectManager projectManager = MavenPlugin.getDefault().getMavenProjectManager(); + MavenProjectManager projectManager = MavenPluginActivator.getDefault().getMavenProjectManager(); IMavenProjectFacade facade = projectManager.create(pom, true, null); if(facade!=null) { MavenProject mavenProject = facade.getMavenProject(null); @@ -447,7 +447,7 @@ IFile pom = refProject .getFile(IMavenConstants.POM_FILE_NAME); if (pom.exists()) { - MavenProjectManager projectManager = MavenPlugin + MavenProjectManager projectManager = MavenPluginActivator .getDefault().getMavenProjectManager(); IMavenProjectFacade facade = projectManager.create( pom, true, null); Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java 2011-05-17 15:51:31 UTC (rev 31350) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java 2011-05-17 18:56:15 UTC (rev 31351) @@ -18,8 +18,8 @@ import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants; import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils; import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.core.IMavenConstants; import org.eclipse.m2e.core.embedder.MavenModelManager; +import org.eclipse.m2e.core.internal.IMavenConstants; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java 2011-05-17 15:51:31 UTC (rev 31350) +++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java 2011-05-17 18:56:15 UTC (rev 31351) @@ -44,7 +44,7 @@ import org.eclipse.datatools.connectivity.drivers.IPropertySet; import org.eclipse.datatools.connectivity.drivers.PropertySetImpl; import org.eclipse.datatools.connectivity.drivers.models.TemplateDescriptor; -import org.eclipse.m2e.core.core.IMavenConstants; +import org.eclipse.m2e.core.internal.IMavenConstants; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event;

13 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r31350 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2011-05-17 11:51:31 -0400 (Tue, 17 May 2011) New Revision: 31350 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java Log: The compilation errors were fixed for Indigo M7 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java 2011-05-17 15:38:58 UTC (rev 31349) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLSyntaxValidator.java 2011-05-17 15:51:31 UTC (rev 31350) @@ -19,7 +19,6 @@ import java.io.StringReader; import java.util.ArrayList; -import org.apache.xerces.xni.parser.XMLEntityResolver; import org.eclipse.core.resources.IResource; import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin; import org.eclipse.wst.validation.ValidationResult; @@ -31,10 +30,11 @@ import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport; import org.eclipse.wst.xml.core.internal.validation.eclipse.ErrorCustomizationPluginRegistryReader; import org.eclipse.wst.xml.core.internal.validation.eclipse.Validator; -import org.jboss.tools.common.xml.XMLEntityResolverImpl; import org.jboss.tools.jsf.JSFModelPlugin; import org.xml.sax.InputSource; import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; import org.xml.sax.SAXParseException; import org.xml.sax.XMLReader; import org.xml.sax.ext.LexicalHandler; @@ -224,7 +224,7 @@ this.entityResolver = entityResolver; } - protected XMLReader createXMLReader(String uri) throws Exception + protected XMLReader createXMLReader(String uri) throws SAXNotRecognizedException, SAXNotSupportedException { XMLReader reader = super.createXMLReader(uri);

13 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r31349 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-05-17 11:38:58 -0400 (Tue, 17 May 2011) New Revision: 31349 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java Log: Fixed compilation errors in Indigo m7 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java 2011-05-17 14:59:48 UTC (rev 31348) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java 2011-05-17 15:38:58 UTC (rev 31349) @@ -127,7 +127,7 @@ IServer server = (IServer) data; ServerUIPlugin.editServer(server); } catch (Exception e) { - Trace.trace(Trace.SEVERE, org.jboss.ide.eclipse.as.ui.Messages.ServerActionProvider_CouldNotOpenServerError, e); + Trace.trace(Trace.STRING_SEVERE, org.jboss.ide.eclipse.as.ui.Messages.ServerActionProvider_CouldNotOpenServerError, e); } } }); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java 2011-05-17 14:59:48 UTC (rev 31348) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java 2011-05-17 15:38:58 UTC (rev 31349) @@ -349,7 +349,7 @@ } } } catch (Exception e) { - Trace.trace(Trace.FINEST, Messages.ServerContentProvider_ErrorInServersViewAnimation, e); + Trace.trace(Trace.STRING_FINEST, Messages.ServerContentProvider_ErrorInServersViewAnimation, e); } display.timerExec(SLEEP, animator[0]); }

13 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r31348 - in branches/jbosstools-3.2.x/bpel/features: org.jboss.tools.bpel.tests.feature and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-05-17 10:59:48 -0400 (Tue, 17 May 2011) New Revision: 31348 Modified: branches/jbosstools-3.2.x/bpel/features/org.jboss.tools.bpel.feature/feature.xml branches/jbosstools-3.2.x/bpel/features/org.jboss.tools.bpel.tests.feature/feature.xml Log: bump feature.xml to match pom.xml versions. Dude. Modified: branches/jbosstools-3.2.x/bpel/features/org.jboss.tools.bpel.feature/feature.xml =================================================================== --- branches/jbosstools-3.2.x/bpel/features/org.jboss.tools.bpel.feature/feature.xml 2011-05-17 14:03:35 UTC (rev 31347) +++ branches/jbosstools-3.2.x/bpel/features/org.jboss.tools.bpel.feature/feature.xml 2011-05-17 14:59:48 UTC (rev 31348) @@ -2,7 +2,7 @@ <feature id="org.jboss.tools.bpel.feature" label="%featureName" - version="1.0.0.qualifier" + version="1.0.1.qualifier" provider-name="%providerName" plugin="org.eclipse.bpel.ui"> Modified: branches/jbosstools-3.2.x/bpel/features/org.jboss.tools.bpel.tests.feature/feature.xml =================================================================== --- branches/jbosstools-3.2.x/bpel/features/org.jboss.tools.bpel.tests.feature/feature.xml 2011-05-17 14:03:35 UTC (rev 31347) +++ branches/jbosstools-3.2.x/bpel/features/org.jboss.tools.bpel.tests.feature/feature.xml 2011-05-17 14:59:48 UTC (rev 31348) @@ -2,7 +2,7 @@ <feature id="org.jboss.tools.bpel.tests.feature" label="%featureName" - version="1.1.0.qualifier" + version="1.1.1.qualifier" provider-name="%featureProvider" image="eclipse_update_120.jpg">

13 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r31347 - trunk/build/target-platform.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-05-17 10:03:35 -0400 (Tue, 17 May 2011) New Revision: 31347 Modified: trunk/build/target-platform/jbds.target trunk/build/target-platform/jbds.target.p2mirror.xml trunk/build/target-platform/multiple.target trunk/build/target-platform/multiple.target.p2mirror.xml trunk/build/target-platform/unified.target trunk/build/target-platform/unified.target.p2mirror.xml Log: add missing org.eclipse.jpt.common features Modified: trunk/build/target-platform/jbds.target =================================================================== --- trunk/build/target-platform/jbds.target 2011-05-17 10:28:08 UTC (rev 31346) +++ trunk/build/target-platform/jbds.target 2011-05-17 14:03:35 UTC (rev 31347) @@ -96,10 +96,9 @@ <unit id="org.eclipse.jdt.feature.group" version="3.7.0.v20110331-7z8gFchFMTfEWNqyrZIsXph9B15B"/>  -  + <unit id="org.eclipse.jpt.common.feature.feature.group" version="1.0.0.v201104050000-6--AkF7BB7NCS7779"/> + <unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.0.0.v201104050000-3--8s73553B5F3333"/> + <unit id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.0.0.v201104180000-7J7F2F7RZHQPIlWAHbvaRg"/> <unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.0.0.v201104050000-7Q7F77FBBoPaeQKbWRZaW6A"/> Modified: trunk/build/target-platform/jbds.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/jbds.target.p2mirror.xml 2011-05-17 10:28:08 UTC (rev 31346) +++ trunk/build/target-platform/jbds.target.p2mirror.xml 2011-05-17 14:03:35 UTC (rev 31347) @@ -84,6 +84,8 @@ <iu id="org.eclipse.gef.feature.group" version=""/> <iu id="org.eclipse.zest.feature.group" version=""/> <iu id="org.eclipse.jdt.feature.group" version=""/> +<iu id="org.eclipse.jpt.common.feature.feature.group" version=""/> +<iu id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version=""/> <iu id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version=""/> <iu id="org.eclipse.jpt.jpa.feature.feature.group" version=""/> <iu id="org.eclipse.jsf.feature.feature.group" version=""/> Modified: trunk/build/target-platform/multiple.target =================================================================== --- trunk/build/target-platform/multiple.target 2011-05-17 10:28:08 UTC (rev 31346) +++ trunk/build/target-platform/multiple.target 2011-05-17 14:03:35 UTC (rev 31347) @@ -17,18 +17,18 @@ <repository location="http://download.jboss.org/jbosstools/updates/indigo/M7/"/>  - <unit id="org.eclipse.m2e.feature.feature.group" version="0.13.0.201103291237"/> + <unit id="org.eclipse.m2e.feature.feature.group" version="0.13.0.201105091504"/>  - <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.201103231111"/> + <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.201105040943"/> <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/> <unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/> <unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/> <unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/> <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/> - <unit id="com.ning.async-http-client" version="1.6.3.20110315-1708"/> - <unit id="org.jboss.netty" version="3.2.4.Final"/> + <unit id="com.ning.async-http-client" version="1.6.3.201105091504"/> + <unit id="org.jboss.netty" version="3.2.4.Final-201105091504"/>  - <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110222-0044"/> + <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110328-2345"/> <unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110222-0044"/> - <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20100920"/> + <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110414-1400"/> <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110128-1111"/>  @@ -48,22 +48,22 @@ <unit id="org.jdom" version="1.0.0.v201005080400"/> <unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/> - <unit id="org.eclipse.graphiti.feature.feature.group" version="0.8.0.v20110201-1429"/> - <unit id="org.eclipse.emf.workspace.feature.group" version="1.4.0.v20100428-2315-36-8s734C367E3CBC7"/> - <unit id="org.eclipse.emf.validation.feature.group" version="1.4.0.v20100428-2315-479-9oB56N5BBR6LCA6"/> - <unit id="org.eclipse.emf.transaction.feature.group" version="1.4.0.v20100428-2315-377-8s734C3E7D15D6B"/> - <unit id="org.eclipse.emf.ecore.feature.group" version="2.7.0.v20110310-1642"/> - <unit id="org.eclipse.emf.feature.group" version="2.7.0.v20110310-1804"/> - <unit id="org.eclipse.emf.codegen.feature.group" version="2.6.0.v20110310-1804"/> - <unit id="org.eclipse.emf.common.feature.group" version="2.7.0.v20110310-1642"/> - <unit id="org.eclipse.emf.databinding.feature.group" version="1.2.0.v20110310-1804"/> - <unit id="org.eclipse.emf.codegen.ecore.feature.group" version="2.7.0.v20110310-1804"/> - <unit id="org.eclipse.emf.ecore.edit.feature.group" version="2.7.0.v20110310-1804"/> - <unit id="org.eclipse.emf.ecore.editor.feature.group" version="2.7.0.v20110310-1804"/> - <unit id="org.eclipse.emf.ecore.feature.group" version="2.7.0.v20110310-1642"/> - <unit id="org.eclipse.emf.edit.feature.group" version="2.7.0.v20110310-1804"/> - <unit id="org.eclipse.xsd.edit.feature.group" version="2.6.0.v20110310-1804"/> - <unit id="org.eclipse.xsd.feature.group" version="2.7.0.v20110310-1804"/> + <unit id="org.eclipse.graphiti.feature.feature.group" version="0.8.0.v20110429-1110"/> + <unit id="org.eclipse.emf.workspace.feature.group" version="1.5.0.v20110502-1600-36-8s734C367E3CBC7"/> + <unit id="org.eclipse.emf.validation.feature.group" version="1.5.0.v20110502-1600-479-9oB56N5BBR6LCA6"/> + <unit id="org.eclipse.emf.transaction.feature.group" version="1.5.0.v20110502-1600-377-8s734C3E7D15D6B"/> + <unit id="org.eclipse.emf.ecore.feature.group" version="2.7.0.v20110429-2014"/> + <unit id="org.eclipse.emf.feature.group" version="2.7.0.v20110502-1136"/> + <unit id="org.eclipse.emf.codegen.feature.group" version="2.7.0.v20110502-1136"/> + <unit id="org.eclipse.emf.common.feature.group" version="2.7.0.v20110429-2014"/> + <unit id="org.eclipse.emf.databinding.feature.group" version="1.2.0.v20110502-1136"/> + <unit id="org.eclipse.emf.codegen.ecore.feature.group" version="2.7.0.v20110502-1136"/> + <unit id="org.eclipse.emf.ecore.edit.feature.group" version="2.7.0.v20110502-1136"/> + <unit id="org.eclipse.emf.ecore.editor.feature.group" version="2.7.0.v20110502-1136"/> + <unit id="org.eclipse.emf.ecore.feature.group" version="2.7.0.v20110429-2014"/> + <unit id="org.eclipse.emf.edit.feature.group" version="2.7.0.v20110502-1136"/> + <unit id="org.eclipse.xsd.edit.feature.group" version="2.7.0.v20110502-1136"/> + <unit id="org.eclipse.xsd.feature.group" version="2.7.0.v20110502-1136"/> <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/> <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/> @@ -71,57 +71,57 @@ <unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/> <unit id="org.eclipse.swtbot.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/> - <unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="3.7.0.v20110126-777D-86sH1BEK7l5ODX_XHlBz-fm"/> - <unit id="org.eclipse.birt.feature.group" version="3.7.0.v20110126-B7F907AGS6mD_gagmV07XxVECK9k"/> - <unit id="org.eclipse.birt.integration.wtp.feature.group" version="3.7.0.v20110314-1726-46-7w3122142502837"/> - <unit id="org.eclipse.birt.chart.feature.group" version="3.7.0.v20110126-7r9e1FQCnvKM6u4SlWF7"/> - <unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="3.7.0.v20110314-1726-46-7w3122142502837"/> + <unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="3.7.0.v20110329-777D-86sH1BEM7o5ODXaD2G4lQnz"/> + <unit id="org.eclipse.birt.feature.group" version="3.7.0.v20110329-B7F907AGS6mD_gblju07XxVERRSk"/> + <unit id="org.eclipse.birt.integration.wtp.feature.group" version="3.7.0.v20110503-1408-46-7w3122161402519"/> + <unit id="org.eclipse.birt.chart.feature.group" version="3.7.0.v20110329-7r9e1FQCnvKM70EhlWF7"/> + <unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="3.7.0.v20110503-1408-46-7w3122161402519"/> <unit id="com.ibm.icu.base.feature.group" version="1.2.0.v20110302-797738s7355373J"/> - <unit id="org.eclipse.equinox.server.core.feature.group" version="1.1.0.v20110124-7K7TF9wF7RZHQOI_Op"/> - <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110207-7B78FGB8sF7BB7I8H58WG5"/> - <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110121-7i7uFCaFFt6Zqif0tNYDdt"/> - <unit id="org.eclipse.jdt.feature.group" version="3.7.0.v20110208-0800-7z8gFb7FMTfEULpkdZIlQtX9H155"/> - <unit id="org.eclipse.platform.feature.group" version="3.7.0.r20110302-9gF7SHCIFt6ms-lIjrC6vK_XO-IabJMKu"/> - <unit id="org.eclipse.platform.ide" version="3.7.0.I20110310-1119"/> - <unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20110218-7P7NFUFFLWUl6m499UD1941"/> - <unit id="org.eclipse.platform.sdk" version="3.7.0.I20110310-1119"/> - <unit id="org.eclipse.pde.feature.group" version="3.7.0.v20110121-7b7oFXNFEx2Xmp_WfY574C"/> - <unit id="org.eclipse.sdk.feature.group" version="3.7.0.v20110204-7Q7xA7DLb3-pAVYYcrq8CSREZk7Sx7sVuI10F2m3sATD8"/> - <unit id="org.eclipse.rcp.id" version="3.7.0.I20110310-1119"/> - <unit id="org.eclipse.rcp.sdk.id" version="3.7.0.I20110310-1119"/> - <unit id="org.eclipse.releng.tools.feature.group" version="3.4.100.v20110123-45-7w31212215"/> - <unit id="org.eclipse.sdk.ide" version="3.7.0.I20110310-1119"/> - <unit id="org.eclipse.sdk.examples.feature.group" version="3.4.0.v20110121-817lFcfFEdccFPZTitBPoNN"/> - <unit id="org.eclipse.sdk.examples.source.feature.group" version="3.4.0.v20110121"/> - <unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.7.0.v20110124-7X7XG6sFPGjtJ53kGX13J93"/> - <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.0.v20110124-7sF9LFm-FUu63aH8jUP5BwTB"/> - <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.100.v20110222-0044-4-8_9oB5875IB9133BB"/> - <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.0.v20110228-897TFncFdHjO2qRuCh_UvYT"/> - <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.7.0.v20110228-9H7oGygGIbXykyi5YYL8z-VO244C"/> - <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.7.0.v20110124-7u7PFp-FN5JiJy61NWGrQbsuOmwi"/> - <unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.0.v20110123-7L7W8Z8W1Q5nsW4u0pf2k2lZoUZd"/> + <unit id="org.eclipse.equinox.server.core.feature.group" version="1.1.0.v20110124-7K7TF9wF7RZHQOInPq03122"/> + <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110207-7B78FGB8sF7BB7LDT4FXJF"/> + <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110327-7i7uFFiFFt6ZqldAwRWMe3"/> + <unit id="org.eclipse.jdt.feature.group" version="3.7.0.v20110331-7z8gFchFMTfEWNqyrZIsXph9B15B"/> + <unit id="org.eclipse.platform.feature.group" version="3.7.0.v20110427-9gF7SHOoFt4cwDz0nGrGI3k0VJYt4njFkYBf2pO"/> + <unit id="org.eclipse.platform.ide" version="3.7.0.I20110428-0848"/> + <unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20110321-7P7NFUFFLWUl74m0VDD3231"/> + <unit id="org.eclipse.platform.sdk" version="3.7.0.I20110428-0848"/> + <unit id="org.eclipse.pde.feature.group" version="3.7.0.v20110121-7b7qFVpFEx2Xnh_YokJH7B"/> + <unit id="org.eclipse.sdk.feature.group" version="3.7.0.v20110426-7Q7xA7DPb31pCL8jc2ZN1z01oyNt6hoV9PbGQBjkDlw2k"/> + <unit id="org.eclipse.rcp.id" version="3.7.0.I20110428-0848"/> + <unit id="org.eclipse.rcp.sdk.id" version="3.7.0.I20110428-0848"/> + <unit id="org.eclipse.releng.tools.feature.group" version="3.4.100.v20110123-45-7w3122153802411"/> + <unit id="org.eclipse.sdk.ide" version="3.7.0.I20110428-0848"/> + <unit id="org.eclipse.sdk.examples.feature.group" version="3.4.0.v20110324-817lFcfFEdccN-RSmPBTgNN"/> + <unit id="org.eclipse.sdk.examples.source.feature.group" version="3.4.0.v20110324"/> + <unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.7.0.v20110124-7X7XG6sFPGjtJ726GT"/> + <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.0.v20110426-7uF9LFm-FWmE7gRBHc03F9D9"/> + <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.100.v20110222-0044-4-8_9oB5885EAJ28CDE"/> + <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.1.v20110427-6-Bg9JSN1PlMOW2QKmmYxz-Ae1oN"/> + <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.7.0.v20110412-0007-9L7oH0oGMMn4xArNX3_yimC39DEF"/> + <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.7.0.v20110327-7u7PFs7FN5KiK1e5PLCvW8Zhz0Ix"/> + <unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.0.v20110427-7M7W8Z8eGTNcBbPJNgPDv6E6IOby"/> <unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.100.v20110124-79-DHEVVFNFJiK4"/> - <unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.100.v20110124-7I77AqBgJ9EBBNBb8IAD"/> - <unit id="org.eclipse.equinox.server.p2.feature.group" version="1.1.0.v20110124-7x7RFPcFT0z0-VI27bWRAemk"/> - <unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.100.v20110123-7C-7BF9JgLWLMBMMAMsLL"/> - <unit id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="1.1.0.I20110310-1119"/> - <unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.100.v20110124-42DF9oB5865H7J"/> - <unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.100.v20110124-0830-44Eo8s7354484E2629"/> - <unit id="org.eclipse.rcp.feature.group" version="3.7.0.v20110216-9DB5FiuFpBGyHd2xA_SWnfP"/> + <unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.100.v20110124-7I77CPBgJ9ECBNC_8IAD"/> + <unit id="org.eclipse.equinox.server.p2.feature.group" version="1.1.0.v20110404-1700-7y7RFPcFTy21YM4SdbSDUi4"/> + <unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.100.v20110123-7C-FGBF9JgLWWM0LWAWLrL"/> + <unit id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="1.1.0.I20110428-0848"/> + <unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.100.v20110124-42DF9oB5865I7C"/> + <unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.100.v20110124-0830-44Eo8s73553A4A2629"/> + <unit id="org.eclipse.rcp.feature.group" version="3.7.0.v20110216-9DB5FkTFpBGyYk_uZpSlbfW"/>  <unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.0.v201010181130-77078CcNBGKBZI_FcRd"/>  - <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkr9kfkUKFumX_-ou"/> - <unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7FCcNBHFCQGgERLX"/> + <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8hEt1ZwmrHimkVJB5jcZ4k2"/> + <unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7GCcNBHHBWDqDWG_"/> <unit id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.9.0.v201010181130-4107w3121151A1A53"/>  - <unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7BCcNBGMDPHiDYRL"/> - <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.9.0.v201010181130-7J9B0BWwVM6y2z-fiIbw0xx-Qi9L"/> - <unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.9.0.v201010181130-77788dBmKDNOMgJvJ8Of7QBR"/> + <unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7CCcNBGNCWHeDYRS"/> + <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.9.0.v201010181130-7J9B0BWwVM6z-2z-hgNUs1-0rHcC"/> + <unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.9.0.v201010181130-77788eBmKDOGMeK0J2Ok7QBR"/> <unit id="org.eclipse.datatools.enablement.hsqldb.feature.feature.group" version="1.9.0.v201010181130-67D0AqGBJVKbHlH1GU7QBR"/> <unit id="org.eclipse.datatools.enablement.ibm.feature.feature.group" version="1.9.0.v201010181130-7F47SFC7sRbrSZope9vW"/> <unit id="org.eclipse.datatools.enablement.jdbc.feature.feature.group" version="1.9.0.v201010181130-4-29oB56N5N7L6PAQ"/> @@ -129,17 +129,17 @@ <unit id="org.eclipse.datatools.enablement.msft.feature.feature.group" version="1.9.0.v201010181130-542AkF79P7QCP9SDB"/> <unit id="org.eclipse.datatools.enablement.mysql.feature.feature.group" version="1.9.0.v201010181130-546AkF78Y7R9PAX77"/>  - <unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.0.v201010181130-7A7T78DZRDKFFYHlGjPW"/> - <unit id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group" version="1.9.0.v201010181130-3328s735357795A8D"/> + <unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.0.v201010181130-7A7T78DZRDKFF_GlGgJU"/> + <unit id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group" version="1.9.0.v201010181130-3328s73553B755E73"/> <unit id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.9.0.v201010181130-548dAkF79Q7RAN9UFJ"/> <unit id="org.eclipse.datatools.enablement.postgresql.feature.feature.group" version="1.9.0.v201010181130-542AkF77g7V9N9e77"/> <unit id="org.eclipse.datatools.enablement.sap.feature.feature.group" version="1.9.0.v201010181130-540AkF77g7V9N9e77"/> <unit id="org.eclipse.datatools.enablement.sybase.feature.feature.group" version="1.9.0.v201010181130-7E45F9NiNZVR6a1PMVn"/> <unit id="org.eclipse.datatools.enablement.ingres.feature.feature.group" version="1.9.0.v201010181130-540AkF78Y7VCOCQDB"/> <unit id="org.eclipse.datatools.enablement.sqlite.feature.feature.group" version="1.9.0.v201010181130-541AkF79P7N8NAQ77"/> - <unit id="org.eclipse.datatools.sqldevtools.feature.feature.group" version="1.9.0.v201010181130-7N845FDsn0TdrPUJuQMtjCYJTJ0T"/> + <unit id="org.eclipse.datatools.sqldevtools.feature.feature.group" version="1.9.0.v201010181130-7N845FDsn0TdrPUJvPQrqCYFPJ0T"/> - <unit id="org.eclipse.datatools.sqldevtools.results.feature.feature.group" version="1.9.0.v201101201115-57B3AkF7AI8FDDAOCP"/> + <unit id="org.eclipse.datatools.sqldevtools.results.feature.feature.group" version="1.9.0.v201101201115-57B3AkF7AJ7JBKAO8L"/> <unit id="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group" version="1.9.0.v201010181130-7A-3F7RZHLz-Hz-OlPz0Qf"/> <unit id="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group" version="1.9.0.v201010181130-278-78B04G8S_IMz00Iz00PmQz01"/> <unit id="org.eclipse.datatools.sqldevtools.data.feature.feature.group" version="1.9.0.v201010181130-642BgJ9DJAQGVCaIQ"/> @@ -153,24 +153,24 @@ <unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/> <unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/> - <unit id="org.eclipse.draw2d.feature.group" version="3.7.0.v20101213-1100-46-7w3122141903161"/> - <unit id="org.eclipse.gef.feature.group" version="3.7.0.v20101213-1100-777D-81B2Bz0675E394H34272"/> - <unit id="org.eclipse.zest.feature.group" version="1.3.0.v20101213-1100-67A-8yF4F09A9H4D6O54272"/> - <unit id="org.eclipse.uml2.feature.group" version="3.2.0.v201101271655"/> + <unit id="org.eclipse.draw2d.feature.group" version="3.7.0.v20110425-2050-46-7w3122153603161"/> + <unit id="org.eclipse.gef.feature.group" version="3.7.0.v20110425-2050-777D-81B2Bz0685C3A6E34272"/> + <unit id="org.eclipse.zest.feature.group" version="1.3.0.v20110425-2050-67A-8yF4F18CBD4E8L54272"/> + <unit id="org.eclipse.uml2.feature.group" version="3.2.0.v201103291514"/> - <unit id="org.eclipse.rse.feature.group" version="3.3.0.v201103142315-7L7CFGB8wqio7ppp-b5xwz-2-URl"/> + <unit id="org.eclipse.rse.feature.group" version="3.3.0.v201103142315-7L7CFGB8wqio7ppp-b5xwz-6HSGg"/> <unit id="org.eclipse.rse.ssh.feature.group" version="3.0.300.v201103142315-7A3F9wAkF7BB7C9REJRM"/> - <unit id="org.eclipse.rse.terminals.feature.group" version="1.1.0.v201103142315-771Bg9uD6I4AB9LECPS3A45"/> + <unit id="org.eclipse.rse.terminals.feature.group" version="1.1.0.v201103142315-771Bg9uD6I4AB9LEFNU2669"/> <unit id="org.eclipse.rse.telnet.feature.group" version="2.2.200.v201103142315-775F8NAkF7BB7B9NEIPP"/> <unit id="org.eclipse.rse.ftp.feature.group" version="3.0.300.v201103142315-782F8N9oB588587HAFII"/> <unit id="org.eclipse.rse.local.feature.group" version="2.1.300.v201103142315-7B4FKsBgJ9EE9GATIJT_"/> <unit id="org.eclipse.rse.useractions.feature.group" version="1.1.300.v201103142315-31F8N8s7355353B75DD"/> - <unit id="org.eclipse.tm.terminal.feature.group" version="3.1.0.v201103142315-40-7w312212362934"/> + <unit id="org.eclipse.tm.terminal.feature.group" version="3.1.0.v201103142315-40-7w312215181558"/> <unit id="org.eclipse.tm.terminal.view.feature.group" version="2.2.0.v201103142315-31-7w312214253426"/> <unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.1.0.v201103142315-30-7w312213121A22"/> <unit id="org.eclipse.tm.terminal.serial.feature.group" version="2.1.0.v201103142315-30-7w312212153266"/> - <unit id="org.eclipse.tm.terminal.feature.group" version="3.1.0.v201103142315-40-7w312212362934"/> + <unit id="org.eclipse.tm.terminal.feature.group" version="3.1.0.v201103142315-40-7w312215181558"/> <unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.0.v201103142315-30-7w312212153266"/>  @@ -189,44 +189,43 @@ <unit version="1.4.0.v20100428-2315-23-7w3121133502768" id="org.eclipse.emf.validation.ocl.feature.group"/> <unit version="2.1.0.v20100606-1530-7A2-AkF7AG8PBU3BRLA" id="org.eclipse.m2m.qvt.oml.runtime.feature.group"/> --> - <unit id="org.eclipse.jst.jee" version="1.0.401.v201101130500"/> + <unit id="org.eclipse.jst.jee" version="1.0.401.v201104081500"/> <unit id="org.eclipse.wst.common.frameworks" version="1.2.0.v201003040800"/> - <unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.200.v201101240054"/> + <unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.200.v201103311536"/> <unit id="org.eclipse.jst.jee.web" version="1.0.301.v201007070907"/> - <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.3.0.v201102200555-377DF8s73543C6F6AAD"/> + <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.3.0.v201102200555-377DF8s73543E5I5768"/> <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/> - <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.100.v201102200555-7H78AKFAKlZgiH3jFfA3z0E6I6I"/> -  - <unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.0.0.v201103020003-7T7F77FD3wTgkUOWfVnWb"/> - <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.3.0.v201102150115-377DF8s73543C674AAA"/> - <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.3.0.v201102200555-7b7IHuQFSK2WE_U389ncrWY7PpMf"/> - <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.3.0.v201102200555-7O7IFhJEMi9DwZ0CPsbmPPpz-VRW"/> - <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.3.0.v201102071641-7H7EFZ-DxumTlXt4mjdXgE-eiy04"/> - <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.2.0.v201102200555-7S7ZFT0FIpS-8NuhBrBnS9FQCUHU"/> - <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.3.0.v201103031824-7F78FVqFBBoPbVSCXSXuk6"/> - <unit id="org.eclipse.jsf.feature.feature.group" version="3.3.0.v201103022146-7E7I7GF9JgLWRMwSrNCTG"/> + <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.100.v201102200555-7H78DSFAKlZgkH8bEh65uE6I6I"/> + <unit id="org.eclipse.jpt.common.feature.feature.group" version="1.0.0.v201104050000-6--AkF7BB7NCS7779"/> + <unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.0.0.v201104050000-3--8s73553B5F3333"/> + <unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.0.0.v201104050000-7Q7F77FBBoPaeQKbWRZaW6A"/> + <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.3.0.v201102150115-377DF8s7355397B4B9B"/> + <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.3.0.v201102200555-7b7IHxjFSK2WH7RH8SoSvIZz0TrSn"/> + <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.3.0.v201102200555-7O7IFhJEMi9DyJcFJu7OrFtCGlwfv20b2SPz-ndB"/> + <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.3.0.v201103310011-7H7EFZ-DxumTlXw7mjVSoG0ltwPSCOLmS5Rz012S"/> + <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.2.0.v201102200555-7T7XFT1FIqToIrvWIpCpS8LQGaPZ"/> + <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.3.0.v201103031824-7F78FXPFBBoPbXRHeLhk0z0"/> + <unit id="org.eclipse.jsf.feature.feature.group" version="3.3.0.v201103022146-7E7IBtF9JgLWTM6WDPfRm"/> <unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.100.v201102200555-5-A7AkF7B97HDVDRJZ"/> - <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.0.100.v201102200555-7E78AKF8NcJSUKsU4Utal"/> + <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.1.0.v201104031551-7E79BtF8NcJSXKrNz0Sjcv"/> <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.3.0.v201102200555-52FO2AkF7B87QBM7X98"/> - <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.0.v201102200555-777HFHyCcNBDjBeHV4BA8"/> + <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.0.v201102200555-777HFHyCcNBDjBfJa4BA8"/> <unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.100.v20110303-208Z7w31211419"/> - <unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.3.0.v201102200555-31FBW8s7353496D"/> - <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.3.0.v201102200555-7A6FHq9xFc8uCJMTBAJLJJ43A"/> - <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.3.0.v201102200555-7F7AFO-C25TohCfokiz0Z03we-Cb"/> - <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.3.0.v201103022146-7E7I7GF9JgLWRMwSrNCTG"/> - <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="1.2.0.v201102200555-67K8ZBgJ9DKANEPBTGT"/> - <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.3.v20110303-4629oB5865F6I3142"/> + <unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.3.0.v201102200555-31FD58s7354495L"/> + <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.3.0.v201102200555-7A6FHr9xFcAVCFLZBBJLIR43A"/> + <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.3.0.v201103310009-7F7AFO-C25TohFopjiyZxyypBLimJWtl0-z-rVjv"/> + <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.3.0.v201103022146-7E7IBtF9JgLWTM6WDPfRm"/> + <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="2.0.0.v201103310043-797J-CcNBGNCTKPF_OY"/> + <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.3.v20110303-468b9oB5875G5M6D4A"/> <unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.301.v201102200555-2407w312123151655"/> - <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.3.0.v201102150115-7B7DFMSF7RZHOcJiPqP-NJ"/> - <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.3.0.v201102150115-7C79FSkEdhO_oe5e4kbemdKjQrQ0"/> + <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.3.0.v201102150115-7B7DFMSF7RZHOcJkQ3Pz0QJ"/> + <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.3.0.v201102150115-7C79FSkEdhO_oe7f9leekdKlR4Qz01RK"/> <unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.100.v20110303-51EoAkF77g8HBSc"/> - <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.0.v201102200555-30FA18s734D3A4Cc"/> - <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.0.v201102200555-7B5FGVAtJb3LEKNfpKHHHIh47"/> - <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.3.0.v201102200555-7E7EFMRAJun6z0o80wNSGpbLJMJ-"/> - <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.3.0.v201102200555-7I7AFeQEtEoVDjeB0Lz0mwYx54in"/> - <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.3.0.v201102071641-7C7OFchF7RZHQLIiMz0Oh_k"/> + <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.0.v201102200555-30FBb8s73553B5L"/> + <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.0.v201102200555-7B5FIEAtJcexELOoPIYRNQ775"/> + <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.3.0.v201102200555-7E7EFMRAJun8Zpm50NSIsgRt_OXWX9M"/> + <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.3.0.v201102200555-7I7AFeREtEoVEjh87M1jsaz-A-wmVgrvQz-4YaDP"/> + <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.3.0.v201102071641-7C7OFciF7RZHQNHoSwMlQj"/>  <repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/l..."/>  - <unit id="org.eclipse.m2e.feature.feature.group" version="0.13.0.201103291237"/> + <unit id="org.eclipse.m2e.feature.feature.group" version="0.13.0.201105091504"/>  - <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.201103231111"/> + <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.0.201105040943"/> <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/> <unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/> <unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/> <unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/> <unit id="org.slf4j.api" version="1.6.1.v20100831-0715"/> - <unit id="com.ning.async-http-client" version="1.6.3.20110315-1708"/> - <unit id="org.jboss.netty" version="3.2.4.Final"/> + <unit id="com.ning.async-http-client" version="1.6.3.201105091504"/> + <unit id="org.jboss.netty" version="3.2.4.Final-201105091504"/>  - <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110222-0044"/> + <unit id="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.1.v20110328-2345"/> <unit id="org.eclipse.equinox.p2.discovery" version="1.0.100.v20110222-0044"/> - <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20100920"/> + <unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110414-1400"/> <unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110128-1111"/>  @@ -46,22 +48,22 @@ <unit id="org.jdom" version="1.0.0.v201005080400"/> <unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/> - <unit id="org.eclipse.graphiti.feature.feature.group" version="0.8.0.v20110201-1429"/> - <unit id="org.eclipse.emf.workspace.feature.group" version="1.4.0.v20100428-2315-36-8s734C367E3CBC7"/> - <unit id="org.eclipse.emf.validation.feature.group" version="1.4.0.v20100428-2315-479-9oB56N5BBR6LCA6"/> - <unit id="org.eclipse.emf.transaction.feature.group" version="1.4.0.v20100428-2315-377-8s734C3E7D15D6B"/> - <unit id="org.eclipse.emf.ecore.feature.group" version="2.7.0.v20110310-1642"/> - <unit id="org.eclipse.emf.feature.group" version="2.7.0.v20110310-1804"/> - <unit id="org.eclipse.emf.codegen.feature.group" version="2.6.0.v20110310-1804"/> - <unit id="org.eclipse.emf.common.feature.group" version="2.7.0.v20110310-1642"/> - <unit id="org.eclipse.emf.databinding.feature.group" version="1.2.0.v20110310-1804"/> - <unit id="org.eclipse.emf.codegen.ecore.feature.group" version="2.7.0.v20110310-1804"/> - <unit id="org.eclipse.emf.ecore.edit.feature.group" version="2.7.0.v20110310-1804"/> - <unit id="org.eclipse.emf.ecore.editor.feature.group" version="2.7.0.v20110310-1804"/> - <unit id="org.eclipse.emf.ecore.feature.group" version="2.7.0.v20110310-1642"/> - <unit id="org.eclipse.emf.edit.feature.group" version="2.7.0.v20110310-1804"/> - <unit id="org.eclipse.xsd.edit.feature.group" version="2.6.0.v20110310-1804"/> - <unit id="org.eclipse.xsd.feature.group" version="2.7.0.v20110310-1804"/> + <unit id="org.eclipse.graphiti.feature.feature.group" version="0.8.0.v20110429-1110"/> + <unit id="org.eclipse.emf.workspace.feature.group" version="1.5.0.v20110502-1600-36-8s734C367E3CBC7"/> + <unit id="org.eclipse.emf.validation.feature.group" version="1.5.0.v20110502-1600-479-9oB56N5BBR6LCA6"/> + <unit id="org.eclipse.emf.transaction.feature.group" version="1.5.0.v20110502-1600-377-8s734C3E7D15D6B"/> + <unit id="org.eclipse.emf.ecore.feature.group" version="2.7.0.v20110429-2014"/> + <unit id="org.eclipse.emf.feature.group" version="2.7.0.v20110502-1136"/> + <unit id="org.eclipse.emf.codegen.feature.group" version="2.7.0.v20110502-1136"/> + <unit id="org.eclipse.emf.common.feature.group" version="2.7.0.v20110429-2014"/> + <unit id="org.eclipse.emf.databinding.feature.group" version="1.2.0.v20110502-1136"/> + <unit id="org.eclipse.emf.codegen.ecore.feature.group" version="2.7.0.v20110502-1136"/> + <unit id="org.eclipse.emf.ecore.edit.feature.group" version="2.7.0.v20110502-1136"/> + <unit id="org.eclipse.emf.ecore.editor.feature.group" version="2.7.0.v20110502-1136"/> + <unit id="org.eclipse.emf.ecore.feature.group" version="2.7.0.v20110429-2014"/> + <unit id="org.eclipse.emf.edit.feature.group" version="2.7.0.v20110502-1136"/> + <unit id="org.eclipse.xsd.edit.feature.group" version="2.7.0.v20110502-1136"/> + <unit id="org.eclipse.xsd.feature.group" version="2.7.0.v20110502-1136"/> <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/> <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/> @@ -69,57 +71,57 @@ <unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/> <unit id="org.eclipse.swtbot.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/> - <unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="3.7.0.v20110126-777D-86sH1BEK7l5ODX_XHlBz-fm"/> - <unit id="org.eclipse.birt.feature.group" version="3.7.0.v20110126-B7F907AGS6mD_gagmV07XxVECK9k"/> - <unit id="org.eclipse.birt.integration.wtp.feature.group" version="3.7.0.v20110314-1726-46-7w3122142502837"/> - <unit id="org.eclipse.birt.chart.feature.group" version="3.7.0.v20110126-7r9e1FQCnvKM6u4SlWF7"/> - <unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="3.7.0.v20110314-1726-46-7w3122142502837"/> + <unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="3.7.0.v20110329-777D-86sH1BEM7o5ODXaD2G4lQnz"/> + <unit id="org.eclipse.birt.feature.group" version="3.7.0.v20110329-B7F907AGS6mD_gblju07XxVERRSk"/> + <unit id="org.eclipse.birt.integration.wtp.feature.group" version="3.7.0.v20110503-1408-46-7w3122161402519"/> + <unit id="org.eclipse.birt.chart.feature.group" version="3.7.0.v20110329-7r9e1FQCnvKM70EhlWF7"/> + <unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="3.7.0.v20110503-1408-46-7w3122161402519"/> <unit id="com.ibm.icu.base.feature.group" version="1.2.0.v20110302-797738s7355373J"/> - <unit id="org.eclipse.equinox.server.core.feature.group" version="1.1.0.v20110124-7K7TF9wF7RZHQOI_Op"/> - <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110207-7B78FGB8sF7BB7I8H58WG5"/> - <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110121-7i7uFCaFFt6Zqif0tNYDdt"/> - <unit id="org.eclipse.jdt.feature.group" version="3.7.0.v20110208-0800-7z8gFb7FMTfEULpkdZIlQtX9H155"/> - <unit id="org.eclipse.platform.feature.group" version="3.7.0.r20110302-9gF7SHCIFt6ms-lIjrC6vK_XO-IabJMKu"/> - <unit id="org.eclipse.platform.ide" version="3.7.0.I20110310-1119"/> - <unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20110218-7P7NFUFFLWUl6m499UD1941"/> - <unit id="org.eclipse.platform.sdk" version="3.7.0.I20110310-1119"/> - <unit id="org.eclipse.pde.feature.group" version="3.7.0.v20110121-7b7oFXNFEx2Xmp_WfY574C"/> - <unit id="org.eclipse.sdk.feature.group" version="3.7.0.v20110204-7Q7xA7DLb3-pAVYYcrq8CSREZk7Sx7sVuI10F2m3sATD8"/> - <unit id="org.eclipse.rcp.id" version="3.7.0.I20110310-1119"/> - <unit id="org.eclipse.rcp.sdk.id" version="3.7.0.I20110310-1119"/> - <unit id="org.eclipse.releng.tools.feature.group" version="3.4.100.v20110123-45-7w31212215"/> - <unit id="org.eclipse.sdk.ide" version="3.7.0.I20110310-1119"/> - <unit id="org.eclipse.sdk.examples.feature.group" version="3.4.0.v20110121-817lFcfFEdccFPZTitBPoNN"/> - <unit id="org.eclipse.sdk.examples.source.feature.group" version="3.4.0.v20110121"/> - <unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.7.0.v20110124-7X7XG6sFPGjtJ53kGX13J93"/> - <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.0.v20110124-7sF9LFm-FUu63aH8jUP5BwTB"/> - <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.100.v20110222-0044-4-8_9oB5875IB9133BB"/> - <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.0.v20110228-897TFncFdHjO2qRuCh_UvYT"/> - <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.7.0.v20110228-9H7oGygGIbXykyi5YYL8z-VO244C"/> - <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.7.0.v20110124-7u7PFp-FN5JiJy61NWGrQbsuOmwi"/> - <unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.0.v20110123-7L7W8Z8W1Q5nsW4u0pf2k2lZoUZd"/> + <unit id="org.eclipse.equinox.server.core.feature.group" version="1.1.0.v20110124-7K7TF9wF7RZHQOInPq03122"/> + <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110207-7B78FGB8sF7BB7LDT4FXJF"/> + <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110327-7i7uFFiFFt6ZqldAwRWMe3"/> + <unit id="org.eclipse.jdt.feature.group" version="3.7.0.v20110331-7z8gFchFMTfEWNqyrZIsXph9B15B"/> + <unit id="org.eclipse.platform.feature.group" version="3.7.0.v20110427-9gF7SHOoFt4cwDz0nGrGI3k0VJYt4njFkYBf2pO"/> + <unit id="org.eclipse.platform.ide" version="3.7.0.I20110428-0848"/> + <unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20110321-7P7NFUFFLWUl74m0VDD3231"/> + <unit id="org.eclipse.platform.sdk" version="3.7.0.I20110428-0848"/> + <unit id="org.eclipse.pde.feature.group" version="3.7.0.v20110121-7b7qFVpFEx2Xnh_YokJH7B"/> + <unit id="org.eclipse.sdk.feature.group" version="3.7.0.v20110426-7Q7xA7DPb31pCL8jc2ZN1z01oyNt6hoV9PbGQBjkDlw2k"/> + <unit id="org.eclipse.rcp.id" version="3.7.0.I20110428-0848"/> + <unit id="org.eclipse.rcp.sdk.id" version="3.7.0.I20110428-0848"/> + <unit id="org.eclipse.releng.tools.feature.group" version="3.4.100.v20110123-45-7w3122153802411"/> + <unit id="org.eclipse.sdk.ide" version="3.7.0.I20110428-0848"/> + <unit id="org.eclipse.sdk.examples.feature.group" version="3.4.0.v20110324-817lFcfFEdccN-RSmPBTgNN"/> + <unit id="org.eclipse.sdk.examples.source.feature.group" version="3.4.0.v20110324"/> + <unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.7.0.v20110124-7X7XG6sFPGjtJ726GT"/> + <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.0.v20110426-7uF9LFm-FWmE7gRBHc03F9D9"/> + <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.100.v20110222-0044-4-8_9oB5885EAJ28CDE"/> + <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.1.v20110427-6-Bg9JSN1PlMOW2QKmmYxz-Ae1oN"/> + <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.7.0.v20110412-0007-9L7oH0oGMMn4xArNX3_yimC39DEF"/> + <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.7.0.v20110327-7u7PFs7FN5KiK1e5PLCvW8Zhz0Ix"/> + <unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.0.v20110427-7M7W8Z8eGTNcBbPJNgPDv6E6IOby"/> <unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.100.v20110124-79-DHEVVFNFJiK4"/> - <unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.100.v20110124-7I77AqBgJ9EBBNBb8IAD"/> - <unit id="org.eclipse.equinox.server.p2.feature.group" version="1.1.0.v20110124-7x7RFPcFT0z0-VI27bWRAemk"/> - <unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.100.v20110123-7C-7BF9JgLWLMBMMAMsLL"/> - <unit id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="1.1.0.I20110310-1119"/> - <unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.100.v20110124-42DF9oB5865H7J"/> - <unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.100.v20110124-0830-44Eo8s7354484E2629"/> - <unit id="org.eclipse.rcp.feature.group" version="3.7.0.v20110216-9DB5FiuFpBGyHd2xA_SWnfP"/> + <unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.100.v20110124-7I77CPBgJ9ECBNC_8IAD"/> + <unit id="org.eclipse.equinox.server.p2.feature.group" version="1.1.0.v20110404-1700-7y7RFPcFTy21YM4SdbSDUi4"/> + <unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.100.v20110123-7C-FGBF9JgLWWM0LWAWLrL"/> + <unit id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="1.1.0.I20110428-0848"/> + <unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.100.v20110124-42DF9oB5865I7C"/> + <unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.100.v20110124-0830-44Eo8s73553A4A2629"/> + <unit id="org.eclipse.rcp.feature.group" version="3.7.0.v20110216-9DB5FkTFpBGyYk_uZpSlbfW"/>  <unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.0.v201010181130-77078CcNBGKBZI_FcRd"/>  - <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8gEt1Zwkr9kfkUKFumX_-ou"/> - <unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7FCcNBHFCQGgERLX"/> + <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8hEt1ZwmrHimkVJB5jcZ4k2"/> + <unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7GCcNBHHBWDqDWG_"/> <unit id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.9.0.v201010181130-4107w3121151A1A53"/>  - <unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7BCcNBGMDPHiDYRL"/> - <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.9.0.v201010181130-7J9B0BWwVM6y2z-fiIbw0xx-Qi9L"/> - <unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.9.0.v201010181130-77788dBmKDNOMgJvJ8Of7QBR"/> + <unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7CCcNBGNCWHeDYRS"/> + <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.9.0.v201010181130-7J9B0BWwVM6z-2z-hgNUs1-0rHcC"/> + <unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.9.0.v201010181130-77788eBmKDOGMeK0J2Ok7QBR"/> <unit id="org.eclipse.datatools.enablement.hsqldb.feature.feature.group" version="1.9.0.v201010181130-67D0AqGBJVKbHlH1GU7QBR"/> <unit id="org.eclipse.datatools.enablement.ibm.feature.feature.group" version="1.9.0.v201010181130-7F47SFC7sRbrSZope9vW"/> <unit id="org.eclipse.datatools.enablement.jdbc.feature.feature.group" version="1.9.0.v201010181130-4-29oB56N5N7L6PAQ"/> @@ -127,17 +129,17 @@ <unit id="org.eclipse.datatools.enablement.msft.feature.feature.group" version="1.9.0.v201010181130-542AkF79P7QCP9SDB"/> <unit id="org.eclipse.datatools.enablement.mysql.feature.feature.group" version="1.9.0.v201010181130-546AkF78Y7R9PAX77"/>  - <unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.0.v201010181130-7A7T78DZRDKFFYHlGjPW"/> - <unit id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group" version="1.9.0.v201010181130-3328s735357795A8D"/> + <unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.0.v201010181130-7A7T78DZRDKFF_GlGgJU"/> + <unit id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group" version="1.9.0.v201010181130-3328s73553B755E73"/> <unit id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.9.0.v201010181130-548dAkF79Q7RAN9UFJ"/> <unit id="org.eclipse.datatools.enablement.postgresql.feature.feature.group" version="1.9.0.v201010181130-542AkF77g7V9N9e77"/> <unit id="org.eclipse.datatools.enablement.sap.feature.feature.group" version="1.9.0.v201010181130-540AkF77g7V9N9e77"/> <unit id="org.eclipse.datatools.enablement.sybase.feature.feature.group" version="1.9.0.v201010181130-7E45F9NiNZVR6a1PMVn"/> <unit id="org.eclipse.datatools.enablement.ingres.feature.feature.group" version="1.9.0.v201010181130-540AkF78Y7VCOCQDB"/> <unit id="org.eclipse.datatools.enablement.sqlite.feature.feature.group" version="1.9.0.v201010181130-541AkF79P7N8NAQ77"/> - <unit id="org.eclipse.datatools.sqldevtools.feature.feature.group" version="1.9.0.v201010181130-7N845FDsn0TdrPUJuQMtjCYJTJ0T"/> + <unit id="org.eclipse.datatools.sqldevtools.feature.feature.group" version="1.9.0.v201010181130-7N845FDsn0TdrPUJvPQrqCYFPJ0T"/> - <unit id="org.eclipse.datatools.sqldevtools.results.feature.feature.group" version="1.9.0.v201101201115-57B3AkF7AI8FDDAOCP"/> + <unit id="org.eclipse.datatools.sqldevtools.results.feature.feature.group" version="1.9.0.v201101201115-57B3AkF7AJ7JBKAO8L"/> <unit id="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group" version="1.9.0.v201010181130-7A-3F7RZHLz-Hz-OlPz0Qf"/> <unit id="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group" version="1.9.0.v201010181130-278-78B04G8S_IMz00Iz00PmQz01"/> <unit id="org.eclipse.datatools.sqldevtools.data.feature.feature.group" version="1.9.0.v201010181130-642BgJ9DJAQGVCaIQ"/> @@ -151,24 +153,24 @@ <unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/> <unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/> - <unit id="org.eclipse.draw2d.feature.group" version="3.7.0.v20101213-1100-46-7w3122141903161"/> - <unit id="org.eclipse.gef.feature.group" version="3.7.0.v20101213-1100-777D-81B2Bz0675E394H34272"/> - <unit id="org.eclipse.zest.feature.group" version="1.3.0.v20101213-1100-67A-8yF4F09A9H4D6O54272"/> - <unit id="org.eclipse.uml2.feature.group" version="3.2.0.v201101271655"/> + <unit id="org.eclipse.draw2d.feature.group" version="3.7.0.v20110425-2050-46-7w3122153603161"/> + <unit id="org.eclipse.gef.feature.group" version="3.7.0.v20110425-2050-777D-81B2Bz0685C3A6E34272"/> + <unit id="org.eclipse.zest.feature.group" version="1.3.0.v20110425-2050-67A-8yF4F18CBD4E8L54272"/> + <unit id="org.eclipse.uml2.feature.group" version="3.2.0.v201103291514"/> - <unit id="org.eclipse.rse.feature.group" version="3.3.0.v201103142315-7L7CFGB8wqio7ppp-b5xwz-2-URl"/> + <unit id="org.eclipse.rse.feature.group" version="3.3.0.v201103142315-7L7CFGB8wqio7ppp-b5xwz-6HSGg"/> <unit id="org.eclipse.rse.ssh.feature.group" version="3.0.300.v201103142315-7A3F9wAkF7BB7C9REJRM"/> - <unit id="org.eclipse.rse.terminals.feature.group" version="1.1.0.v201103142315-771Bg9uD6I4AB9LECPS3A45"/> + <unit id="org.eclipse.rse.terminals.feature.group" version="1.1.0.v201103142315-771Bg9uD6I4AB9LEFNU2669"/> <unit id="org.eclipse.rse.telnet.feature.group" version="2.2.200.v201103142315-775F8NAkF7BB7B9NEIPP"/> <unit id="org.eclipse.rse.ftp.feature.group" version="3.0.300.v201103142315-782F8N9oB588587HAFII"/> <unit id="org.eclipse.rse.local.feature.group" version="2.1.300.v201103142315-7B4FKsBgJ9EE9GATIJT_"/> <unit id="org.eclipse.rse.useractions.feature.group" version="1.1.300.v201103142315-31F8N8s7355353B75DD"/> - <unit id="org.eclipse.tm.terminal.feature.group" version="3.1.0.v201103142315-40-7w312212362934"/> + <unit id="org.eclipse.tm.terminal.feature.group" version="3.1.0.v201103142315-40-7w312215181558"/> <unit id="org.eclipse.tm.terminal.view.feature.group" version="2.2.0.v201103142315-31-7w312214253426"/> <unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.1.0.v201103142315-30-7w312213121A22"/> <unit id="org.eclipse.tm.terminal.serial.feature.group" version="2.1.0.v201103142315-30-7w312212153266"/> - <unit id="org.eclipse.tm.terminal.feature.group" version="3.1.0.v201103142315-40-7w312212362934"/> + <unit id="org.eclipse.tm.terminal.feature.group" version="3.1.0.v201103142315-40-7w312215181558"/> <unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.0.v201103142315-30-7w312212153266"/>  @@ -187,44 +189,43 @@ <unit version="1.4.0.v20100428-2315-23-7w3121133502768" id="org.eclipse.emf.validation.ocl.feature.group"/> <unit version="2.1.0.v20100606-1530-7A2-AkF7AG8PBU3BRLA" id="org.eclipse.m2m.qvt.oml.runtime.feature.group"/> --> - <unit id="org.eclipse.jst.jee" version="1.0.401.v201101130500"/> + <unit id="org.eclipse.jst.jee" version="1.0.401.v201104081500"/> <unit id="org.eclipse.wst.common.frameworks" version="1.2.0.v201003040800"/> - <unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.200.v201101240054"/> + <unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.200.v201103311536"/> <unit id="org.eclipse.jst.jee.web" version="1.0.301.v201007070907"/> - <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.3.0.v201102200555-377DF8s73543C6F6AAD"/> + <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.3.0.v201102200555-377DF8s73543E5I5768"/> <unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/> - <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.100.v201102200555-7H78AKFAKlZgiH3jFfA3z0E6I6I"/> -  - <unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.0.0.v201103020003-7T7F77FD3wTgkUOWfVnWb"/> - <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.3.0.v201102150115-377DF8s73543C674AAA"/> - <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.3.0.v201102200555-7b7IHuQFSK2WE_U389ncrWY7PpMf"/> - <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.3.0.v201102200555-7O7IFhJEMi9DwZ0CPsbmPPpz-VRW"/> - <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.3.0.v201102071641-7H7EFZ-DxumTlXt4mjdXgE-eiy04"/> - <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.2.0.v201102200555-7S7ZFT0FIpS-8NuhBrBnS9FQCUHU"/> - <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.3.0.v201103031824-7F78FVqFBBoPbVSCXSXuk6"/> - <unit id="org.eclipse.jsf.feature.feature.group" version="3.3.0.v201103022146-7E7I7GF9JgLWRMwSrNCTG"/> + <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.100.v201102200555-7H78DSFAKlZgkH8bEh65uE6I6I"/> + <unit id="org.eclipse.jpt.common.feature.feature.group" version="1.0.0.v201104050000-6--AkF7BB7NCS7779"/> + <unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.0.0.v201104050000-3--8s73553B5F3333"/> + <unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.0.0.v201104050000-7Q7F77FBBoPaeQKbWRZaW6A"/> + <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.3.0.v201102150115-377DF8s7355397B4B9B"/> + <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.3.0.v201102200555-7b7IHxjFSK2WH7RH8SoSvIZz0TrSn"/> + <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.3.0.v201102200555-7O7IFhJEMi9DyJcFJu7OrFtCGlwfv20b2SPz-ndB"/> + <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.3.0.v201103310011-7H7EFZ-DxumTlXw7mjVSoG0ltwPSCOLmS5Rz012S"/> + <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.2.0.v201102200555-7T7XFT1FIqToIrvWIpCpS8LQGaPZ"/> + <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.3.0.v201103031824-7F78FXPFBBoPbXRHeLhk0z0"/> + <unit id="org.eclipse.jsf.feature.feature.group" version="3.3.0.v201103022146-7E7IBtF9JgLWTM6WDPfRm"/> <unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.100.v201102200555-5-A7AkF7B97HDVDRJZ"/> - <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.0.100.v201102200555-7E78AKF8NcJSUKsU4Utal"/> + <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.1.0.v201104031551-7E79BtF8NcJSXKrNz0Sjcv"/> <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.3.0.v201102200555-52FO2AkF7B87QBM7X98"/> - <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.0.v201102200555-777HFHyCcNBDjBeHV4BA8"/> + <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.0.v201102200555-777HFHyCcNBDjBfJa4BA8"/> <unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.100.v20110303-208Z7w31211419"/> - <unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.3.0.v201102200555-31FBW8s7353496D"/> - <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.3.0.v201102200555-7A6FHq9xFc8uCJMTBAJLJJ43A"/> - <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.3.0.v201102200555-7F7AFO-C25TohCfokiz0Z03we-Cb"/> - <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.3.0.v201103022146-7E7I7GF9JgLWRMwSrNCTG"/> - <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="1.2.0.v201102200555-67K8ZBgJ9DKANEPBTGT"/> - <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.3.v20110303-4629oB5865F6I3142"/> + <unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.3.0.v201102200555-31FD58s7354495L"/> + <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.3.0.v201102200555-7A6FHr9xFcAVCFLZBBJLIR43A"/> + <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.3.0.v201103310009-7F7AFO-C25TohFopjiyZxyypBLimJWtl0-z-rVjv"/> + <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.3.0.v201103022146-7E7IBtF9JgLWTM6WDPfRm"/> + <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="2.0.0.v201103310043-797J-CcNBGNCTKPF_OY"/> + <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.3.v20110303-468b9oB5875G5M6D4A"/> <unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.301.v201102200555-2407w312123151655"/> - <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.3.0.v201102150115-7B7DFMSF7RZHOcJiPqP-NJ"/> - <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.3.0.v201102150115-7C79FSkEdhO_oe5e4kbemdKjQrQ0"/> + <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.3.0.v201102150115-7B7DFMSF7RZHOcJkQ3Pz0QJ"/> + <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.3.0.v201102150115-7C79FSkEdhO_oe7f9leekdKlR4Qz01RK"/> <unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.100.v20110303-51EoAkF77g8HBSc"/> - <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.0.v201102200555-30FA18s734D3A4Cc"/> - <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.0.v201102200555-7B5FGVAtJb3LEKNfpKHHHIh47"/> - <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.3.0.v201102200555-7E7EFMRAJun6z0o80wNSGpbLJMJ-"/> - <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.3.0.v201102200555-7I7AFeQEtEoVDjeB0Lz0mwYx54in"/> - <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.3.0.v201102071641-7C7OFchF7RZHQLIiMz0Oh_k"/> + <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.0.v201102200555-30FBb8s73553B5L"/> + <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.0.v201102200555-7B5FIEAtJcexELOoPIYRNQ775"/> + <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.3.0.v201102200555-7E7EFMRAJun8Zpm50NSIsgRt_OXWX9M"/> + <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.3.0.v201102200555-7I7AFeREtEoVEjh87M1jsaz-A-wmVgrvQz-4YaDP"/> + <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.3.0.v201102071641-7C7OFciF7RZHQNHoSwMlQj"/> <!-- <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/> <unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.2.0.feature.group" version="2.2.0.v201102111811"/> @@ -240,4 +241,4 @@ <feature id="org.mozilla.xpcom.feature"/> </includeBundles> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> -</target> +</target> \ No newline at end of file Modified: trunk/build/target-platform/unified.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/unified.target.p2mirror.xml 2011-05-17 10:28:08 UTC (rev 31346) +++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-05-17 14:03:35 UTC (rev 31347) @@ -164,6 +164,8 @@ <iu id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version=""/> <iu id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version=""/> <iu id="org.eclipse.jst.ws.cxf.feature.feature.group" version=""/> +<iu id="org.eclipse.jpt.common.feature.feature.group" version=""/> +<iu id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version=""/> <iu id="org.eclipse.jpt.jpa.feature.feature.group" version=""/> <iu id="org.eclipse.wst.common.fproj.feature.group" version=""/> <iu id="org.eclipse.jst.enterprise_ui.feature.feature.group" version=""/>

13 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r31346 - branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2011-05-17 06:28:08 -0400 (Tue, 17 May 2011) New Revision: 31346 Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/DefaultPage.java Log: JBDS-5610 Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/DefaultPage.java =================================================================== --- branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/DefaultPage.java 2011-05-17 10:21:19 UTC (rev 31345) +++ branches/jbosstools-3.2.x/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/DefaultPage.java 2011-05-17 10:28:08 UTC (rev 31346) @@ -32,6 +32,7 @@ public DefaultPage() { super(); noDefaultAndApplyButton(); + setDescription("Expand the tree to edit preferences for a specific feature."); } protected Control createContents(Composite parent) {

13 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r31345 - trunk/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2011-05-17 06:21:19 -0400 (Tue, 17 May 2011) New Revision: 31345 Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/DefaultPage.java Log: JBIDE-5610 Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/DefaultPage.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/DefaultPage.java 2011-05-17 09:04:45 UTC (rev 31344) +++ trunk/jbpm/plugins/org.jboss.tools.jbpm.common/src/org/jboss/tools/jbpm/preferences/DefaultPage.java 2011-05-17 10:21:19 UTC (rev 31345) @@ -32,6 +32,7 @@ public DefaultPage() { super(); noDefaultAndApplyButton(); + setDescription("Expand the tree to edit preferences for a specific feature."); } protected Control createContents(Composite parent) {

13 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r31344 - trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2011-05-17 05:04:45 -0400 (Tue, 17 May 2011) New Revision: 31344 Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectConfigurationUpdater.java trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java Log: remove usage of deprecated MavenPlugin.getDefault() method Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectConfigurationUpdater.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectConfigurationUpdater.java 2011-05-17 04:07:59 UTC (rev 31343) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectConfigurationUpdater.java 2011-05-17 09:04:45 UTC (rev 31344) @@ -21,7 +21,7 @@ Job job = new WorkspaceJob("Importing Forge project") { public IStatus runInWorkspace(IProgressMonitor monitor) { try { - MavenPlugin.getDefault().getProjectConfigurationManager().updateProjectConfiguration( + MavenPlugin.getProjectConfigurationManager().updateProjectConfiguration( project, monitor); } catch(CoreException ex) { @@ -30,7 +30,7 @@ return Status.OK_STATUS; } }; - job.setRule(MavenPlugin.getDefault().getProjectConfigurationManager().getRule()); + job.setRule(MavenPlugin.getProjectConfigurationManager().getRule()); job.schedule(); } Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java 2011-05-17 04:07:59 UTC (rev 31343) +++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java 2011-05-17 09:04:45 UTC (rev 31344) @@ -30,7 +30,7 @@ Job job = new WorkspaceJob("Importing Forge project") { public IStatus runInWorkspace(IProgressMonitor monitor) { try { - MavenPlugin.getDefault().getProjectConfigurationManager().importProjects( + MavenPlugin.getProjectConfigurationManager().importProjects( getProjectToImport(), new ProjectImportConfiguration(), monitor); @@ -40,7 +40,7 @@ return Status.OK_STATUS; } }; - job.setRule(MavenPlugin.getDefault().getProjectConfigurationManager().getRule()); + job.setRule(MavenPlugin.getProjectConfigurationManager().getRule()); job.schedule(); } @@ -49,7 +49,7 @@ try { File projectDir = new File(baseDirPath, projectName); File pomFile = new File(projectDir, "pom.xml"); - Model model = MavenPlugin.getDefault().getMavenModelManager().readMavenModel(pomFile); + Model model = MavenPlugin.getMavenModelManager().readMavenModel(pomFile); String pomName = projectName + "/" + "pom.xml"; result = new MavenProjectInfo(pomName, pomFile, model, null); } catch (CoreException e) {

13 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r31343 - trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF.

by jbosstools-commits＠lists.jboss.org

Author: Grid.Qian Date: 2011-05-17 00:07:59 -0400 (Tue, 17 May 2011) New Revision: 31343 Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF Log: JBIDE-7922: make the tests successfully after fix the issue Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF 2011-05-17 04:07:30 UTC (rev 31342) +++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/META-INF/MANIFEST.MF 2011-05-17 04:07:59 UTC (rev 31343) @@ -31,9 +31,9 @@ org.eclipse.ui.console, org.eclipse.jface.text, org.jboss.ide.eclipse.as.classpath.core, - org.jboss.ide.eclipse.as.ui;bundle-version="2.1.0", - org.jboss.ide.eclipse.as.wtp.core;bundle-version="2.1.0", - org.jboss.ide.eclipse.as.test;bundle-version="2.2.0" + org.jboss.ide.eclipse.as.ui, + org.jboss.ide.eclipse.as.wtp.core, + org.jboss.ide.eclipse.as.test Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.ws.creation.core.test, org.jboss.tools.ws.creation.core.test.command

13 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits May 2011