diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.hibernate.teneo')
16 files changed, 28 insertions, 25 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF index 816bcc42e8..92def4f894 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.server.hibernate.teneo;singleton:=true -Bundle-Version: 4.2.100.qualifier +Bundle-Version: 4.2.200.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -27,8 +27,8 @@ Import-Package: org.eclipse.emf.cdo.security;version="[4.0.0,5.0.0)", org.eclipse.emf.teneo.hibernate.mapper;version="[2.0.1,3.0.0)", org.eclipse.emf.teneo.simpledom;version="[2.0.1,3.0.0)", org.eclipse.emf.teneo.util;version="[2.0.1,3.0.0)" -Export-Package: org.eclipse.emf.cdo.server.hibernate.internal.teneo;version="4.2.100";x-friends:="org.eclipse.emf.cdo.tests.hibernate", - org.eclipse.emf.cdo.server.hibernate.internal.teneo.bundle;version="4.2.100";x-friends:="org.eclipse.emf.cdo.tests.hibernate", - org.eclipse.emf.cdo.server.hibernate.teneo;version="4.2.100" +Export-Package: org.eclipse.emf.cdo.server.hibernate.internal.teneo;version="4.2.200";x-friends:="org.eclipse.emf.cdo.tests.hibernate", + org.eclipse.emf.cdo.server.hibernate.internal.teneo.bundle;version="4.2.200";x-friends:="org.eclipse.emf.cdo.tests.hibernate", + org.eclipse.emf.cdo.server.hibernate.teneo;version="4.2.200" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.emf.cdo.server.hibernate.internal.teneo.bundle.OM$Activator diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProvider.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProvider.java index 68e91a1f33..9eb82a82f0 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProvider.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProvider.java @@ -45,7 +45,7 @@ import java.util.Properties; /** * Uses the ecore string in the ePackages of the store to generate a mapping. - * + * * @author Martin Taal * @author Eike Stepper * @since 3.0 @@ -104,8 +104,8 @@ public class TeneoHibernateMappingProvider extends HibernateMappingProvider properties.putAll(storeProperties); properties.putAll(mappingProviderProperties); - PackageRegistryProvider.getInstance().setThreadPackageRegistry( - getHibernateStore().getRepository().getPackageRegistry()); + PackageRegistryProvider.getInstance() + .setThreadPackageRegistry(getHibernateStore().getRepository().getPackageRegistry()); // translate the list of EPackages to an array boolean hasXMLTypePackage = false; diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProviderFactory.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProviderFactory.java index 9710a9cbdd..1ea1952985 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProviderFactory.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProviderFactory.java @@ -20,7 +20,7 @@ import java.util.Properties; /** * Reads the hibernate mapping file from one or more resource locations and adds them to the configuration. - * + * * @author Eike Stepper * @since 3.0 */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/bundle/ExportHbmCommand.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/bundle/ExportHbmCommand.java index 4d5fd8eab6..0934964199 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/bundle/ExportHbmCommand.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/bundle/ExportHbmCommand.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/bundle/OM.java index 2eeb9ebe30..86c054cf1d 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/bundle/OM.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/bundle/OM.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation * Erdal Karaca - added HibernateCommandProvider @@ -19,7 +19,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer; /** * The <em>Operations & Maintenance</em> class of this bundle. - * + * * @author Eike Stepper */ public abstract class OM diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOBasicMapper.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOBasicMapper.java index 200edf1d5c..60a7f1b039 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOBasicMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOBasicMapper.java @@ -19,7 +19,7 @@ import org.eclipse.emf.teneo.simpledom.Element; /** * Extends enum mapping with parameters for epackage and eclass. This will be solved in the next build of Teneo. - * + * * @author <a href="mtaal@elver.org">Martin Taal</a> * @since 3.0 */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEDataTypeAnnotator.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEDataTypeAnnotator.java index 4ff407c1e0..f9c858d8a2 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEDataTypeAnnotator.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEDataTypeAnnotator.java @@ -16,7 +16,7 @@ import org.eclipse.emf.teneo.hibernate.annotations.HbEDataTypeAnnotator; /** * Makes sure that the default type is a String. - * + * * @author Martin Taal * @since 3.0 */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEFeatureAnnotator.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEFeatureAnnotator.java index 726c9b2779..64e6d871d6 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEFeatureAnnotator.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEFeatureAnnotator.java @@ -19,7 +19,7 @@ import org.eclipse.emf.teneo.annotations.pannotation.PannotationFactory; /** * Extends the Teneo EFeatureAnnotator to add an external annotation to each EReference to an EModelElement. - * + * * @author Martin Taal * @since 3.0 */ @@ -38,12 +38,14 @@ public class CDOEFeatureAnnotator extends EFeatureAnnotator if (aStructuralFeature instanceof PAnnotatedEReference) { final PAnnotatedEReference paReference = (PAnnotatedEReference)aStructuralFeature; - final boolean refersToEcoreModelElement = paReference.getModelEReference().getEReferenceType().getEPackage() == EcorePackage.eINSTANCE; + final boolean refersToEcoreModelElement = paReference.getModelEReference().getEReferenceType() + .getEPackage() == EcorePackage.eINSTANCE; // these are done with a <any ..> mapping final boolean refersToEObject = paReference.getModelEReference().getEReferenceType() == EcorePackage.eINSTANCE .getEObject(); - final boolean isPartOfEcoreModel = paReference.getModelEReference().getEContainingClass().getEPackage() == EcorePackage.eINSTANCE; + final boolean isPartOfEcoreModel = paReference.getModelEReference().getEContainingClass() + .getEPackage() == EcorePackage.eINSTANCE; if (refersToEcoreModelElement && !isPartOfEcoreModel && !refersToEObject) { paReference.setExternal(PannotationFactory.eINSTANCE.createExternal()); diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEntityMapper.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEntityMapper.java index de0b989dd1..9b72a8163b 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEntityMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOEntityMapper.java @@ -23,7 +23,7 @@ import java.util.List; /** * Adds mapping for econtainer and eresource. - * + * * @author <a href="mtaal@elver.org">Martin Taal</a> * @since 3.0 */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOManyAttributeMapper.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOManyAttributeMapper.java index d3e655cbc4..453624ff63 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOManyAttributeMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOManyAttributeMapper.java @@ -17,7 +17,7 @@ import org.eclipse.emf.teneo.hibernate.mapper.ManyAttributeMapper; /** * Extends the Teneo ManyAttributeMapper to force eager load of all primitive type lists. - * + * * @author Martin Taal * @since 3.0 */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingContext.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingContext.java index 4f005724a4..de64d22309 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingContext.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingContext.java @@ -30,7 +30,7 @@ import org.eclipse.emf.teneo.simpledom.Element; /** * Mapping context for CDO. It provides cdo classes as propertyhandler etc. - * + * * @author <a href="mtaal@elver.org">Martin Taal</a> * @since 3.0 */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingGenerator.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingGenerator.java index a713d5ae84..f571718fe2 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingGenerator.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOMappingGenerator.java @@ -32,7 +32,7 @@ import java.util.Properties; /** * Generates a CDO enabled mapping for Hibernate. - * + * * @author <a href="mtaal@elver.org">Martin Taal</a> * @since 3.0 */ @@ -75,7 +75,8 @@ public class CDOMappingGenerator } } - protected void addDefaultExtension(Class<?> extensionClass, Class<?> extendingClass, ExtensionManager extensionManager) + protected void addDefaultExtension(Class<?> extensionClass, Class<?> extendingClass, + ExtensionManager extensionManager) { if (extensions.containsKey(extensionClass.getName())) { diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOOneToManyMapper.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOOneToManyMapper.java index 422c94d554..7150752d69 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOOneToManyMapper.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOOneToManyMapper.java @@ -20,7 +20,7 @@ import java.util.List; /** * Prevent delete-orphan. - * + * * @author <a href="mtaal@elver.org">Martin Taal</a> * @since 4.2 */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOOneToManyReferenceAnnotator.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOOneToManyReferenceAnnotator.java index e86473bfdb..454918cfd8 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOOneToManyReferenceAnnotator.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOOneToManyReferenceAnnotator.java @@ -16,7 +16,7 @@ import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEReference; /** * Prevent automatically added delete-orphan. - * + * * @author Martin Taal * @since 4.2 */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOXmlPersistenceContentHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOXmlPersistenceContentHandler.java index ebd5711b4f..6707f04f8c 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOXmlPersistenceContentHandler.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/CDOXmlPersistenceContentHandler.java @@ -23,7 +23,7 @@ import org.xml.sax.SAXException; /** * With cdo packages are registered at runtime so if the package in the xml is not yet present then be lenient about it. - * + * * @author <a href="mtaal@elver.org">Martin Taal</a> * @since 3.0 */ diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/TeneoUtil.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/TeneoUtil.java index b5d1bcd3d8..4d82ac7d38 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/TeneoUtil.java +++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/teneo/TeneoUtil.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ |