diff options
95 files changed, 629 insertions, 2866 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.util/META-INF/MANIFEST.MF index d08020463e..aab8cf3793 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.util/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.util/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.emf.cdo.dawn.internal.util.bundle.OM$Activator Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", - org.eclipse.net4j.tcp;bundle-version="[3.0.0,4.0.0)", + org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf;bundle-version="[2.6.0,3.0.0)", org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)", diff --git a/plugins/org.eclipse.emf.cdo.defs/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.defs/META-INF/MANIFEST.MF index e94bd43858..cdcb857934 100644 --- a/plugins/org.eclipse.emf.cdo.defs/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.defs/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Require-Bundle: org.eclipse.net4j.defs;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, +Require-Bundle: org.eclipse.net4j.defs;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j.util.defs;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport diff --git a/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.ecore b/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.ecore index abfd3d0c0e..83ce2a82d1 100644 --- a/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.ecore +++ b/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.ecore @@ -22,17 +22,6 @@ lowerBound="1" eType="#//CDOPackageRegistryDef"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="legacySupportEnabled" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="failOverStrategyDef" eType="#//FailOverStrategyDef" - unsettable="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="FailOverStrategyDef" abstract="true" - eSuperTypes="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore#//Def"> - <eStructuralFeatures xsi:type="ecore:EReference" name="connectorDef" lowerBound="1" - eType="ecore:EClass ../../org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.ecore#//ConnectorDef"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="RetryFailOverStrategyDef" eSuperTypes="#//FailOverStrategyDef"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="retries" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" - unsettable="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="CDOPackageRegistryDef" eSuperTypes="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore#//Def"> <eStructuralFeatures xsi:type="ecore:EReference" name="packages" upperBound="-1" diff --git a/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.ecorediag b/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.ecorediag index a30c344988..85a357df1b 100644 --- a/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.ecorediag +++ b/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.ecorediag @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmi:id="_pgl_cMz_Ed2cpYYbBdM6vg" type="EcoreTools" measurementUnit="Pixel"> +<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_pgl_cMz_Ed2cpYYbBdM6vg" type="EcoreTools" measurementUnit="Pixel"> <children xmi:type="notation:Node" xmi:id="_ptM4EMz_Ed2cpYYbBdM6vg" type="1001"> <children xmi:type="notation:Node" xmi:id="_ptNfIMz_Ed2cpYYbBdM6vg" type="4001"/> <children xmi:type="notation:Node" xmi:id="_ptNfIcz_Ed2cpYYbBdM6vg" type="5001"> @@ -99,42 +99,6 @@ <element xmi:type="ecore:EClass" href="org.eclipse.emf.cdo.defs.ecore#//CDOSessionDef"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ptRwlMz_Ed2cpYYbBdM6vg" x="245" y="257"/> </children> - <children xmi:type="notation:Node" xmi:id="_ptvDlMz_Ed2cpYYbBdM6vg" type="1001"> - <children xmi:type="notation:Node" xmi:id="_ptvqoMz_Ed2cpYYbBdM6vg" type="4001"/> - <children xmi:type="notation:Node" xmi:id="_ptvqocz_Ed2cpYYbBdM6vg" type="5001"> - <styles xmi:type="notation:DrawerStyle" xmi:id="_ptvqosz_Ed2cpYYbBdM6vg"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_ptvqo8z_Ed2cpYYbBdM6vg"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_ptvqpMz_Ed2cpYYbBdM6vg"/> - </children> - <children xmi:type="notation:Node" xmi:id="_ptvqpcz_Ed2cpYYbBdM6vg" type="5002"> - <styles xmi:type="notation:DrawerStyle" xmi:id="_ptvqpsz_Ed2cpYYbBdM6vg"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_ptvqp8z_Ed2cpYYbBdM6vg"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_ptvqqMz_Ed2cpYYbBdM6vg"/> - </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_ptvDlcz_Ed2cpYYbBdM6vg" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/> - <element xmi:type="ecore:EClass" href="org.eclipse.emf.cdo.defs.ecore#//FailOverStrategyDef"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ptvDlsz_Ed2cpYYbBdM6vg" x="130" y="148"/> - </children> - <children xmi:type="notation:Node" xmi:id="_ptvqqcz_Ed2cpYYbBdM6vg" type="1001"> - <children xmi:type="notation:Node" xmi:id="_ptvqrMz_Ed2cpYYbBdM6vg" type="4001"/> - <children xmi:type="notation:Node" xmi:id="_ptwRsMz_Ed2cpYYbBdM6vg" type="5001"> - <children xmi:type="notation:Node" xmi:id="_ptwRuMz_Ed2cpYYbBdM6vg" type="2001"> - <element xmi:type="ecore:EAttribute" href="org.eclipse.emf.cdo.defs.ecore#//RetryFailOverStrategyDef/retries"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_ptwRucz_Ed2cpYYbBdM6vg"/> - </children> - <styles xmi:type="notation:DrawerStyle" xmi:id="_ptwRscz_Ed2cpYYbBdM6vg"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_ptwRssz_Ed2cpYYbBdM6vg"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_ptwRs8z_Ed2cpYYbBdM6vg"/> - </children> - <children xmi:type="notation:Node" xmi:id="_ptwRtMz_Ed2cpYYbBdM6vg" type="5002"> - <styles xmi:type="notation:DrawerStyle" xmi:id="_ptwRtcz_Ed2cpYYbBdM6vg"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_ptwRtsz_Ed2cpYYbBdM6vg"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_ptwRt8z_Ed2cpYYbBdM6vg"/> - </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_ptvqqsz_Ed2cpYYbBdM6vg" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/> - <element xmi:type="ecore:EClass" href="org.eclipse.emf.cdo.defs.ecore#//RetryFailOverStrategyDef"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ptvqq8z_Ed2cpYYbBdM6vg" y="257"/> - </children> <children xmi:type="notation:Node" xmi:id="_ptwRusz_Ed2cpYYbBdM6vg" type="1001"> <children xmi:type="notation:Node" xmi:id="_ptw4wMz_Ed2cpYYbBdM6vg" type="4001"/> <children xmi:type="notation:Node" xmi:id="_ptw4wcz_Ed2cpYYbBdM6vg" type="5001"> @@ -325,28 +289,6 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pv6N0Mz_Ed2cpYYbBdM6vg" id="(0.6639676,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pv6N0cz_Ed2cpYYbBdM6vg" id="(0.24719101,1.0)"/> </edges> - <edges xmi:type="notation:Edge" xmi:id="_pt7Q2Mz_Ed2cpYYbBdM6vg" type="3002" source="_ptRwksz_Ed2cpYYbBdM6vg" target="_ptvDlMz_Ed2cpYYbBdM6vg"> - <children xmi:type="notation:Node" xmi:id="_pt7Q3Mz_Ed2cpYYbBdM6vg" type="4011"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_pt7Q3cz_Ed2cpYYbBdM6vg" x="-10" y="-10"/> - </children> - <children xmi:type="notation:Node" xmi:id="_pt7Q3sz_Ed2cpYYbBdM6vg" type="4012"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_pt7Q38z_Ed2cpYYbBdM6vg" x="10" y="10"/> - </children> - <styles xmi:type="notation:ConnectorStyle" xmi:id="_pt7Q2cz_Ed2cpYYbBdM6vg" lineColor="0"/> - <styles xmi:type="notation:FontStyle" xmi:id="_pt7Q2sz_Ed2cpYYbBdM6vg" fontName="Sans" fontHeight="10"/> - <element xmi:type="ecore:EReference" href="org.eclipse.emf.cdo.defs.ecore#//CDOSessionDef/failOverStrategyDef"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pt7Q28z_Ed2cpYYbBdM6vg" points="[1, 0, 96, 68]$[-94, -68, 1, 0]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pv6N0sz_Ed2cpYYbBdM6vg" id="(0.3319838,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pv6N08z_Ed2cpYYbBdM6vg" id="(0.66233766,1.0)"/> - </edges> - <edges xmi:type="notation:Edge" xmi:id="_pt7Q4Mz_Ed2cpYYbBdM6vg" type="3003" source="_ptvqqcz_Ed2cpYYbBdM6vg" target="_ptvDlMz_Ed2cpYYbBdM6vg"> - <styles xmi:type="notation:ConnectorStyle" xmi:id="_pt7Q4cz_Ed2cpYYbBdM6vg" routing="Tree" lineColor="0"/> - <styles xmi:type="notation:FontStyle" xmi:id="_pt7Q4sz_Ed2cpYYbBdM6vg" fontName="Sans"/> - <element xsi:nil="true"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pt7Q48z_Ed2cpYYbBdM6vg" points="[1, 0, -88, 68]$[1, -30, -88, 38]$[90, -30, 1, 38]$[90, -68, 1, 0]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pv4_ssz_Ed2cpYYbBdM6vg" id="(0.4972973,0.0)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pv4_s8z_Ed2cpYYbBdM6vg" id="(0.33116883,1.0)"/> - </edges> <edges xmi:type="notation:Edge" xmi:id="_pt734Mz_Ed2cpYYbBdM6vg" type="3002" source="_ptwRusz_Ed2cpYYbBdM6vg" target="_ptyG5Mz_Ed2cpYYbBdM6vg"> <children xmi:type="notation:Node" xmi:id="_pt735Mz_Ed2cpYYbBdM6vg" type="4011"> <layoutConstraint xmi:type="notation:Location" xmi:id="_pt735cz_Ed2cpYYbBdM6vg" x="-10" y="-10"/> diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.java index e3788abf92..fc4da8d203 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.java @@ -15,13 +15,14 @@ import java.util.Date; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Audit Def</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.defs.CDOAuditDef#getTimeStamp <em>Time Stamp</em>}</li> + * <li>{@link org.eclipse.emf.cdo.defs.CDOAuditDef#getTimeStamp <em>Time Stamp</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOAuditDef() * @model * @generated @@ -29,13 +30,13 @@ import java.util.Date; public interface CDOAuditDef extends CDOViewDef { /** - * Returns the value of the '<em><b>Time Stamp</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Time Stamp</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Time Stamp</em>' attribute isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Time Stamp</em>' attribute. * @see #setTimeStamp(Date) * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOAuditDef_TimeStamp() @@ -47,9 +48,7 @@ public interface CDOAuditDef extends CDOViewDef /** * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOAuditDef#getTimeStamp <em>Time Stamp</em>}' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Time Stamp</em>' attribute. + * @param value the new value of the '<em>Time Stamp</em>' attribute. * @see #getTimeStamp() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.java index 780340db0f..3bdb57a385 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.java @@ -16,7 +16,8 @@ import org.eclipse.net4j.defs.ClientProtocolFactoryDef; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Client Protocol Factory Def</b></em>'. <!-- * end-user-doc --> - * + * + * * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOClientProtocolFactoryDef() * @model * @generated diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.java index 97df421ee5..eafdc1937d 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.java @@ -16,63 +16,53 @@ import org.eclipse.emf.ecore.EFactory; /** * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of * the model. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.defs.CDODefsPackage * @generated */ public interface CDODefsFactory extends EFactory { /** - * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The singleton instance of the factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ CDODefsFactory eINSTANCE = org.eclipse.emf.cdo.defs.impl.CDODefsFactoryImpl.init(); /** - * Returns a new object of class '<em>CDO View Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>CDO View Def</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>CDO View Def</em>'. * @generated */ CDOViewDef createCDOViewDef(); /** - * Returns a new object of class '<em>CDO Transaction Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>CDO Transaction Def</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>CDO Transaction Def</em>'. * @generated */ CDOTransactionDef createCDOTransactionDef(); /** - * Returns a new object of class '<em>CDO Audit Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>CDO Audit Def</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>CDO Audit Def</em>'. * @generated */ CDOAuditDef createCDOAuditDef(); /** - * Returns a new object of class '<em>CDO Session Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>CDO Session Def</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>CDO Session Def</em>'. * @generated */ CDOSessionDef createCDOSessionDef(); /** - * Returns a new object of class '<em>Retry Fail Over Strategy Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc - * --> - * - * @return a new object of class '<em>Retry Fail Over Strategy Def</em>'. - * @generated - */ - RetryFailOverStrategyDef createRetryFailOverStrategyDef(); - - /** - * Returns a new object of class '<em>CDO Package Registry Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>CDO Package Registry Def</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>CDO Package Registry Def</em>'. * @generated */ @@ -97,16 +87,16 @@ public interface CDODefsFactory extends EFactory CDOLazyPackageRegistryDef createCDOLazyPackageRegistryDef(); /** - * Returns a new object of class '<em>EDynamic Package Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>EDynamic Package Def</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>EDynamic Package Def</em>'. * @generated */ EDynamicPackageDef createEDynamicPackageDef(); /** - * Returns a new object of class '<em>EGlobal Package Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>EGlobal Package Def</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>EGlobal Package Def</em>'. * @generated */ @@ -122,16 +112,16 @@ public interface CDODefsFactory extends EFactory CDOClientProtocolFactoryDef createCDOClientProtocolFactoryDef(); /** - * Returns a new object of class '<em>CDO Resource Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>CDO Resource Def</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>CDO Resource Def</em>'. * @generated */ CDOResourceDef createCDOResourceDef(); /** - * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the package supported by this factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the package supported by this factory. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.java index 8cd7d239d1..b0c9dad2d4 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.java @@ -29,7 +29,6 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.defs.CDODefsFactory * @model kind="package" * @generated @@ -37,29 +36,29 @@ import org.eclipse.emf.ecore.EReference; public interface CDODefsPackage extends EPackage { /** - * The package name. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNAME = "defs"; /** - * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package namespace URI. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNS_URI = "http://www.eclipse.org/emf/CDO/defs/1.0.0"; /** - * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package namespace name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNS_PREFIX = "cdo.defs"; /** - * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The singleton instance of the package. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ CDODefsPackage eINSTANCE = org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl.init(); @@ -75,8 +74,8 @@ public interface CDODefsPackage extends EPackage int CDO_VIEW_DEF = 0; /** - * The feature id for the '<em><b>Cdo Session Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Cdo Session Def</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -92,9 +91,8 @@ public interface CDODefsPackage extends EPackage int CDO_VIEW_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl - * <em>CDO Transaction Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl <em>CDO Transaction Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOTransactionDef() * @generated @@ -102,17 +100,17 @@ public interface CDODefsPackage extends EPackage int CDO_TRANSACTION_DEF = 1; /** - * The feature id for the '<em><b>Cdo Session Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Cdo Session Def</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CDO_TRANSACTION_DEF__CDO_SESSION_DEF = CDO_VIEW_DEF__CDO_SESSION_DEF; /** - * The number of structural features of the '<em>CDO Transaction Def</em>' class. <!-- begin-user-doc --> <!-- + * The number of structural features of the '<em>CDO Transaction Def</em>' class. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ @@ -121,7 +119,6 @@ public interface CDODefsPackage extends EPackage /** * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl <em>CDO Audit Def</em>}' class. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOAuditDef() * @generated @@ -129,16 +126,16 @@ public interface CDODefsPackage extends EPackage int CDO_AUDIT_DEF = 2; /** - * The feature id for the '<em><b>Cdo Session Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Cdo Session Def</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CDO_AUDIT_DEF__CDO_SESSION_DEF = CDO_VIEW_DEF__CDO_SESSION_DEF; /** - * The feature id for the '<em><b>Time Stamp</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Time Stamp</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -154,9 +151,8 @@ public interface CDODefsPackage extends EPackage int CDO_AUDIT_DEF_FEATURE_COUNT = CDO_VIEW_DEF_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl <em>CDO Session Def</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl <em>CDO Session Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOSessionDef() * @generated @@ -164,198 +160,124 @@ public interface CDODefsPackage extends EPackage int CDO_SESSION_DEF = 3; /** - * The feature id for the '<em><b>Connector Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Connector Def</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CDO_SESSION_DEF__CONNECTOR_DEF = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Repository Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Repository Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CDO_SESSION_DEF__REPOSITORY_NAME = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Cdo Package Registry Def</b></em>' reference. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Cdo Package Registry Def</b></em>' reference. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Legacy Support Enabled</b></em>' attribute. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Legacy Support Enabled</b></em>' attribute. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 3; /** - * The feature id for the '<em><b>Fail Over Strategy Def</b></em>' reference. <!-- begin-user-doc --> <!-- + * The number of structural features of the '<em>CDO Session Def</em>' class. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ - int CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 4; + int CDO_SESSION_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 4; /** - * The number of structural features of the '<em>CDO Session Def</em>' class. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - * @ordered - */ - int CDO_SESSION_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 5; - - /** - * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.FailOverStrategyDefImpl - * <em>Fail Over Strategy Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.defs.impl.FailOverStrategyDefImpl - * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getFailOverStrategyDef() - * @generated - */ - int FAIL_OVER_STRATEGY_DEF = 4; - - /** - * The feature id for the '<em><b>Connector Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - * @ordered - */ - int FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0; - - /** - * The number of structural features of the '<em>Fail Over Strategy Def</em>' class. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - * @ordered - */ - int FAIL_OVER_STRATEGY_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1; - - /** - * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.RetryFailOverStrategyDefImpl - * <em>Retry Fail Over Strategy Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.defs.impl.RetryFailOverStrategyDefImpl - * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getRetryFailOverStrategyDef() - * @generated - */ - int RETRY_FAIL_OVER_STRATEGY_DEF = 5; - - /** - * The feature id for the '<em><b>Connector Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - * @ordered - */ - int RETRY_FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF = FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF; - - /** - * The feature id for the '<em><b>Retries</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - * @ordered - */ - int RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES = FAIL_OVER_STRATEGY_DEF_FEATURE_COUNT + 0; - - /** - * The number of structural features of the '<em>Retry Fail Over Strategy Def</em>' class. <!-- begin-user-doc --> - * <!-- end-user-doc --> - * - * @generated - * @ordered - */ - int RETRY_FAIL_OVER_STRATEGY_DEF_FEATURE_COUNT = FAIL_OVER_STRATEGY_DEF_FEATURE_COUNT + 1; - - /** - * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl - * <em>CDO Package Registry Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl <em>CDO Package Registry Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOPackageRegistryDef() * @generated */ - int CDO_PACKAGE_REGISTRY_DEF = 6; + int CDO_PACKAGE_REGISTRY_DEF = 4; /** - * The feature id for the '<em><b>Packages</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Packages</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int CDO_PACKAGE_REGISTRY_DEF__PACKAGES = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0; /** - * The number of structural features of the '<em>CDO Package Registry Def</em>' class. <!-- begin-user-doc --> <!-- + * The number of structural features of the '<em>CDO Package Registry Def</em>' class. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int CDO_PACKAGE_REGISTRY_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl - * <em>CDO Eager Package Registry Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl <em>CDO Eager Package Registry Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOEagerPackageRegistryDef() * @generated */ - int CDO_EAGER_PACKAGE_REGISTRY_DEF = 7; + int CDO_EAGER_PACKAGE_REGISTRY_DEF = 5; /** - * The feature id for the '<em><b>Packages</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Packages</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int CDO_EAGER_PACKAGE_REGISTRY_DEF__PACKAGES = CDO_PACKAGE_REGISTRY_DEF__PACKAGES; /** - * The number of structural features of the '<em>CDO Eager Package Registry Def</em>' class. <!-- begin-user-doc --> + * The number of structural features of the '<em>CDO Eager Package Registry Def</em>' class. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated * @ordered */ int CDO_EAGER_PACKAGE_REGISTRY_DEF_FEATURE_COUNT = CDO_PACKAGE_REGISTRY_DEF_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOLazyPackageRegistryDefImpl - * <em>CDO Lazy Package Registry Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOLazyPackageRegistryDefImpl <em>CDO Lazy Package Registry Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.CDOLazyPackageRegistryDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOLazyPackageRegistryDef() * @generated */ - int CDO_LAZY_PACKAGE_REGISTRY_DEF = 8; + int CDO_LAZY_PACKAGE_REGISTRY_DEF = 6; /** - * The feature id for the '<em><b>Packages</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Packages</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int CDO_LAZY_PACKAGE_REGISTRY_DEF__PACKAGES = CDO_PACKAGE_REGISTRY_DEF__PACKAGES; /** - * The number of structural features of the '<em>CDO Lazy Package Registry Def</em>' class. <!-- begin-user-doc --> + * The number of structural features of the '<em>CDO Lazy Package Registry Def</em>' class. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated * @ordered */ @@ -364,16 +286,15 @@ public interface CDODefsPackage extends EPackage /** * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.EPackageDefImpl <em>EPackage Def</em>}' class. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.defs.impl.EPackageDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getEPackageDef() * @generated */ - int EPACKAGE_DEF = 9; + int EPACKAGE_DEF = 7; /** - * The feature id for the '<em><b>Ns URI</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Ns URI</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -389,124 +310,120 @@ public interface CDODefsPackage extends EPackage int EPACKAGE_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl - * <em>EDynamic Package Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl <em>EDynamic Package Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getEDynamicPackageDef() * @generated */ - int EDYNAMIC_PACKAGE_DEF = 10; + int EDYNAMIC_PACKAGE_DEF = 8; /** - * The feature id for the '<em><b>Ns URI</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Ns URI</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int EDYNAMIC_PACKAGE_DEF__NS_URI = EPACKAGE_DEF__NS_URI; /** - * The feature id for the '<em><b>Resource URI</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Resource URI</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int EDYNAMIC_PACKAGE_DEF__RESOURCE_URI = EPACKAGE_DEF_FEATURE_COUNT + 0; /** - * The number of structural features of the '<em>EDynamic Package Def</em>' class. <!-- begin-user-doc --> <!-- + * The number of structural features of the '<em>EDynamic Package Def</em>' class. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int EDYNAMIC_PACKAGE_DEF_FEATURE_COUNT = EPACKAGE_DEF_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.EGlobalPackageDefImpl - * <em>EGlobal Package Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.EGlobalPackageDefImpl <em>EGlobal Package Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.EGlobalPackageDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getEGlobalPackageDef() * @generated */ - int EGLOBAL_PACKAGE_DEF = 11; + int EGLOBAL_PACKAGE_DEF = 9; /** - * The feature id for the '<em><b>Ns URI</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Ns URI</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int EGLOBAL_PACKAGE_DEF__NS_URI = EPACKAGE_DEF__NS_URI; /** - * The number of structural features of the '<em>EGlobal Package Def</em>' class. <!-- begin-user-doc --> <!-- + * The number of structural features of the '<em>EGlobal Package Def</em>' class. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int EGLOBAL_PACKAGE_DEF_FEATURE_COUNT = EPACKAGE_DEF_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl - * <em>CDO Client Protocol Factory Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl <em>CDO Client Protocol Factory Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOClientProtocolFactoryDef() * @generated */ - int CDO_CLIENT_PROTOCOL_FACTORY_DEF = 12; + int CDO_CLIENT_PROTOCOL_FACTORY_DEF = 10; /** - * The number of structural features of the '<em>CDO Client Protocol Factory Def</em>' class. <!-- begin-user-doc --> + * The number of structural features of the '<em>CDO Client Protocol Factory Def</em>' class. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated * @ordered */ int CDO_CLIENT_PROTOCOL_FACTORY_DEF_FEATURE_COUNT = Net4jDefsPackage.CLIENT_PROTOCOL_FACTORY_DEF_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl <em>CDO Resource Def</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl <em>CDO Resource Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOResourceDef() * @generated */ - int CDO_RESOURCE_DEF = 13; + int CDO_RESOURCE_DEF = 11; /** - * The feature id for the '<em><b>Cdo Transaction</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Cdo Transaction</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CDO_RESOURCE_DEF__CDO_TRANSACTION = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Resource Mode</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Resource Mode</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CDO_RESOURCE_DEF__RESOURCE_MODE = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Path</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CDO_RESOURCE_DEF__PATH = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 2; /** - * The number of structural features of the '<em>CDO Resource Def</em>' class. <!-- begin-user-doc --> <!-- + * The number of structural features of the '<em>CDO Resource Def</em>' class. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ @@ -520,7 +437,7 @@ public interface CDODefsPackage extends EPackage * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getResourceMode() * @generated */ - int RESOURCE_MODE = 14; + int RESOURCE_MODE = 12; /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOViewDef <em>CDO View Def</em>}'. <!-- @@ -533,9 +450,8 @@ public interface CDODefsPackage extends EPackage EClass getCDOViewDef(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef - * <em>Cdo Session Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef <em>Cdo Session Def</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference '<em>Cdo Session Def</em>'. * @see org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef() * @see #getCDOViewDef() @@ -544,9 +460,8 @@ public interface CDODefsPackage extends EPackage EReference getCDOViewDef_CdoSessionDef(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOTransactionDef <em>CDO Transaction Def</em>} - * '. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOTransactionDef <em>CDO Transaction Def</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for class '<em>CDO Transaction Def</em>'. * @see org.eclipse.emf.cdo.defs.CDOTransactionDef * @generated @@ -564,9 +479,8 @@ public interface CDODefsPackage extends EPackage EClass getCDOAuditDef(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOAuditDef#getTimeStamp - * <em>Time Stamp</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOAuditDef#getTimeStamp <em>Time Stamp</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Time Stamp</em>'. * @see org.eclipse.emf.cdo.defs.CDOAuditDef#getTimeStamp() * @see #getCDOAuditDef() @@ -585,9 +499,8 @@ public interface CDODefsPackage extends EPackage EClass getCDOSessionDef(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef - * <em>Connector Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference '<em>Connector Def</em>'. * @see org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef() * @see #getCDOSessionDef() @@ -596,9 +509,8 @@ public interface CDODefsPackage extends EPackage EReference getCDOSessionDef_ConnectorDef(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName - * <em>Repository Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName <em>Repository Name</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Repository Name</em>'. * @see org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName() * @see #getCDOSessionDef() @@ -607,9 +519,8 @@ public interface CDODefsPackage extends EPackage EAttribute getCDOSessionDef_RepositoryName(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef - * <em>Cdo Package Registry Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef <em>Cdo Package Registry Def</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference '<em>Cdo Package Registry Def</em>'. * @see org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef() * @see #getCDOSessionDef() @@ -618,9 +529,8 @@ public interface CDODefsPackage extends EPackage EReference getCDOSessionDef_CdoPackageRegistryDef(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled - * <em>Legacy Support Enabled</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled <em>Legacy Support Enabled</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Legacy Support Enabled</em>'. * @see org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled() * @see #getCDOSessionDef() @@ -629,62 +539,8 @@ public interface CDODefsPackage extends EPackage EAttribute getCDOSessionDef_LegacySupportEnabled(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getFailOverStrategyDef - * <em>Fail Over Strategy Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return the meta object for the reference '<em>Fail Over Strategy Def</em>'. - * @see org.eclipse.emf.cdo.defs.CDOSessionDef#getFailOverStrategyDef() - * @see #getCDOSessionDef() - * @generated - */ - EReference getCDOSessionDef_FailOverStrategyDef(); - - /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.FailOverStrategyDef - * <em>Fail Over Strategy Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return the meta object for class '<em>Fail Over Strategy Def</em>'. - * @see org.eclipse.emf.cdo.defs.FailOverStrategyDef - * @generated - */ - EClass getFailOverStrategyDef(); - - /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.FailOverStrategyDef#getConnectorDef - * <em>Connector Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return the meta object for the reference '<em>Connector Def</em>'. - * @see org.eclipse.emf.cdo.defs.FailOverStrategyDef#getConnectorDef() - * @see #getFailOverStrategyDef() - * @generated - */ - EReference getFailOverStrategyDef_ConnectorDef(); - - /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef - * <em>Retry Fail Over Strategy Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return the meta object for class '<em>Retry Fail Over Strategy Def</em>'. - * @see org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef - * @generated - */ - EClass getRetryFailOverStrategyDef(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef#getRetries - * <em>Retries</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return the meta object for the attribute '<em>Retries</em>'. - * @see org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef#getRetries() - * @see #getRetryFailOverStrategyDef() - * @generated - */ - EAttribute getRetryFailOverStrategyDef_Retries(); - - /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef - * <em>CDO Package Registry Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef <em>CDO Package Registry Def</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for class '<em>CDO Package Registry Def</em>'. * @see org.eclipse.emf.cdo.defs.CDOPackageRegistryDef * @generated @@ -692,10 +548,9 @@ public interface CDODefsPackage extends EPackage EClass getCDOPackageRegistryDef(); /** - * Returns the meta object for the containment reference list ' - * {@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef#getPackages <em>Packages</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef#getPackages <em>Packages</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the containment reference list '<em>Packages</em>'. * @see org.eclipse.emf.cdo.defs.CDOPackageRegistryDef#getPackages() * @see #getCDOPackageRegistryDef() @@ -704,9 +559,8 @@ public interface CDODefsPackage extends EPackage EReference getCDOPackageRegistryDef_Packages(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOEagerPackageRegistryDef - * <em>CDO Eager Package Registry Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOEagerPackageRegistryDef <em>CDO Eager Package Registry Def</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for class '<em>CDO Eager Package Registry Def</em>'. * @see org.eclipse.emf.cdo.defs.CDOEagerPackageRegistryDef * @generated @@ -714,9 +568,8 @@ public interface CDODefsPackage extends EPackage EClass getCDOEagerPackageRegistryDef(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOLazyPackageRegistryDef - * <em>CDO Lazy Package Registry Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOLazyPackageRegistryDef <em>CDO Lazy Package Registry Def</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for class '<em>CDO Lazy Package Registry Def</em>'. * @see org.eclipse.emf.cdo.defs.CDOLazyPackageRegistryDef * @generated @@ -736,7 +589,6 @@ public interface CDODefsPackage extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.EPackageDef#getNsURI <em>Ns URI</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>Ns URI</em>'. * @see org.eclipse.emf.cdo.defs.EPackageDef#getNsURI() * @see #getEPackageDef() @@ -745,9 +597,8 @@ public interface CDODefsPackage extends EPackage EAttribute getEPackageDef_NsURI(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef - * <em>EDynamic Package Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef <em>EDynamic Package Def</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for class '<em>EDynamic Package Def</em>'. * @see org.eclipse.emf.cdo.defs.EDynamicPackageDef * @generated @@ -755,9 +606,8 @@ public interface CDODefsPackage extends EPackage EClass getEDynamicPackageDef(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI - * <em>Resource URI</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI <em>Resource URI</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Resource URI</em>'. * @see org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI() * @see #getEDynamicPackageDef() @@ -766,9 +616,8 @@ public interface CDODefsPackage extends EPackage EAttribute getEDynamicPackageDef_ResourceURI(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.EGlobalPackageDef <em>EGlobal Package Def</em>} - * '. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.EGlobalPackageDef <em>EGlobal Package Def</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for class '<em>EGlobal Package Def</em>'. * @see org.eclipse.emf.cdo.defs.EGlobalPackageDef * @generated @@ -776,9 +625,8 @@ public interface CDODefsPackage extends EPackage EClass getEGlobalPackageDef(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOClientProtocolFactoryDef - * <em>CDO Client Protocol Factory Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOClientProtocolFactoryDef <em>CDO Client Protocol Factory Def</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for class '<em>CDO Client Protocol Factory Def</em>'. * @see org.eclipse.emf.cdo.defs.CDOClientProtocolFactoryDef * @generated @@ -796,9 +644,8 @@ public interface CDODefsPackage extends EPackage EClass getCDOResourceDef(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getCdoTransaction - * <em>Cdo Transaction</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getCdoTransaction <em>Cdo Transaction</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference '<em>Cdo Transaction</em>'. * @see org.eclipse.emf.cdo.defs.CDOResourceDef#getCdoTransaction() * @see #getCDOResourceDef() @@ -807,9 +654,8 @@ public interface CDODefsPackage extends EPackage EReference getCDOResourceDef_CdoTransaction(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getResourceMode - * <em>Resource Mode</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getResourceMode <em>Resource Mode</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Resource Mode</em>'. * @see org.eclipse.emf.cdo.defs.CDOResourceDef#getResourceMode() * @see #getCDOResourceDef() @@ -820,7 +666,6 @@ public interface CDODefsPackage extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getPath <em>Path</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>Path</em>'. * @see org.eclipse.emf.cdo.defs.CDOResourceDef#getPath() * @see #getCDOResourceDef() @@ -839,8 +684,8 @@ public interface CDODefsPackage extends EPackage EEnum getResourceMode(); /** - * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the factory that creates the instances of the model. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the factory that creates the instances of the model. * @generated */ @@ -855,15 +700,13 @@ public interface CDODefsPackage extends EPackage * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * * @generated */ interface Literals { /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl <em>CDO View Def</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl <em>CDO View Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOViewDef() * @generated @@ -871,17 +714,16 @@ public interface CDODefsPackage extends EPackage EClass CDO_VIEW_DEF = eINSTANCE.getCDOViewDef(); /** - * The meta object literal for the '<em><b>Cdo Session Def</b></em>' reference feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Cdo Session Def</b></em>' reference feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EReference CDO_VIEW_DEF__CDO_SESSION_DEF = eINSTANCE.getCDOViewDef_CdoSessionDef(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl - * <em>CDO Transaction Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl <em>CDO Transaction Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOTransactionDef() * @generated @@ -889,9 +731,8 @@ public interface CDODefsPackage extends EPackage EClass CDO_TRANSACTION_DEF = eINSTANCE.getCDOTransactionDef(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl <em>CDO Audit Def</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl <em>CDO Audit Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOAuditDef() * @generated @@ -899,17 +740,16 @@ public interface CDODefsPackage extends EPackage EClass CDO_AUDIT_DEF = eINSTANCE.getCDOAuditDef(); /** - * The meta object literal for the '<em><b>Time Stamp</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Time Stamp</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute CDO_AUDIT_DEF__TIME_STAMP = eINSTANCE.getCDOAuditDef_TimeStamp(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl <em>CDO Session Def</em>} - * ' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl <em>CDO Session Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOSessionDef() * @generated @@ -917,85 +757,40 @@ public interface CDODefsPackage extends EPackage EClass CDO_SESSION_DEF = eINSTANCE.getCDOSessionDef(); /** - * The meta object literal for the '<em><b>Connector Def</b></em>' reference feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Connector Def</b></em>' reference feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EReference CDO_SESSION_DEF__CONNECTOR_DEF = eINSTANCE.getCDOSessionDef_ConnectorDef(); /** - * The meta object literal for the '<em><b>Repository Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Repository Name</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute CDO_SESSION_DEF__REPOSITORY_NAME = eINSTANCE.getCDOSessionDef_RepositoryName(); /** - * The meta object literal for the '<em><b>Cdo Package Registry Def</b></em>' reference feature. <!-- begin-user-doc + * The meta object literal for the '<em><b>Cdo Package Registry Def</b></em>' reference feature. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ EReference CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF = eINSTANCE.getCDOSessionDef_CdoPackageRegistryDef(); /** - * The meta object literal for the '<em><b>Legacy Support Enabled</b></em>' attribute feature. <!-- begin-user-doc + * The meta object literal for the '<em><b>Legacy Support Enabled</b></em>' attribute feature. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ EAttribute CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED = eINSTANCE.getCDOSessionDef_LegacySupportEnabled(); /** - * The meta object literal for the '<em><b>Fail Over Strategy Def</b></em>' reference feature. <!-- begin-user-doc - * --> <!-- end-user-doc --> - * - * @generated - */ - EReference CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF = eINSTANCE.getCDOSessionDef_FailOverStrategyDef(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.FailOverStrategyDefImpl - * <em>Fail Over Strategy Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.defs.impl.FailOverStrategyDefImpl - * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getFailOverStrategyDef() - * @generated - */ - EClass FAIL_OVER_STRATEGY_DEF = eINSTANCE.getFailOverStrategyDef(); - - /** - * The meta object literal for the '<em><b>Connector Def</b></em>' reference feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EReference FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF = eINSTANCE.getFailOverStrategyDef_ConnectorDef(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.RetryFailOverStrategyDefImpl - * <em>Retry Fail Over Strategy Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see org.eclipse.emf.cdo.defs.impl.RetryFailOverStrategyDefImpl - * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getRetryFailOverStrategyDef() - * @generated - */ - EClass RETRY_FAIL_OVER_STRATEGY_DEF = eINSTANCE.getRetryFailOverStrategyDef(); - - /** - * The meta object literal for the '<em><b>Retries</b></em>' attribute feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @generated - */ - EAttribute RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES = eINSTANCE.getRetryFailOverStrategyDef_Retries(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl - * <em>CDO Package Registry Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl <em>CDO Package Registry Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOPackageRegistryDef() * @generated @@ -1011,9 +806,8 @@ public interface CDODefsPackage extends EPackage EReference CDO_PACKAGE_REGISTRY_DEF__PACKAGES = eINSTANCE.getCDOPackageRegistryDef_Packages(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl - * <em>CDO Eager Package Registry Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl <em>CDO Eager Package Registry Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOEagerPackageRegistryDef() * @generated @@ -1021,9 +815,8 @@ public interface CDODefsPackage extends EPackage EClass CDO_EAGER_PACKAGE_REGISTRY_DEF = eINSTANCE.getCDOEagerPackageRegistryDef(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOLazyPackageRegistryDefImpl - * <em>CDO Lazy Package Registry Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOLazyPackageRegistryDefImpl <em>CDO Lazy Package Registry Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.CDOLazyPackageRegistryDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOLazyPackageRegistryDef() * @generated @@ -1031,9 +824,8 @@ public interface CDODefsPackage extends EPackage EClass CDO_LAZY_PACKAGE_REGISTRY_DEF = eINSTANCE.getCDOLazyPackageRegistryDef(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.EPackageDefImpl <em>EPackage Def</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.EPackageDefImpl <em>EPackage Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.EPackageDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getEPackageDef() * @generated @@ -1041,17 +833,16 @@ public interface CDODefsPackage extends EPackage EClass EPACKAGE_DEF = eINSTANCE.getEPackageDef(); /** - * The meta object literal for the '<em><b>Ns URI</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Ns URI</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute EPACKAGE_DEF__NS_URI = eINSTANCE.getEPackageDef_NsURI(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl - * <em>EDynamic Package Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl <em>EDynamic Package Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getEDynamicPackageDef() * @generated @@ -1059,17 +850,16 @@ public interface CDODefsPackage extends EPackage EClass EDYNAMIC_PACKAGE_DEF = eINSTANCE.getEDynamicPackageDef(); /** - * The meta object literal for the '<em><b>Resource URI</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Resource URI</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute EDYNAMIC_PACKAGE_DEF__RESOURCE_URI = eINSTANCE.getEDynamicPackageDef_ResourceURI(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.EGlobalPackageDefImpl - * <em>EGlobal Package Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.EGlobalPackageDefImpl <em>EGlobal Package Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.EGlobalPackageDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getEGlobalPackageDef() * @generated @@ -1077,9 +867,8 @@ public interface CDODefsPackage extends EPackage EClass EGLOBAL_PACKAGE_DEF = eINSTANCE.getEGlobalPackageDef(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl - * <em>CDO Client Protocol Factory Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl <em>CDO Client Protocol Factory Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOClientProtocolFactoryDef() * @generated @@ -1087,9 +876,8 @@ public interface CDODefsPackage extends EPackage EClass CDO_CLIENT_PROTOCOL_FACTORY_DEF = eINSTANCE.getCDOClientProtocolFactoryDef(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl - * <em>CDO Resource Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl <em>CDO Resource Def</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOResourceDef() * @generated @@ -1097,25 +885,25 @@ public interface CDODefsPackage extends EPackage EClass CDO_RESOURCE_DEF = eINSTANCE.getCDOResourceDef(); /** - * The meta object literal for the '<em><b>Cdo Transaction</b></em>' reference feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Cdo Transaction</b></em>' reference feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EReference CDO_RESOURCE_DEF__CDO_TRANSACTION = eINSTANCE.getCDOResourceDef_CdoTransaction(); /** - * The meta object literal for the '<em><b>Resource Mode</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Resource Mode</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute CDO_RESOURCE_DEF__RESOURCE_MODE = eINSTANCE.getCDOResourceDef_ResourceMode(); /** - * The meta object literal for the '<em><b>Path</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Path</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute CDO_RESOURCE_DEF__PATH = eINSTANCE.getCDOResourceDef_Path(); diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.java index 2716911d8f..014cd24202 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.java @@ -14,7 +14,8 @@ package org.eclipse.emf.cdo.defs; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Eager Package Registry Def</b></em>'. <!-- * end-user-doc --> - * + * + * * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOEagerPackageRegistryDef() * @model * @generated diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.java index dce2335c40..f9688e3a1b 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.java @@ -14,7 +14,8 @@ package org.eclipse.emf.cdo.defs; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Lazy Package Registry Def</b></em>'. <!-- * end-user-doc --> - * + * + * * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOLazyPackageRegistryDef() * @model * @generated diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.java index 3e5b8c8b1c..e8062ae2d1 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.java @@ -18,13 +18,14 @@ import org.eclipse.emf.common.util.EList; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Package Registry Def</b></em>'. <!-- * end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef#getPackages <em>Packages</em>}</li> + * <li>{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef#getPackages <em>Packages</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOPackageRegistryDef() * @model * @generated @@ -32,14 +33,14 @@ import org.eclipse.emf.common.util.EList; public interface CDOPackageRegistryDef extends Def { /** - * Returns the value of the '<em><b>Packages</b></em>' containment reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.defs.EPackageDef}. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Packages</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.defs.EPackageDef}. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Packages</em>' containment reference list isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Packages</em>' containment reference list. * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOPackageRegistryDef_Packages() * @model containment="true" diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.java index af738d2f46..6c19b31209 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.java @@ -32,13 +32,13 @@ import org.eclipse.net4j.util.defs.Def; public interface CDOResourceDef extends Def { /** - * Returns the value of the '<em><b>Cdo Transaction</b></em>' reference. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Cdo Transaction</b></em>' reference. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Cdo Transaction</em>' reference isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Cdo Transaction</em>' reference. * @see #setCdoTransaction(CDOTransactionDef) * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOResourceDef_CdoTransaction() @@ -48,25 +48,24 @@ public interface CDOResourceDef extends Def CDOTransactionDef getCdoTransaction(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getCdoTransaction <em>Cdo Transaction</em>}' - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Cdo Transaction</em>' reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getCdoTransaction <em>Cdo Transaction</em>}' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Cdo Transaction</em>' reference. * @see #getCdoTransaction() * @generated */ void setCdoTransaction(CDOTransactionDef value); /** - * Returns the value of the '<em><b>Resource Mode</b></em>' attribute. The default value is <code>"null"</code>. The - * literals are from the enumeration {@link org.eclipse.emf.cdo.defs.ResourceMode}. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Resource Mode</b></em>' attribute. + * The default value is <code>"null"</code>. + * The literals are from the enumeration {@link org.eclipse.emf.cdo.defs.ResourceMode}. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Resource Mode</em>' attribute isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Resource Mode</em>' attribute. * @see org.eclipse.emf.cdo.defs.ResourceMode * @see #setResourceMode(ResourceMode) @@ -77,11 +76,9 @@ public interface CDOResourceDef extends Def ResourceMode getResourceMode(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getResourceMode <em>Resource Mode</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Resource Mode</em>' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getResourceMode <em>Resource Mode</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Resource Mode</em>' attribute. * @see org.eclipse.emf.cdo.defs.ResourceMode * @see #getResourceMode() * @generated @@ -89,12 +86,12 @@ public interface CDOResourceDef extends Def void setResourceMode(ResourceMode value); /** - * Returns the value of the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Path</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Path</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Path</em>' attribute. * @see #setPath(String) * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOResourceDef_Path() diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.java index 19bac357e1..32279fd2e2 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.java @@ -16,17 +16,17 @@ import org.eclipse.net4j.util.defs.Def; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Session Def</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}</li> - * <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName <em>Repository Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef <em>Cdo Package Registry Def</em>}</li> - * <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled <em>Legacy Support Enabled</em>}</li> - * <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getFailOverStrategyDef <em>Fail Over Strategy Def</em>}</li> + * <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}</li> + * <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName <em>Repository Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef <em>Cdo Package Registry Def</em>}</li> + * <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled <em>Legacy Support Enabled</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOSessionDef() * @model * @generated @@ -34,13 +34,13 @@ import org.eclipse.net4j.util.defs.Def; public interface CDOSessionDef extends Def { /** - * Returns the value of the '<em><b>Connector Def</b></em>' reference. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Connector Def</b></em>' reference. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Connector Def</em>' reference isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Connector Def</em>' reference. * @see #isSetConnectorDef() * @see #unsetConnectorDef() @@ -52,11 +52,9 @@ public interface CDOSessionDef extends Def ConnectorDef getConnectorDef(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}' - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Connector Def</em>' reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Connector Def</em>' reference. * @see #isSetConnectorDef() * @see #unsetConnectorDef() * @see #getConnectorDef() @@ -65,9 +63,8 @@ public interface CDOSessionDef extends Def void setConnectorDef(ConnectorDef value); /** - * Unsets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}' - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Unsets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #isSetConnectorDef() * @see #getConnectorDef() * @see #setConnectorDef(ConnectorDef) @@ -76,9 +73,8 @@ public interface CDOSessionDef extends Def void unsetConnectorDef(); /** - * Returns whether the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef - * <em>Connector Def</em>}' reference is set. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns whether the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}' reference is set. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return whether the value of the '<em>Connector Def</em>' reference is set. * @see #unsetConnectorDef() * @see #getConnectorDef() @@ -88,13 +84,13 @@ public interface CDOSessionDef extends Def boolean isSetConnectorDef(); /** - * Returns the value of the '<em><b>Repository Name</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Repository Name</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>CDORepositoryInfo Name</em>' attribute isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Repository Name</em>' attribute. * @see #setRepositoryName(String) * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOSessionDef_RepositoryName() @@ -104,24 +100,22 @@ public interface CDOSessionDef extends Def String getRepositoryName(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName <em>Repository Name</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Repository Name</em>' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName <em>Repository Name</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Repository Name</em>' attribute. * @see #getRepositoryName() * @generated */ void setRepositoryName(String value); /** - * Returns the value of the '<em><b>Cdo Package Registry Def</b></em>' reference. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Cdo Package Registry Def</b></em>' reference. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Cdo Package Registry Def</em>' reference isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Cdo Package Registry Def</em>' reference. * @see #setCdoPackageRegistryDef(CDOPackageRegistryDef) * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOSessionDef_CdoPackageRegistryDef() @@ -131,25 +125,23 @@ public interface CDOSessionDef extends Def CDOPackageRegistryDef getCdoPackageRegistryDef(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef - * <em>Cdo Package Registry Def</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Cdo Package Registry Def</em>' reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef <em>Cdo Package Registry Def</em>}' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Cdo Package Registry Def</em>' reference. * @see #getCdoPackageRegistryDef() * @generated */ void setCdoPackageRegistryDef(CDOPackageRegistryDef value); /** - * Returns the value of the '<em><b>Legacy Support Enabled</b></em>' attribute. The default value is - * <code>"false"</code>. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Legacy Support Enabled</b></em>' attribute. + * The default value is <code>"false"</code>. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Legacy Support Enabled</em>' attribute isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Legacy Support Enabled</em>' attribute. * @see #setLegacySupportEnabled(boolean) * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOSessionDef_LegacySupportEnabled() @@ -159,68 +151,12 @@ public interface CDOSessionDef extends Def boolean isLegacySupportEnabled(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled - * <em>Legacy Support Enabled</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Legacy Support Enabled</em>' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled <em>Legacy Support Enabled</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Legacy Support Enabled</em>' attribute. * @see #isLegacySupportEnabled() * @generated */ void setLegacySupportEnabled(boolean value); - /** - * Returns the value of the '<em><b>Fail Over Strategy Def</b></em>' reference. <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Fail Over Strategy Def</em>' reference isn't clear, there really should be more of a - * description here... - * </p> - * <!-- end-user-doc --> - * - * @return the value of the '<em>Fail Over Strategy Def</em>' reference. - * @see #isSetFailOverStrategyDef() - * @see #unsetFailOverStrategyDef() - * @see #setFailOverStrategyDef(FailOverStrategyDef) - * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOSessionDef_FailOverStrategyDef() - * @model unsettable="true" - * @generated - */ - FailOverStrategyDef getFailOverStrategyDef(); - - /** - * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getFailOverStrategyDef - * <em>Fail Over Strategy Def</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Fail Over Strategy Def</em>' reference. - * @see #isSetFailOverStrategyDef() - * @see #unsetFailOverStrategyDef() - * @see #getFailOverStrategyDef() - * @generated - */ - void setFailOverStrategyDef(FailOverStrategyDef value); - - /** - * Unsets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getFailOverStrategyDef - * <em>Fail Over Strategy Def</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see #isSetFailOverStrategyDef() - * @see #getFailOverStrategyDef() - * @see #setFailOverStrategyDef(FailOverStrategyDef) - * @generated - */ - void unsetFailOverStrategyDef(); - - /** - * Returns whether the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getFailOverStrategyDef - * <em>Fail Over Strategy Def</em>}' reference is set. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return whether the value of the '<em>Fail Over Strategy Def</em>' reference is set. - * @see #unsetFailOverStrategyDef() - * @see #getFailOverStrategyDef() - * @see #setFailOverStrategyDef(FailOverStrategyDef) - * @generated - */ - boolean isSetFailOverStrategyDef(); - } // CDOSessionDef diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.java index e848b36029..8e5ceac4bd 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.java @@ -15,13 +15,14 @@ import org.eclipse.net4j.util.defs.Def; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO View Def</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef <em>Cdo Session Def</em>}</li> + * <li>{@link org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef <em>Cdo Session Def</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOViewDef() * @model * @generated @@ -29,13 +30,13 @@ import org.eclipse.net4j.util.defs.Def; public interface CDOViewDef extends Def { /** - * Returns the value of the '<em><b>Cdo Session Def</b></em>' reference. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Cdo Session Def</b></em>' reference. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Cdo Session Def</em>' reference isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Cdo Session Def</em>' reference. * @see #setCdoSessionDef(CDOSessionDef) * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOViewDef_CdoSessionDef() @@ -45,11 +46,9 @@ public interface CDOViewDef extends Def CDOSessionDef getCdoSessionDef(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef <em>Cdo Session Def</em>}' - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Cdo Session Def</em>' reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef <em>Cdo Session Def</em>}' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Cdo Session Def</em>' reference. * @see #getCdoSessionDef() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java index 8359a52ce0..0497931292 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java @@ -14,13 +14,14 @@ package org.eclipse.emf.cdo.defs; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Dynamic CDO Package Def</b></em>'. <!-- * end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI <em>Resource URI</em>}</li> + * <li>{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI <em>Resource URI</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getEDynamicPackageDef() * @model * @generated @@ -28,13 +29,13 @@ package org.eclipse.emf.cdo.defs; public interface EDynamicPackageDef extends EPackageDef { /** - * Returns the value of the '<em><b>Resource URI</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Resource URI</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Resource URI</em>' attribute isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Resource URI</em>' attribute. * @see #setResourceURI(String) * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getEDynamicPackageDef_ResourceURI() @@ -44,11 +45,9 @@ public interface EDynamicPackageDef extends EPackageDef String getResourceURI(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI <em>Resource URI</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Resource URI</em>' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI <em>Resource URI</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Resource URI</em>' attribute. * @see #getResourceURI() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java index 6a7164c543..5340670e03 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java @@ -14,7 +14,8 @@ package org.eclipse.emf.cdo.defs; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Native CDO Package Def</b></em>'. <!-- * end-user-doc --> - * + * + * * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getEGlobalPackageDef() * @model * @generated diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java index 087e3c4420..5b0f1beeab 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java @@ -15,13 +15,14 @@ import org.eclipse.net4j.util.defs.Def; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Package Def</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.defs.EPackageDef#getNsURI <em>Ns URI</em>}</li> + * <li>{@link org.eclipse.emf.cdo.defs.EPackageDef#getNsURI <em>Ns URI</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getEPackageDef() * @model abstract="true" * @generated @@ -29,12 +30,12 @@ import org.eclipse.net4j.util.defs.Def; public interface EPackageDef extends Def { /** - * Returns the value of the '<em><b>Ns URI</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Ns URI</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Ns URI</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Ns URI</em>' attribute. * @see #setNsURI(String) * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getEPackageDef_NsURI() diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/FailOverStrategyDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/FailOverStrategyDef.java deleted file mode 100644 index 6e00610ce1..0000000000 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/FailOverStrategyDef.java +++ /dev/null @@ -1,60 +0,0 @@ -/** - * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Andre Dietisheim - initial API and implementation - * Eike Stepper - maintenance - */ -package org.eclipse.emf.cdo.defs; - -import org.eclipse.net4j.defs.ConnectorDef; -import org.eclipse.net4j.util.defs.Def; - -/** - * <!-- begin-user-doc --> A representation of the model object '<em><b>Fail Over Strategy Def</b></em>'. <!-- - * end-user-doc --> - * <p> - * The following features are supported: - * <ul> - * <li>{@link org.eclipse.emf.cdo.defs.FailOverStrategyDef#getConnectorDef <em>Connector Def</em>}</li> - * </ul> - * </p> - * - * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getFailOverStrategyDef() - * @model abstract="true" - * @generated - */ -public interface FailOverStrategyDef extends Def -{ - /** - * Returns the value of the '<em><b>Connector Def</b></em>' reference. <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Connector Def</em>' reference isn't clear, there really should be more of a description - * here... - * </p> - * <!-- end-user-doc --> - * - * @return the value of the '<em>Connector Def</em>' reference. - * @see #setConnectorDef(ConnectorDef) - * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getFailOverStrategyDef_ConnectorDef() - * @model required="true" - * @generated - */ - ConnectorDef getConnectorDef(); - - /** - * Sets the value of the '{@link org.eclipse.emf.cdo.defs.FailOverStrategyDef#getConnectorDef <em>Connector Def</em>}' - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Connector Def</em>' reference. - * @see #getConnectorDef() - * @generated - */ - void setConnectorDef(ConnectorDef value); - -} // FailOverStrategyDef diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.java index 5a2230ea35..19d5d150ac 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.java @@ -23,7 +23,6 @@ import java.util.List; /** * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Resource Mode</b></em>', and * utility methods for working with them. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getResourceMode() * @model * @generated @@ -80,13 +79,13 @@ public enum ResourceMode implements Enumerator }; /** - * The '<em><b>GET</b></em>' literal value. <!-- begin-user-doc --> + * The '<em><b>GET</b></em>' literal value. + * <!-- begin-user-doc --> * <p> * If the meaning of '<em><b>GET</b></em>' literal object isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @see #GET * @model * @generated @@ -95,13 +94,13 @@ public enum ResourceMode implements Enumerator public static final int GET_VALUE = 0; /** - * The '<em><b>CREATE</b></em>' literal value. <!-- begin-user-doc --> + * The '<em><b>CREATE</b></em>' literal value. + * <!-- begin-user-doc --> * <p> * If the meaning of '<em><b>CREATE</b></em>' literal object isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @see #CREATE * @model * @generated @@ -110,13 +109,13 @@ public enum ResourceMode implements Enumerator public static final int CREATE_VALUE = 0; /** - * The '<em><b>GET OR CREATE</b></em>' literal value. <!-- begin-user-doc --> + * The '<em><b>GET OR CREATE</b></em>' literal value. + * <!-- begin-user-doc --> * <p> * If the meaning of '<em><b>GET OR CREATE</b></em>' literal object isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @see #GET_OR_CREATE * @model * @generated @@ -125,24 +124,24 @@ public enum ResourceMode implements Enumerator public static final int GET_OR_CREATE_VALUE = 0; /** - * An array of all the '<em><b>Resource Mode</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * An array of all the '<em><b>Resource Mode</b></em>' enumerators. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ private static final ResourceMode[] VALUES_ARRAY = new ResourceMode[] { GET, CREATE, GET_OR_CREATE, }; /** - * A public read-only list of all the '<em><b>Resource Mode</b></em>' enumerators. <!-- begin-user-doc --> <!-- + * A public read-only list of all the '<em><b>Resource Mode</b></em>' enumerators. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public static final List<ResourceMode> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY)); /** - * Returns the '<em><b>Resource Mode</b></em>' literal with the specified literal value. <!-- begin-user-doc --> <!-- + * Returns the '<em><b>Resource Mode</b></em>' literal with the specified literal value. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public static ResourceMode get(String literal) @@ -159,9 +158,9 @@ public enum ResourceMode implements Enumerator } /** - * Returns the '<em><b>Resource Mode</b></em>' literal with the specified name. <!-- begin-user-doc --> <!-- + * Returns the '<em><b>Resource Mode</b></em>' literal with the specified name. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public static ResourceMode getByName(String name) @@ -178,9 +177,9 @@ public enum ResourceMode implements Enumerator } /** - * Returns the '<em><b>Resource Mode</b></em>' literal with the specified integer value. <!-- begin-user-doc --> <!-- + * Returns the '<em><b>Resource Mode</b></em>' literal with the specified integer value. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public static ResourceMode get(int value) @@ -195,28 +194,25 @@ public enum ResourceMode implements Enumerator /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private final int value; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private final String name; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private final String literal; /** - * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Only this class can construct instances. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ private ResourceMode(int value, String name, String literal) @@ -228,7 +224,6 @@ public enum ResourceMode implements Enumerator /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public int getValue() @@ -238,7 +233,6 @@ public enum ResourceMode implements Enumerator /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getName() @@ -248,7 +242,6 @@ public enum ResourceMode implements Enumerator /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getLiteral() @@ -257,9 +250,9 @@ public enum ResourceMode implements Enumerator } /** - * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!-- + * Returns the literal value of the enumerator, which is its string representation. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/RetryFailOverStrategyDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/RetryFailOverStrategyDef.java deleted file mode 100644 index f368f5e5b4..0000000000 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/RetryFailOverStrategyDef.java +++ /dev/null @@ -1,84 +0,0 @@ -/** - * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Andre Dietisheim - initial API and implementation - * Eike Stepper - maintenance - */ -package org.eclipse.emf.cdo.defs; - -/** - * <!-- begin-user-doc --> A representation of the model object '<em><b>Retry Fail Over Strategy</b></em>'. <!-- - * end-user-doc --> - * <p> - * The following features are supported: - * <ul> - * <li>{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef#getRetries <em>Retries</em>}</li> - * </ul> - * </p> - * - * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getRetryFailOverStrategyDef() - * @model - * @generated - */ -public interface RetryFailOverStrategyDef extends FailOverStrategyDef -{ - /** - * Returns the value of the '<em><b>Retries</b></em>' attribute. <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Retries</em>' attribute isn't clear, there really should be more of a description - * here... - * </p> - * <!-- end-user-doc --> - * - * @return the value of the '<em>Retries</em>' attribute. - * @see #isSetRetries() - * @see #unsetRetries() - * @see #setRetries(int) - * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getRetryFailOverStrategyDef_Retries() - * @model unsettable="true" - * @generated - */ - int getRetries(); - - /** - * Sets the value of the '{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef#getRetries <em>Retries</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Retries</em>' attribute. - * @see #isSetRetries() - * @see #unsetRetries() - * @see #getRetries() - * @generated - */ - void setRetries(int value); - - /** - * Unsets the value of the '{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef#getRetries <em>Retries</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @see #isSetRetries() - * @see #getRetries() - * @see #setRetries(int) - * @generated - */ - void unsetRetries(); - - /** - * Returns whether the value of the '{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef#getRetries - * <em>Retries</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return whether the value of the '<em>Retries</em>' attribute is set. - * @see #unsetRetries() - * @see #getRetries() - * @see #setRetries(int) - * @generated - */ - boolean isSetRetries(); - -} // RetryFailOverStrategy diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java index b6a76638d4..bffdefc632 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java @@ -28,18 +28,18 @@ import java.util.Date; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl#getTimeStamp <em>Time Stamp</em>}</li> + * <li>{@link org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl#getTimeStamp <em>Time Stamp</em>}</li> * </ul> * </p> - * + * * @generated */ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef { /** - * The default value of the '{@link #getTimeStamp() <em>Time Stamp</em>}' attribute. <!-- begin-user-doc --> <!-- + * The default value of the '{@link #getTimeStamp() <em>Time Stamp</em>}' attribute. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getTimeStamp() * @generated * @ordered @@ -47,9 +47,9 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef protected static final Date TIME_STAMP_EDEFAULT = null; /** - * The cached value of the '{@link #getTimeStamp() <em>Time Stamp</em>}' attribute. <!-- begin-user-doc --> <!-- + * The cached value of the '{@link #getTimeStamp() <em>Time Stamp</em>}' attribute. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getTimeStamp() * @generated * @ordered @@ -58,7 +58,6 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected CDOAuditDefImpl() @@ -68,7 +67,6 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -79,7 +77,6 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Date getTimeStamp() @@ -89,7 +86,6 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setTimeStamp(Date newTimeStamp) @@ -97,15 +93,12 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef Date oldTimeStamp = timeStamp; timeStamp = newTimeStamp; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP, oldTimeStamp, timeStamp)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -121,7 +114,6 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -138,7 +130,6 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -155,7 +146,6 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -171,16 +161,13 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (timeStamp: "); diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java index 77c4279d04..ecec3ff857 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java @@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EClass; * end-user-doc --> * <p> * </p> - * + * * @generated */ public class CDOClientProtocolFactoryDefImpl extends ClientProtocolFactoryDefImpl implements @@ -32,7 +32,6 @@ public class CDOClientProtocolFactoryDefImpl extends ClientProtocolFactoryDefImp { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected CDOClientProtocolFactoryDefImpl() @@ -42,7 +41,6 @@ public class CDOClientProtocolFactoryDefImpl extends ClientProtocolFactoryDefImp /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java index 15ddbb388f..6438a54c8c 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java @@ -26,7 +26,6 @@ import org.eclipse.emf.cdo.defs.CDOViewDef; import org.eclipse.emf.cdo.defs.EDynamicPackageDef; import org.eclipse.emf.cdo.defs.EGlobalPackageDef; import org.eclipse.emf.cdo.defs.ResourceMode; -import org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; @@ -37,14 +36,13 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; /** * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc --> - * * @generated */ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory { /** - * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates the default factory implementation. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public static CDODefsFactory init() @@ -66,8 +64,8 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory } /** - * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public CDODefsFactoryImpl() @@ -77,7 +75,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -93,8 +90,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory return createCDOAuditDef(); case CDODefsPackage.CDO_SESSION_DEF: return createCDOSessionDef(); - case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF: - return createRetryFailOverStrategyDef(); case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF: return createCDOPackageRegistryDef(); case CDODefsPackage.CDO_EAGER_PACKAGE_REGISTRY_DEF: @@ -116,7 +111,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -133,7 +127,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -150,7 +143,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDOViewDef createCDOViewDef() @@ -161,7 +153,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDOTransactionDef createCDOTransactionDef() @@ -172,7 +163,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDOAuditDef createCDOAuditDef() @@ -183,7 +173,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDOSessionDef createCDOSessionDef() @@ -194,18 +183,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public RetryFailOverStrategyDef createRetryFailOverStrategyDef() - { - RetryFailOverStrategyDefImpl retryFailOverStrategyDef = new RetryFailOverStrategyDefImpl(); - return retryFailOverStrategyDef; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDOPackageRegistryDef createCDOPackageRegistryDef() @@ -216,7 +193,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDOEagerPackageRegistryDef createCDOEagerPackageRegistryDef() @@ -227,7 +203,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDOLazyPackageRegistryDef createCDOLazyPackageRegistryDef() @@ -238,7 +213,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EDynamicPackageDef createEDynamicPackageDef() @@ -249,7 +223,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EGlobalPackageDef createEGlobalPackageDef() @@ -260,7 +233,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDOClientProtocolFactoryDef createCDOClientProtocolFactoryDef() @@ -271,7 +243,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDOResourceDef createCDOResourceDef() @@ -282,23 +253,19 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public ResourceMode createResourceModeFromString(EDataType eDataType, String initialValue) { ResourceMode result = ResourceMode.get(initialValue); if (result == null) - { throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); - } return result; } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String convertResourceModeToString(EDataType eDataType, Object instanceValue) @@ -308,7 +275,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDODefsPackage getCDODefsPackage() @@ -318,7 +284,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @deprecated * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java index e9b64f5a1e..8a4462bfa7 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java @@ -25,9 +25,7 @@ import org.eclipse.emf.cdo.defs.CDOViewDef; import org.eclipse.emf.cdo.defs.EDynamicPackageDef; import org.eclipse.emf.cdo.defs.EGlobalPackageDef; import org.eclipse.emf.cdo.defs.EPackageDef; -import org.eclipse.emf.cdo.defs.FailOverStrategyDef; import org.eclipse.emf.cdo.defs.ResourceMode; -import org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef; import org.eclipse.net4j.defs.Net4jDefsPackage; import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage; @@ -41,112 +39,84 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; /** * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc --> - * * @generated */ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass cdoViewDefEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass cdoTransactionDefEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass cdoAuditDefEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass cdoSessionDefEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - private EClass failOverStrategyDefEClass = null; - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - private EClass retryFailOverStrategyDefEClass = null; - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass cdoPackageRegistryDefEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass cdoEagerPackageRegistryDefEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass cdoLazyPackageRegistryDefEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass ePackageDefEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass eDynamicPackageDefEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass eGlobalPackageDefEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass cdoClientProtocolFactoryDefEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass cdoResourceDefEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EEnum resourceModeEEnum = null; @@ -171,18 +141,17 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private static boolean isInited = false; /** * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. - * <p> - * This method is used to initialize {@link CDODefsPackage#eINSTANCE} when that field is accessed. Clients should not - * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> - * <!-- end-user-doc --> * + * <p>This method is used to initialize {@link CDODefsPackage#eINSTANCE} when that field is accessed. + * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() @@ -191,14 +160,11 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage public static CDODefsPackage init() { if (isInited) - { return (CDODefsPackage)EPackage.Registry.INSTANCE.getEPackage(CDODefsPackage.eNS_URI); - } // Obtain or create and register package CDODefsPackageImpl theCDODefsPackage = (CDODefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CDODefsPackageImpl ? EPackage.Registry.INSTANCE - .get(eNS_URI) - : new CDODefsPackageImpl()); + .get(eNS_URI) : new CDODefsPackageImpl()); isInited = true; @@ -221,7 +187,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getCDOViewDef() @@ -231,7 +196,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCDOViewDef_CdoSessionDef() @@ -241,7 +205,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getCDOTransactionDef() @@ -251,7 +214,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getCDOAuditDef() @@ -261,7 +223,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOAuditDef_TimeStamp() @@ -271,7 +232,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getCDOSessionDef() @@ -281,7 +241,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCDOSessionDef_ConnectorDef() @@ -291,7 +250,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOSessionDef_RepositoryName() @@ -301,7 +259,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCDOSessionDef_CdoPackageRegistryDef() @@ -311,7 +268,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOSessionDef_LegacySupportEnabled() @@ -321,57 +277,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public EReference getCDOSessionDef_FailOverStrategyDef() - { - return (EReference)cdoSessionDefEClass.getEStructuralFeatures().get(4); - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public EClass getFailOverStrategyDef() - { - return failOverStrategyDefEClass; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public EReference getFailOverStrategyDef_ConnectorDef() - { - return (EReference)failOverStrategyDefEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public EClass getRetryFailOverStrategyDef() - { - return retryFailOverStrategyDefEClass; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public EAttribute getRetryFailOverStrategyDef_Retries() - { - return (EAttribute)retryFailOverStrategyDefEClass.getEStructuralFeatures().get(0); - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getCDOPackageRegistryDef() @@ -381,7 +286,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCDOPackageRegistryDef_Packages() @@ -391,7 +295,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getCDOEagerPackageRegistryDef() @@ -401,7 +304,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getCDOLazyPackageRegistryDef() @@ -411,7 +313,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getEPackageDef() @@ -421,7 +322,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getEPackageDef_NsURI() @@ -431,7 +331,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getEDynamicPackageDef() @@ -441,7 +340,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getEDynamicPackageDef_ResourceURI() @@ -451,7 +349,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getEGlobalPackageDef() @@ -461,7 +358,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getCDOClientProtocolFactoryDef() @@ -471,7 +367,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getCDOResourceDef() @@ -481,7 +376,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCDOResourceDef_CdoTransaction() @@ -491,7 +385,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOResourceDef_ResourceMode() @@ -501,7 +394,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOResourceDef_Path() @@ -511,7 +403,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EEnum getResourceMode() @@ -521,7 +412,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDODefsFactory getCDODefsFactory() @@ -531,23 +421,20 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private boolean isCreated = false; /** - * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its - * first. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void createPackageContents() { if (isCreated) - { return; - } isCreated = true; // Create classes and their features @@ -564,13 +451,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage createEAttribute(cdoSessionDefEClass, CDO_SESSION_DEF__REPOSITORY_NAME); createEReference(cdoSessionDefEClass, CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF); createEAttribute(cdoSessionDefEClass, CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED); - createEReference(cdoSessionDefEClass, CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF); - - failOverStrategyDefEClass = createEClass(FAIL_OVER_STRATEGY_DEF); - createEReference(failOverStrategyDefEClass, FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF); - - retryFailOverStrategyDefEClass = createEClass(RETRY_FAIL_OVER_STRATEGY_DEF); - createEAttribute(retryFailOverStrategyDefEClass, RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES); cdoPackageRegistryDefEClass = createEClass(CDO_PACKAGE_REGISTRY_DEF); createEReference(cdoPackageRegistryDefEClass, CDO_PACKAGE_REGISTRY_DEF__PACKAGES); @@ -600,23 +480,20 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private boolean isInitialized = false; /** - * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any - * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void initializePackageContents() { if (isInitialized) - { return; - } isInitialized = true; // Initialize package @@ -636,24 +513,22 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage // Add supertypes to classes cdoViewDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); - cdoTransactionDefEClass.getESuperTypes().add(getCDOViewDef()); - cdoAuditDefEClass.getESuperTypes().add(getCDOViewDef()); + cdoTransactionDefEClass.getESuperTypes().add(this.getCDOViewDef()); + cdoAuditDefEClass.getESuperTypes().add(this.getCDOViewDef()); cdoSessionDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); - failOverStrategyDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); - retryFailOverStrategyDefEClass.getESuperTypes().add(getFailOverStrategyDef()); cdoPackageRegistryDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); - cdoEagerPackageRegistryDefEClass.getESuperTypes().add(getCDOPackageRegistryDef()); - cdoLazyPackageRegistryDefEClass.getESuperTypes().add(getCDOPackageRegistryDef()); + cdoEagerPackageRegistryDefEClass.getESuperTypes().add(this.getCDOPackageRegistryDef()); + cdoLazyPackageRegistryDefEClass.getESuperTypes().add(this.getCDOPackageRegistryDef()); ePackageDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); - eDynamicPackageDefEClass.getESuperTypes().add(getEPackageDef()); - eGlobalPackageDefEClass.getESuperTypes().add(getEPackageDef()); + eDynamicPackageDefEClass.getESuperTypes().add(this.getEPackageDef()); + eGlobalPackageDefEClass.getESuperTypes().add(this.getEPackageDef()); cdoClientProtocolFactoryDefEClass.getESuperTypes().add(theNet4jDefsPackage.getClientProtocolFactoryDef()); cdoResourceDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); // Initialize classes and features; add operations and parameters initEClass(cdoViewDefEClass, CDOViewDef.class, "CDOViewDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getCDOViewDef_CdoSessionDef(), getCDOSessionDef(), null, "cdoSessionDef", null, 1, 1, + initEReference(getCDOViewDef_CdoSessionDef(), this.getCDOSessionDef(), null, "cdoSessionDef", null, 1, 1, CDOViewDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -673,31 +548,16 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage initEAttribute(getCDOSessionDef_RepositoryName(), ecorePackage.getEString(), "repositoryName", null, 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEReference(getCDOSessionDef_CdoPackageRegistryDef(), getCDOPackageRegistryDef(), null, "cdoPackageRegistryDef", - null, 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCDOSessionDef_CdoPackageRegistryDef(), this.getCDOPackageRegistryDef(), null, + "cdoPackageRegistryDef", null, 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, + !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getCDOSessionDef_LegacySupportEnabled(), ecorePackage.getEBoolean(), "legacySupportEnabled", "false", 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getCDOSessionDef_FailOverStrategyDef(), getFailOverStrategyDef(), null, "failOverStrategyDef", null, - 0, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, - IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(failOverStrategyDefEClass, FailOverStrategyDef.class, "FailOverStrategyDef", IS_ABSTRACT, !IS_INTERFACE, - IS_GENERATED_INSTANCE_CLASS); - initEReference(getFailOverStrategyDef_ConnectorDef(), theNet4jDefsPackage.getConnectorDef(), null, "connectorDef", - null, 1, 1, FailOverStrategyDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, - IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(retryFailOverStrategyDefEClass, RetryFailOverStrategyDef.class, "RetryFailOverStrategyDef", - !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getRetryFailOverStrategyDef_Retries(), ecorePackage.getEInt(), "retries", null, 0, 1, - RetryFailOverStrategyDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); initEClass(cdoPackageRegistryDefEClass, CDOPackageRegistryDef.class, "CDOPackageRegistryDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getCDOPackageRegistryDef_Packages(), getEPackageDef(), null, "packages", null, 0, -1, + initEReference(getCDOPackageRegistryDef_Packages(), this.getEPackageDef(), null, "packages", null, 0, -1, CDOPackageRegistryDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -726,10 +586,10 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage initEClass(cdoResourceDefEClass, CDOResourceDef.class, "CDOResourceDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getCDOResourceDef_CdoTransaction(), getCDOTransactionDef(), null, "cdoTransaction", null, 1, 1, + initEReference(getCDOResourceDef_CdoTransaction(), this.getCDOTransactionDef(), null, "cdoTransaction", null, 1, 1, CDOResourceDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getCDOResourceDef_ResourceMode(), getResourceMode(), "resourceMode", "null", 1, 1, + initEAttribute(getCDOResourceDef_ResourceMode(), this.getResourceMode(), "resourceMode", "null", 1, 1, CDOResourceDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getCDOResourceDef_Path(), ecorePackage.getEString(), "path", null, 1, 1, CDOResourceDef.class, diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java index 425003693c..39e4204d80 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java @@ -21,14 +21,13 @@ import org.eclipse.emf.ecore.EClass; * end-user-doc --> * <p> * </p> - * + * * @generated */ public class CDOEagerPackageRegistryDefImpl extends CDOPackageRegistryDefImpl implements CDOEagerPackageRegistryDef { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected CDOEagerPackageRegistryDefImpl() @@ -38,7 +37,6 @@ public class CDOEagerPackageRegistryDefImpl extends CDOPackageRegistryDefImpl im /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java index b1fc7397b5..af822554bb 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java @@ -21,14 +21,13 @@ import org.eclipse.emf.ecore.EClass; * end-user-doc --> * <p> * </p> - * + * * @generated */ public class CDOLazyPackageRegistryDefImpl extends CDOPackageRegistryDefImpl implements CDOLazyPackageRegistryDef { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected CDOLazyPackageRegistryDefImpl() @@ -38,7 +37,6 @@ public class CDOLazyPackageRegistryDefImpl extends CDOPackageRegistryDefImpl imp /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java index f5b49f6077..f4ae35614c 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java @@ -34,10 +34,10 @@ import java.util.Collection; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl#getPackages <em>Packages</em>}</li> + * <li>{@link org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl#getPackages <em>Packages</em>}</li> * </ul> * </p> - * + * * @generated */ public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegistryDef diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java index de6337f4e1..a716b67876 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java @@ -44,9 +44,9 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef { /** - * The cached value of the '{@link #getCdoTransaction() <em>Cdo Transaction</em>}' reference. <!-- begin-user-doc --> + * The cached value of the '{@link #getCdoTransaction() <em>Cdo Transaction</em>}' reference. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @see #getCdoTransaction() * @generated * @ordered @@ -64,9 +64,9 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef protected static final ResourceMode RESOURCE_MODE_EDEFAULT = null; /** - * The cached value of the '{@link #getResourceMode() <em>Resource Mode</em>}' attribute. <!-- begin-user-doc --> <!-- + * The cached value of the '{@link #getResourceMode() <em>Resource Mode</em>}' attribute. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getResourceMode() * @generated * @ordered @@ -84,8 +84,8 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef protected static final String PATH_EDEFAULT = null; /** - * The cached value of the '{@link #getPath() <em>Path</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached value of the '{@link #getPath() <em>Path</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getPath() * @generated * @ordered @@ -94,7 +94,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected CDOResourceDefImpl() @@ -104,7 +103,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -115,7 +113,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDOTransactionDef getCdoTransaction() @@ -127,10 +124,8 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef if (cdoTransaction != oldCdoTransaction) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION, oldCdoTransaction, cdoTransaction)); - } } } return cdoTransaction; @@ -138,7 +133,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDOTransactionDef basicGetCdoTransaction() @@ -148,7 +142,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setCdoTransaction(CDOTransactionDef newCdoTransaction) @@ -156,15 +149,12 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef CDOTransactionDef oldCdoTransaction = cdoTransaction; cdoTransaction = newCdoTransaction; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION, oldCdoTransaction, cdoTransaction)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public ResourceMode getResourceMode() @@ -174,7 +164,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setResourceMode(ResourceMode newResourceMode) @@ -182,15 +171,12 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef ResourceMode oldResourceMode = resourceMode; resourceMode = newResourceMode == null ? RESOURCE_MODE_EDEFAULT : newResourceMode; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE, oldResourceMode, resourceMode)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getPath() @@ -200,7 +186,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setPath(String newPath) @@ -208,14 +193,11 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef String oldPath = path; path = newPath; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__PATH, oldPath, path)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -225,9 +207,7 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef { case CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION: if (resolve) - { return getCdoTransaction(); - } return basicGetCdoTransaction(); case CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE: return getResourceMode(); @@ -239,7 +219,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -262,7 +241,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -285,7 +263,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -305,16 +282,13 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (resourceMode: "); diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java index d5ced63bc1..c521576c21 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java @@ -15,14 +15,12 @@ import org.eclipse.emf.cdo.common.model.CDOPackageRegistry; import org.eclipse.emf.cdo.defs.CDODefsPackage; import org.eclipse.emf.cdo.defs.CDOPackageRegistryDef; import org.eclipse.emf.cdo.defs.CDOSessionDef; -import org.eclipse.emf.cdo.defs.FailOverStrategyDef; import org.eclipse.emf.cdo.net4j.CDONet4jUtil; import org.eclipse.emf.cdo.net4j.CDOSessionConfiguration; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.defs.ConnectorDef; -import org.eclipse.net4j.signal.failover.IFailOverStrategy; import org.eclipse.net4j.util.CheckUtil; import org.eclipse.net4j.util.defs.impl.DefImpl; @@ -120,24 +118,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef protected boolean legacySupportEnabled = LEGACY_SUPPORT_ENABLED_EDEFAULT; /** - * The cached value of the '{@link #getFailOverStrategyDef() <em>Fail Over Strategy Def</em>}' reference. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * - * @see #getFailOverStrategyDef() - * @generated - * @ordered - */ - protected FailOverStrategyDef failOverStrategyDef; - - /** - * This is true if the Fail Over Strategy Def reference has been set. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - * @ordered - */ - protected boolean failOverStrategyDefESet; - - /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -203,14 +183,7 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef */ public void setConnectorDef(ConnectorDef newConnectorDef) { - if (isSetFailOverStrategyDef()) - { - throw new IllegalStateException("connector and failover strategy are mutually exclusive!"); - } - else - { - setConnectorDefGen(newConnectorDef); - } + setConnectorDefGen(newConnectorDef); } /** @@ -365,106 +338,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef * * @generated */ - public FailOverStrategyDef getFailOverStrategyDef() - { - if (failOverStrategyDef != null && failOverStrategyDef.eIsProxy()) - { - InternalEObject oldFailOverStrategyDef = (InternalEObject)failOverStrategyDef; - failOverStrategyDef = (FailOverStrategyDef)eResolveProxy(oldFailOverStrategyDef); - if (failOverStrategyDef != oldFailOverStrategyDef) - { - if (eNotificationRequired()) - { - eNotify(new ENotificationImpl(this, Notification.RESOLVE, - CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF, oldFailOverStrategyDef, failOverStrategyDef)); - } - } - } - return failOverStrategyDef; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public FailOverStrategyDef basicGetFailOverStrategyDef() - { - return failOverStrategyDef; - } - - /** - * <!-- begin-user-doc --> Sets the {@link FailOverStrategyDef} for this {@link CDOSessionDef}. If a ConnectorDef was - * already set, an <b>IllegalStateException<b> is thrown. ConnectorDef and FailOverStrategyDef are mutually exclusive. - * - * @throws IllegalStateException - * if a {@link FailOverStrategyDef} was set before - * @see CDOSessionConfigurationImpl#openSession() <!-- end-user-doc --> - * @generated NOT - */ - public void setFailOverStrategyDef(FailOverStrategyDef newFailOverStrategyDef) - { - if (isSetConnectorDef()) - { - throw new IllegalStateException("connector and failover strategy are mutually exclusive!"); - } - else - { - setFailOverStrategyDefGen(newFailOverStrategyDef); - } - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public void setFailOverStrategyDefGen(FailOverStrategyDef newFailOverStrategyDef) - { - FailOverStrategyDef oldFailOverStrategyDef = failOverStrategyDef; - failOverStrategyDef = newFailOverStrategyDef; - boolean oldFailOverStrategyDefESet = failOverStrategyDefESet; - failOverStrategyDefESet = true; - if (eNotificationRequired()) - { - eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF, - oldFailOverStrategyDef, failOverStrategyDef, !oldFailOverStrategyDefESet)); - } - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public void unsetFailOverStrategyDef() - { - FailOverStrategyDef oldFailOverStrategyDef = failOverStrategyDef; - boolean oldFailOverStrategyDefESet = failOverStrategyDefESet; - failOverStrategyDef = null; - failOverStrategyDefESet = false; - if (eNotificationRequired()) - { - eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF, - oldFailOverStrategyDef, null, oldFailOverStrategyDefESet)); - } - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public boolean isSetFailOverStrategyDef() - { - return failOverStrategyDefESet; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { @@ -486,12 +359,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef return basicGetCdoPackageRegistryDef(); case CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED: return isLegacySupportEnabled(); - case CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF: - if (resolve) - { - return getFailOverStrategyDef(); - } - return basicGetFailOverStrategyDef(); } return super.eGet(featureID, resolve, coreType); } @@ -518,9 +385,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef case CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED: setLegacySupportEnabled((Boolean)newValue); return; - case CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF: - setFailOverStrategyDef((FailOverStrategyDef)newValue); - return; } super.eSet(featureID, newValue); } @@ -547,9 +411,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef case CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED: setLegacySupportEnabled(LEGACY_SUPPORT_ENABLED_EDEFAULT); return; - case CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF: - unsetFailOverStrategyDef(); - return; } super.eUnset(featureID); } @@ -573,8 +434,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef return cdoPackageRegistryDef != null; case CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED: return legacySupportEnabled != LEGACY_SUPPORT_ENABLED_EDEFAULT; - case CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF: - return isSetFailOverStrategyDef(); } return super.eIsSet(featureID); } @@ -610,10 +469,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef { configuration.setConnector((IConnector)getConnectorDef().getInstance()); } - if (isSetFailOverStrategyDef()) - { - configuration.setFailOverStrategy((IFailOverStrategy)getFailOverStrategyDef().getInstance()); - } configuration.setPackageRegistry((CDOPackageRegistry)getCdoPackageRegistryDef().getInstance()); configuration.setRepositoryName(getRepositoryName()); return configuration.openSession(); @@ -628,8 +483,7 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef * failoverStrategy and connector are mutually exclusive * @see CDOSessionConfiguration#openSession */ - CheckUtil.checkState(isSetConnectorDef() ^ isSetFailOverStrategyDef(), - "fail over strategy and connector are mutually exclusive!"); + CheckUtil.checkState(isSetConnectorDef(), "connector not set"); // CheckUtil.checkState(getCdoPackageRegistryDef() != null, // "package registry definition is not set!"); CheckUtil.checkState(eIsSet(CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF), diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.java index 4ccb2b43b3..ab62a552e0 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.java @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EClass; * end-user-doc --> * <p> * </p> - * + * * @generated */ public class CDOTransactionDefImpl extends CDOViewDefImpl implements CDOTransactionDef @@ -30,7 +30,6 @@ public class CDOTransactionDefImpl extends CDOViewDefImpl implements CDOTransact /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected CDOTransactionDefImpl() @@ -40,7 +39,6 @@ public class CDOTransactionDefImpl extends CDOViewDefImpl implements CDOTransact /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java index 78a91fd428..7e99077398 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java @@ -30,19 +30,19 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl#getCdoSessionDef <em>Cdo Session Def</em>}</li> + * <li>{@link org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl#getCdoSessionDef <em>Cdo Session Def</em>}</li> * </ul> * </p> - * + * * @generated */ public class CDOViewDefImpl extends DefImpl implements CDOViewDef { /** - * The cached value of the '{@link #getCdoSessionDef() <em>Cdo Session Def</em>}' reference. <!-- begin-user-doc --> + * The cached value of the '{@link #getCdoSessionDef() <em>Cdo Session Def</em>}' reference. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @see #getCdoSessionDef() * @generated * @ordered @@ -51,7 +51,6 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected CDOViewDefImpl() @@ -61,7 +60,6 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -72,7 +70,6 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDOSessionDef getCdoSessionDef() @@ -84,10 +81,8 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef if (cdoSessionDef != oldCdoSessionDef) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF, oldCdoSessionDef, cdoSessionDef)); - } } } return cdoSessionDef; @@ -95,7 +90,6 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDOSessionDef basicGetCdoSessionDef() @@ -105,7 +99,6 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setCdoSessionDef(CDOSessionDef newCdoSessionDef) @@ -113,15 +106,12 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef CDOSessionDef oldCdoSessionDef = cdoSessionDef; cdoSessionDef = newCdoSessionDef; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF, oldCdoSessionDef, cdoSessionDef)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -131,9 +121,7 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef { case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF: if (resolve) - { return getCdoSessionDef(); - } return basicGetCdoSessionDef(); } return super.eGet(featureID, resolve, coreType); @@ -141,7 +129,6 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -158,7 +145,6 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -175,7 +161,6 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java index 05d6fc4aa7..0350813459 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java @@ -26,18 +26,18 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl#getResourceURI <em>Resource URI</em>}</li> + * <li>{@link org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl#getResourceURI <em>Resource URI</em>}</li> * </ul> * </p> - * + * * @generated */ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicPackageDef { /** - * The default value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute. <!-- begin-user-doc --> <!-- + * The default value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getResourceURI() * @generated * @ordered @@ -45,9 +45,9 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP protected static final String RESOURCE_URI_EDEFAULT = null; /** - * The cached value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute. <!-- begin-user-doc --> <!-- + * The cached value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getResourceURI() * @generated * @ordered @@ -56,7 +56,6 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EDynamicPackageDefImpl() @@ -66,7 +65,6 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -77,7 +75,6 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getResourceURI() @@ -87,7 +84,6 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setResourceURI(String newResourceURI) @@ -95,15 +91,12 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP String oldResourceURI = resourceURI; resourceURI = newResourceURI; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI, oldResourceURI, resourceURI)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -119,7 +112,6 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -136,7 +128,6 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -153,7 +144,6 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -169,16 +159,13 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (resourceURI: "); diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.java index d78839fb73..01e34b6717 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.java @@ -22,14 +22,13 @@ import org.eclipse.emf.ecore.EPackage; * end-user-doc --> * <p> * </p> - * + * * @generated */ public class EGlobalPackageDefImpl extends EPackageDefImpl implements EGlobalPackageDef { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EGlobalPackageDefImpl() @@ -39,7 +38,6 @@ public class EGlobalPackageDefImpl extends EPackageDefImpl implements EGlobalPac /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java index 792547d31d..47d9d2ff92 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java @@ -59,7 +59,6 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EPackageDefImpl() @@ -69,7 +68,6 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -80,7 +78,6 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getNsURI() @@ -90,7 +87,6 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setNsURI(String newNsURI) @@ -98,14 +94,11 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef String oldNsURI = nsURI; nsURI = newNsURI; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.EPACKAGE_DEF__NS_URI, oldNsURI, nsURI)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -121,7 +114,6 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -138,7 +130,6 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -155,7 +146,6 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -171,16 +161,13 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (nsURI: "); diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/FailOverStrategyDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/FailOverStrategyDefImpl.java deleted file mode 100644 index 99ecc7e5df..0000000000 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/FailOverStrategyDefImpl.java +++ /dev/null @@ -1,189 +0,0 @@ -/** - * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Andre Dietisheim - initial API and implementation - * Eike Stepper - maintenance - */ -package org.eclipse.emf.cdo.defs.impl; - -import org.eclipse.emf.cdo.defs.CDODefsPackage; -import org.eclipse.emf.cdo.defs.FailOverStrategyDef; - -import org.eclipse.net4j.defs.ConnectorDef; -import org.eclipse.net4j.util.defs.impl.DefImpl; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.ENotificationImpl; - -/** - * <!-- begin-user-doc --> An implementation of the model object '<em><b>Fail Over Strategy Def</b></em>'. <!-- - * end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.emf.cdo.defs.impl.FailOverStrategyDefImpl#getConnectorDef <em>Connector Def</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public abstract class FailOverStrategyDefImpl extends DefImpl implements FailOverStrategyDef -{ - /** - * The cached value of the '{@link #getConnectorDef() <em>Connector Def</em>}' reference. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @see #getConnectorDef() - * @generated - * @ordered - */ - protected ConnectorDef connectorDef; - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - protected FailOverStrategyDefImpl() - { - super(); - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - @Override - protected EClass eStaticClass() - { - return CDODefsPackage.Literals.FAIL_OVER_STRATEGY_DEF; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public ConnectorDef getConnectorDef() - { - if (connectorDef != null && connectorDef.eIsProxy()) - { - InternalEObject oldConnectorDef = (InternalEObject)connectorDef; - connectorDef = (ConnectorDef)eResolveProxy(oldConnectorDef); - if (connectorDef != oldConnectorDef) - { - if (eNotificationRequired()) - { - eNotify(new ENotificationImpl(this, Notification.RESOLVE, - CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF, oldConnectorDef, connectorDef)); - } - } - } - return connectorDef; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public ConnectorDef basicGetConnectorDef() - { - return connectorDef; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public void setConnectorDef(ConnectorDef newConnectorDef) - { - ConnectorDef oldConnectorDef = connectorDef; - connectorDef = newConnectorDef; - if (eNotificationRequired()) - { - eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF, - oldConnectorDef, connectorDef)); - } - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { - case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF: - if (resolve) - { - return getConnectorDef(); - } - return basicGetConnectorDef(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { - case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF: - setConnectorDef((ConnectorDef)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - @Override - public void eUnset(int featureID) - { - switch (featureID) - { - case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF: - setConnectorDef((ConnectorDef)null); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { - case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF: - return connectorDef != null; - } - return super.eIsSet(featureID); - } - -} // FailOverStrategyDefImpl diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/RetryFailOverStrategyDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/RetryFailOverStrategyDefImpl.java deleted file mode 100644 index 1b1ff8f5a4..0000000000 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/RetryFailOverStrategyDefImpl.java +++ /dev/null @@ -1,255 +0,0 @@ -/** - * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Andre Dietisheim - initial API and implementation - * Eike Stepper - maintenance - */ -package org.eclipse.emf.cdo.defs.impl; - -import org.eclipse.emf.cdo.defs.CDODefsPackage; -import org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef; - -import org.eclipse.net4j.connector.IConnector; -import org.eclipse.net4j.signal.failover.IFailOverStrategy; -import org.eclipse.net4j.signal.failover.RetryFailOverStrategy; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.ENotificationImpl; - -/** - * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Retry Fail Over Strategy</b></em>'. <!-- - * end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.emf.cdo.defs.impl.RetryFailOverStrategyDefImpl#getRetries <em>Retries</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implements RetryFailOverStrategyDef -{ - /** - * The default value of the '{@link #getRetries() <em>Retries</em>}' attribute. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @see #getRetries() - * @generated - * @ordered - */ - protected static final int RETRIES_EDEFAULT = 0; - - /** - * The cached value of the '{@link #getRetries() <em>Retries</em>}' attribute. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * - * @see #getRetries() - * @generated - * @ordered - */ - protected int retries = RETRIES_EDEFAULT; - - /** - * This is true if the Retries attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - * @ordered - */ - protected boolean retriesESet; - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - protected RetryFailOverStrategyDefImpl() - { - super(); - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - @Override - protected EClass eStaticClass() - { - return CDODefsPackage.Literals.RETRY_FAIL_OVER_STRATEGY_DEF; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public int getRetries() - { - return retries; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public void setRetries(int newRetries) - { - int oldRetries = retries; - retries = newRetries; - boolean oldRetriesESet = retriesESet; - retriesESet = true; - if (eNotificationRequired()) - { - eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES, - oldRetries, retries, !oldRetriesESet)); - } - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public void unsetRetries() - { - int oldRetries = retries; - boolean oldRetriesESet = retriesESet; - retries = RETRIES_EDEFAULT; - retriesESet = false; - if (eNotificationRequired()) - { - eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES, - oldRetries, RETRIES_EDEFAULT, oldRetriesESet)); - } - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public boolean isSetRetries() - { - return retriesESet; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { - case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES: - return getRetries(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { - case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES: - setRetries((Integer)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - @Override - public void eUnset(int featureID) - { - switch (featureID) - { - case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES: - unsetRetries(); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { - case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES: - return isSetRetries(); - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - @Override - public String toString() - { - if (eIsProxy()) - { - return super.toString(); - } - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (retries: "); - if (retriesESet) - { - result.append(retries); - } - else - { - result.append("<unset>"); - } - result.append(')'); - return result.toString(); - } - - /** - * @ADDED - */ - @Override - protected IFailOverStrategy createInstance() - { - IFailOverStrategy failOverStrategy = null; - IConnector connector = (IConnector)getConnectorDef().getInstance(); - if (isSetRetries()) - { - failOverStrategy = new RetryFailOverStrategy(connector, getRetries()); - } - else - { - failOverStrategy = new RetryFailOverStrategy(connector); - } - return failOverStrategy; - } -} // RetryFailOverStrategyImpl diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java index ba1b0a67b6..824797eae8 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java @@ -25,8 +25,6 @@ import org.eclipse.emf.cdo.defs.CDOViewDef; import org.eclipse.emf.cdo.defs.EDynamicPackageDef; import org.eclipse.emf.cdo.defs.EGlobalPackageDef; import org.eclipse.emf.cdo.defs.EPackageDef; -import org.eclipse.emf.cdo.defs.FailOverStrategyDef; -import org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef; import org.eclipse.net4j.defs.ClientProtocolFactoryDef; import org.eclipse.net4j.defs.ProtocolProviderDef; @@ -40,22 +38,21 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> * method for each class of the model. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.defs.CDODefsPackage * @generated */ public class CDODefsAdapterFactory extends AdapterFactoryImpl { /** - * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached model package. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected static CDODefsPackage modelPackage; /** - * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the adapter factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public CDODefsAdapterFactory() @@ -67,10 +64,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl } /** - * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation + * Returns whether this factory is applicable for the type of the object. + * <!-- begin-user-doc --> This implementation * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!-- * end-user-doc --> - * * @return whether this factory is applicable for the type of the object. * @generated */ @@ -89,8 +86,8 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl } /** - * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The switch that delegates to the <code>createXXX</code> methods. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected CDODefsSwitch<Adapter> modelSwitch = new CDODefsSwitch<Adapter>() @@ -120,18 +117,6 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl } @Override - public Adapter caseFailOverStrategyDef(FailOverStrategyDef object) - { - return createFailOverStrategyDefAdapter(); - } - - @Override - public Adapter caseRetryFailOverStrategyDef(RetryFailOverStrategyDef object) - { - return createRetryFailOverStrategyDefAdapter(); - } - - @Override public Adapter caseCDOPackageRegistryDef(CDOPackageRegistryDef object) { return createCDOPackageRegistryDefAdapter(); @@ -205,10 +190,9 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl }; /** - * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param target - * the object to adapt. + * Creates an adapter for the <code>target</code>. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param target the object to adapt. * @return the adapter for the <code>target</code>. * @generated */ @@ -222,7 +206,6 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOViewDef <em>CDO View Def</em>}'. * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.defs.CDOViewDef * @generated @@ -233,11 +216,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOTransactionDef - * <em>CDO Transaction Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOTransactionDef <em>CDO Transaction Def</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we can * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- * end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.defs.CDOTransactionDef * @generated @@ -251,7 +233,6 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOAuditDef <em>CDO Audit Def</em>}'. * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.defs.CDOAuditDef * @generated @@ -262,10 +243,9 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOSessionDef - * <em>CDO Session Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOSessionDef <em>CDO Session Def</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we can easily * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.defs.CDOSessionDef * @generated @@ -276,41 +256,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.FailOverStrategyDef - * <em>Fail Over Strategy Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can - * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- - * end-user-doc --> - * - * @return the new adapter. - * @see org.eclipse.emf.cdo.defs.FailOverStrategyDef - * @generated - */ - public Adapter createFailOverStrategyDefAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef - * <em>Retry Fail Over Strategy Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that - * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- - * end-user-doc --> - * - * @return the new adapter. - * @see org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef - * @generated - */ - public Adapter createRetryFailOverStrategyDefAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef - * <em>CDO Package Registry Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef <em>CDO Package Registry Def</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- * end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.defs.CDOPackageRegistryDef * @generated @@ -321,11 +270,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOEagerPackageRegistryDef - * <em>CDO Eager Package Registry Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOEagerPackageRegistryDef <em>CDO Eager Package Registry Def</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- * end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.defs.CDOEagerPackageRegistryDef * @generated @@ -336,11 +284,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOLazyPackageRegistryDef - * <em>CDO Lazy Package Registry Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOLazyPackageRegistryDef <em>CDO Lazy Package Registry Def</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- * end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.defs.CDOLazyPackageRegistryDef * @generated @@ -354,7 +301,6 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.EPackageDef <em>EPackage Def</em>}'. * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.defs.EPackageDef * @generated @@ -365,11 +311,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef - * <em>EDynamic Package Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef <em>EDynamic Package Def</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we can * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- * end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.defs.EDynamicPackageDef * @generated @@ -380,11 +325,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.EGlobalPackageDef - * <em>EGlobal Package Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.EGlobalPackageDef <em>EGlobal Package Def</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we can * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- * end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.defs.EGlobalPackageDef * @generated @@ -395,11 +339,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOClientProtocolFactoryDef - * <em>CDO Client Protocol Factory Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOClientProtocolFactoryDef <em>CDO Client Protocol Factory Def</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so * that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.defs.CDOClientProtocolFactoryDef * @generated @@ -410,10 +353,9 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOResourceDef - * <em>CDO Resource Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOResourceDef <em>CDO Resource Def</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we can easily * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.defs.CDOResourceDef * @generated @@ -438,11 +380,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ProtocolProviderDef - * <em>Protocol Provider Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can + * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ProtocolProviderDef <em>Protocol Provider Def</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we can * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- * end-user-doc --> - * * @return the new adapter. * @see org.eclipse.net4j.defs.ProtocolProviderDef * @generated @@ -453,11 +394,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ClientProtocolFactoryDef - * <em>Client Protocol Factory Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we + * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ClientProtocolFactoryDef <em>Client Protocol Factory Def</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- * end-user-doc --> - * * @return the new adapter. * @see org.eclipse.net4j.defs.ClientProtocolFactoryDef * @generated @@ -468,9 +408,9 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!-- + * Creates a new adapter for the default case. + * <!-- begin-user-doc --> This default implementation returns null. <!-- * end-user-doc --> - * * @return the new adapter. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java index b4927872f7..8c562708fc 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java @@ -24,8 +24,6 @@ import org.eclipse.emf.cdo.defs.CDOViewDef; import org.eclipse.emf.cdo.defs.EDynamicPackageDef; import org.eclipse.emf.cdo.defs.EGlobalPackageDef; import org.eclipse.emf.cdo.defs.EPackageDef; -import org.eclipse.emf.cdo.defs.FailOverStrategyDef; -import org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef; import org.eclipse.net4j.defs.ClientProtocolFactoryDef; import org.eclipse.net4j.defs.ProtocolProviderDef; @@ -41,22 +39,21 @@ import java.util.List; * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model, * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is * returned, which is the result of the switch. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.defs.CDODefsPackage * @generated */ public class CDODefsSwitch<T> { /** - * The cached model package <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached model package + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected static CDODefsPackage modelPackage; /** - * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the switch. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public CDODefsSwitch() @@ -70,7 +67,6 @@ public class CDODefsSwitch<T> /** * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ @@ -82,7 +78,6 @@ public class CDODefsSwitch<T> /** * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ @@ -102,7 +97,6 @@ public class CDODefsSwitch<T> /** * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ @@ -115,13 +109,9 @@ public class CDODefsSwitch<T> CDOViewDef cdoViewDef = (CDOViewDef)theEObject; T result = caseCDOViewDef(cdoViewDef); if (result == null) - { result = caseDef(cdoViewDef); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case CDODefsPackage.CDO_TRANSACTION_DEF: @@ -129,17 +119,11 @@ public class CDODefsSwitch<T> CDOTransactionDef cdoTransactionDef = (CDOTransactionDef)theEObject; T result = caseCDOTransactionDef(cdoTransactionDef); if (result == null) - { result = caseCDOViewDef(cdoTransactionDef); - } if (result == null) - { result = caseDef(cdoTransactionDef); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case CDODefsPackage.CDO_AUDIT_DEF: @@ -147,17 +131,11 @@ public class CDODefsSwitch<T> CDOAuditDef cdoAuditDef = (CDOAuditDef)theEObject; T result = caseCDOAuditDef(cdoAuditDef); if (result == null) - { result = caseCDOViewDef(cdoAuditDef); - } if (result == null) - { result = caseDef(cdoAuditDef); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case CDODefsPackage.CDO_SESSION_DEF: @@ -165,45 +143,9 @@ public class CDODefsSwitch<T> CDOSessionDef cdoSessionDef = (CDOSessionDef)theEObject; T result = caseCDOSessionDef(cdoSessionDef); if (result == null) - { result = caseDef(cdoSessionDef); - } if (result == null) - { result = defaultCase(theEObject); - } - return result; - } - case CDODefsPackage.FAIL_OVER_STRATEGY_DEF: - { - FailOverStrategyDef failOverStrategyDef = (FailOverStrategyDef)theEObject; - T result = caseFailOverStrategyDef(failOverStrategyDef); - if (result == null) - { - result = caseDef(failOverStrategyDef); - } - if (result == null) - { - result = defaultCase(theEObject); - } - return result; - } - case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF: - { - RetryFailOverStrategyDef retryFailOverStrategyDef = (RetryFailOverStrategyDef)theEObject; - T result = caseRetryFailOverStrategyDef(retryFailOverStrategyDef); - if (result == null) - { - result = caseFailOverStrategyDef(retryFailOverStrategyDef); - } - if (result == null) - { - result = caseDef(retryFailOverStrategyDef); - } - if (result == null) - { - result = defaultCase(theEObject); - } return result; } case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF: @@ -211,13 +153,9 @@ public class CDODefsSwitch<T> CDOPackageRegistryDef cdoPackageRegistryDef = (CDOPackageRegistryDef)theEObject; T result = caseCDOPackageRegistryDef(cdoPackageRegistryDef); if (result == null) - { result = caseDef(cdoPackageRegistryDef); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case CDODefsPackage.CDO_EAGER_PACKAGE_REGISTRY_DEF: @@ -225,17 +163,11 @@ public class CDODefsSwitch<T> CDOEagerPackageRegistryDef cdoEagerPackageRegistryDef = (CDOEagerPackageRegistryDef)theEObject; T result = caseCDOEagerPackageRegistryDef(cdoEagerPackageRegistryDef); if (result == null) - { result = caseCDOPackageRegistryDef(cdoEagerPackageRegistryDef); - } if (result == null) - { result = caseDef(cdoEagerPackageRegistryDef); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case CDODefsPackage.CDO_LAZY_PACKAGE_REGISTRY_DEF: @@ -243,17 +175,11 @@ public class CDODefsSwitch<T> CDOLazyPackageRegistryDef cdoLazyPackageRegistryDef = (CDOLazyPackageRegistryDef)theEObject; T result = caseCDOLazyPackageRegistryDef(cdoLazyPackageRegistryDef); if (result == null) - { result = caseCDOPackageRegistryDef(cdoLazyPackageRegistryDef); - } if (result == null) - { result = caseDef(cdoLazyPackageRegistryDef); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case CDODefsPackage.EPACKAGE_DEF: @@ -261,13 +187,9 @@ public class CDODefsSwitch<T> EPackageDef ePackageDef = (EPackageDef)theEObject; T result = caseEPackageDef(ePackageDef); if (result == null) - { result = caseDef(ePackageDef); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case CDODefsPackage.EDYNAMIC_PACKAGE_DEF: @@ -275,17 +197,11 @@ public class CDODefsSwitch<T> EDynamicPackageDef eDynamicPackageDef = (EDynamicPackageDef)theEObject; T result = caseEDynamicPackageDef(eDynamicPackageDef); if (result == null) - { result = caseEPackageDef(eDynamicPackageDef); - } if (result == null) - { result = caseDef(eDynamicPackageDef); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case CDODefsPackage.EGLOBAL_PACKAGE_DEF: @@ -293,17 +209,11 @@ public class CDODefsSwitch<T> EGlobalPackageDef eGlobalPackageDef = (EGlobalPackageDef)theEObject; T result = caseEGlobalPackageDef(eGlobalPackageDef); if (result == null) - { result = caseEPackageDef(eGlobalPackageDef); - } if (result == null) - { result = caseDef(eGlobalPackageDef); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case CDODefsPackage.CDO_CLIENT_PROTOCOL_FACTORY_DEF: @@ -311,21 +221,13 @@ public class CDODefsSwitch<T> CDOClientProtocolFactoryDef cdoClientProtocolFactoryDef = (CDOClientProtocolFactoryDef)theEObject; T result = caseCDOClientProtocolFactoryDef(cdoClientProtocolFactoryDef); if (result == null) - { result = caseClientProtocolFactoryDef(cdoClientProtocolFactoryDef); - } if (result == null) - { result = caseProtocolProviderDef(cdoClientProtocolFactoryDef); - } if (result == null) - { result = caseDef(cdoClientProtocolFactoryDef); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case CDODefsPackage.CDO_RESOURCE_DEF: @@ -333,13 +235,9 @@ public class CDODefsSwitch<T> CDOResourceDef cdoResourceDef = (CDOResourceDef)theEObject; T result = caseCDOResourceDef(cdoResourceDef); if (result == null) - { result = caseDef(cdoResourceDef); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } default: @@ -348,11 +246,10 @@ public class CDODefsSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>CDO View Def</em>'. <!-- begin-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>CDO View Def</em>'. + * <!-- begin-user-doc --> * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>CDO View Def</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -363,11 +260,10 @@ public class CDODefsSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>CDO Transaction Def</em>'. <!-- begin-user-doc + * Returns the result of interpreting the object as an instance of '<em>CDO Transaction Def</em>'. + * <!-- begin-user-doc * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>CDO Transaction Def</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -378,11 +274,10 @@ public class CDODefsSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>CDO Audit Def</em>'. <!-- begin-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>CDO Audit Def</em>'. + * <!-- begin-user-doc --> * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>CDO Audit Def</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -393,11 +288,10 @@ public class CDODefsSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>CDO Session Def</em>'. <!-- begin-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>CDO Session Def</em>'. + * <!-- begin-user-doc --> * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>CDO Session Def</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -408,38 +302,6 @@ public class CDODefsSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Fail Over Strategy Def</em>'. <!-- - * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!-- - * end-user-doc --> - * - * @param object - * the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Fail Over Strategy Def</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseFailOverStrategyDef(FailOverStrategyDef object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Retry Fail Over Strategy Def</em>'. <!-- - * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!-- - * end-user-doc --> - * - * @param object - * the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Retry Fail Over Strategy Def</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseRetryFailOverStrategyDef(RetryFailOverStrategyDef object) - { - return null; - } - - /** * Returns the result of interpreting the object as an instance of '<em>CDO Package Registry Def</em>'. <!-- * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!-- * end-user-doc --> @@ -488,11 +350,10 @@ public class CDODefsSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>EPackage Def</em>'. <!-- begin-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>EPackage Def</em>'. + * <!-- begin-user-doc --> * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>EPackage Def</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -519,11 +380,10 @@ public class CDODefsSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>EGlobal Package Def</em>'. <!-- begin-user-doc + * Returns the result of interpreting the object as an instance of '<em>EGlobal Package Def</em>'. + * <!-- begin-user-doc * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>EGlobal Package Def</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -550,11 +410,10 @@ public class CDODefsSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>CDO Resource Def</em>'. <!-- begin-user-doc + * Returns the result of interpreting the object as an instance of '<em>CDO Resource Def</em>'. + * <!-- begin-user-doc * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>CDO Resource Def</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -565,11 +424,10 @@ public class CDODefsSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Def</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Def</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>Def</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -612,12 +470,11 @@ public class CDODefsSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch, but this is the last case * anyway. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>EObject</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsUtil.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsUtil.java index c9c92d04ee..223c207e15 100644 --- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsUtil.java +++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsUtil.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance @@ -17,7 +17,6 @@ import org.eclipse.emf.cdo.defs.CDOPackageRegistryDef; import org.eclipse.emf.cdo.defs.CDOResourceDef; import org.eclipse.emf.cdo.defs.CDOSessionDef; import org.eclipse.emf.cdo.defs.CDOTransactionDef; -import org.eclipse.emf.cdo.defs.FailOverStrategyDef; import org.eclipse.net4j.defs.TCPConnectorDef; @@ -38,11 +37,12 @@ public class CDODefsUtil return cdoSessionDef; } - public static CDOSessionDef createSessionDef(String repositoryName, CDOPackageRegistryDef ePackageRegistryDef, - FailOverStrategyDef failOverStrategyDef) + /** + * @since 4.0 + */ + public static CDOSessionDef createSessionDef(String repositoryName, CDOPackageRegistryDef ePackageRegistryDef) { CDOSessionDef cdoSessionDef = CDODefsFactory.eINSTANCE.createCDOSessionDef(); - cdoSessionDef.setFailOverStrategyDef(failOverStrategyDef); cdoSessionDef.setRepositoryName(repositoryName); cdoSessionDef.setCdoPackageRegistryDef(ePackageRegistryDef); return cdoSessionDef; diff --git a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF index a3970bf7b3..3fcfc51f01 100644 --- a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF @@ -11,8 +11,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.cdo.server.db;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.server.net4j;bundle-version="[4.0.0,5.0.0)", org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)", - org.eclipse.net4j.jvm;bundle-version="[3.0.0,4.0.0)", - org.eclipse.net4j.tcp;bundle-version="[3.0.0,4.0.0)" + org.eclipse.net4j.jvm;bundle-version="[4.0.0,5.0.0)", + org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)" Import-Package: org.h2.jdbcx;version="[1.1.0,1.2.0)" Export-Package: org.eclipse.emf.cdo.examples.internal.server;version="4.0.0";x-internal:=true, org.eclipse.emf.cdo.examples.server;version="4.0.0" diff --git a/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF index dac5cf6e65..120a5c5d5e 100644 --- a/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resoluti org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.server.db;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.server.net4j;bundle-version="[4.0.0,5.0.0)", - org.eclipse.net4j.tcp;bundle-version="[3.0.0,4.0.0)", + org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)", org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)" Import-Package: org.h2.jdbcx;version="[1.1.0,1.2.0)" Export-Package: org.eclipse.emf.cdo.examples;version="4.0.0", diff --git a/plugins/org.eclipse.emf.cdo.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.net4j/META-INF/MANIFEST.MF index 80fc4ae107..96699516df 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.net4j/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-Activator: org.eclipse.emf.cdo.internal.net4j.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, - org.eclipse.net4j;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Export-Package: org.eclipse.emf.cdo.internal.net4j;version="4.0.0"; x-friends:="org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.defs, diff --git a/plugins/org.eclipse.emf.cdo.net4j/plugin.xml b/plugins/org.eclipse.emf.cdo.net4j/plugin.xml index 723054726b..9dd89c43b0 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/plugin.xml +++ b/plugins/org.eclipse.emf.cdo.net4j/plugin.xml @@ -25,11 +25,4 @@ type="cdo"/> </extension> - <extension - point="org.eclipse.net4j.util.elementProcessors"> - <elementProcessor - class="org.eclipse.emf.cdo.internal.net4j.FailOverStrategyInjector"> - </elementProcessor> - </extension> - </plugin> diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java index a8f6b877a2..56c711f811 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java @@ -34,8 +34,6 @@ import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager; import org.eclipse.emf.internal.cdo.session.CDOSessionConfigurationImpl; import org.eclipse.net4j.connector.IConnector; -import org.eclipse.net4j.signal.failover.IFailOverStrategy; -import org.eclipse.net4j.signal.failover.NOOPFailOverStrategy; import org.eclipse.net4j.util.CheckUtil; import org.eclipse.net4j.util.io.IStreamWrapper; @@ -56,8 +54,6 @@ public class CDONet4jSessionConfigurationImpl extends CDOSessionConfigurationImp private IConnector connector; - private IFailOverStrategy failOverStrategy; - private IStreamWrapper streamWrapper; private InternalCDOBranchManager branchManager; @@ -104,17 +100,6 @@ public class CDONet4jSessionConfigurationImpl extends CDOSessionConfigurationImp this.connector = connector; } - public IFailOverStrategy getFailOverStrategy() - { - return failOverStrategy; - } - - public void setFailOverStrategy(IFailOverStrategy failOverStrategy) - { - checkNotOpen(); - this.failOverStrategy = failOverStrategy; - } - public IStreamWrapper getStreamWrapper() { return streamWrapper; @@ -194,8 +179,7 @@ public class CDONet4jSessionConfigurationImpl extends CDOSessionConfigurationImp { if (isActivateOnOpen()) { - CheckUtil.checkState(connector != null ^ failOverStrategy != null, - "Specify exactly one of connector or failOverStrategy"); //$NON-NLS-1$ + CheckUtil.checkState(connector, "connector"); //$NON-NLS-1$ } return new CDONet4jSessionImpl(this); @@ -271,14 +255,7 @@ public class CDONet4jSessionConfigurationImpl extends CDOSessionConfigurationImp } session.setSessionProtocol(protocol); - if (connector != null) - { - protocol.setFailOverStrategy(new NOOPFailOverStrategy(connector)); - } - else if (failOverStrategy != null) - { - protocol.setFailOverStrategy(failOverStrategy); - } + protocol.open(connector); OpenSessionResult result = protocol.openSession(repositoryName, isPassiveUpdateEnabled(), getPassiveUpdateMode()); session.setSessionID(result.getSessionID()); diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailOverStrategyInjector.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailOverStrategyInjector.java deleted file mode 100644 index 8240350861..0000000000 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailOverStrategyInjector.java +++ /dev/null @@ -1,89 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - **************************************************************************/ -package org.eclipse.emf.cdo.internal.net4j; - -import org.eclipse.emf.cdo.internal.net4j.messages.Messages; - -import org.eclipse.net4j.connector.IConnector; -import org.eclipse.net4j.signal.failover.IFailOverStrategy; -import org.eclipse.net4j.signal.failover.NOOPFailOverStrategy; -import org.eclipse.net4j.util.StringUtil; -import org.eclipse.net4j.util.container.IElementProcessor; -import org.eclipse.net4j.util.container.IManagedContainer; - -import org.eclipse.spi.net4j.ConnectorFactory; - -import java.text.MessageFormat; - -/** - * @author Eike Stepper - */ -public class FailOverStrategyInjector implements IElementProcessor -{ - private static final String INVALID_URI_MESSAGE = Messages.getString("InvalidURIException.0"); //$NON-NLS-1$ - - private static final String SCHEME_SEPARATOR = "://"; //$NON-NLS-1$ - - public FailOverStrategyInjector() - { - } - - public Object process(IManagedContainer container, String productGroup, String factoryType, String description, - Object element) - { - if (element instanceof CDONet4jSessionImpl) - { - CDONet4jSessionImpl session = (CDONet4jSessionImpl)element; - IFailOverStrategy failOverStrategy = getFailOverStrategy(container, description); - session.getConfiguration().setFailOverStrategy(failOverStrategy); - } - - return element; - } - - protected IFailOverStrategy getFailOverStrategy(IManagedContainer container, String description) - { - IConnector connector = getConnector(container, description); - return new NOOPFailOverStrategy(connector); - } - - protected IConnector getConnector(IManagedContainer container, String description) - { - int pos = description.indexOf(SCHEME_SEPARATOR); - if (pos == -1) - { - throw new IllegalArgumentException(MessageFormat.format(INVALID_URI_MESSAGE, description, Messages - .getString("FailOverStrategyInjector.0"))); //$NON-NLS-1$ - } - - String factoryType = description.substring(0, pos); - if (StringUtil.isEmpty(factoryType)) - { - throw new IllegalArgumentException(MessageFormat.format(INVALID_URI_MESSAGE, description, Messages - .getString("FailOverStrategyInjector.1"))); //$NON-NLS-1$ - } - - String connectorDescription = description.substring(pos + SCHEME_SEPARATOR.length()); - if (StringUtil.isEmpty(connectorDescription)) - { - throw new IllegalArgumentException(MessageFormat.format(INVALID_URI_MESSAGE, description, Messages - .getString("FailOverStrategyInjector.2"))); //$NON-NLS-1$ - } - - pos = connectorDescription.indexOf('?'); - if (pos != -1) - { - connectorDescription = connectorDescription.substring(0, pos); - } - - return (IConnector)container.getElement(ConnectorFactory.PRODUCT_GROUP, factoryType, connectorDescription); - } -} diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionConfigurationImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionConfigurationImpl.java index 6a3e7af1e5..c319e649ee 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionConfigurationImpl.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionConfigurationImpl.java @@ -20,7 +20,6 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.signal.SignalProtocol; -import org.eclipse.net4j.signal.failover.IFailOverStrategy; import org.eclipse.net4j.signal.heartbeat.HeartBeatProtocol; import org.eclipse.net4j.util.ObjectUtil; import org.eclipse.net4j.util.WrappedException; @@ -84,12 +83,6 @@ public class FailoverCDOSessionConfigurationImpl extends CDONet4jSessionConfigur } @Override - public void setFailOverStrategy(IFailOverStrategy failOverStrategy) - { - throw new UnsupportedOperationException(); - } - - @Override public void setExceptionHandler(ExceptionHandler exceptionHandler) { throw new UnsupportedOperationException(); diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java index 4b88edbb95..7fb4dd4387 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java @@ -92,7 +92,6 @@ public class CDOClientProtocol extends SignalProtocol<CDOSession> implements CDO public OpenSessionResult openSession(String repositoryName, boolean passiveUpdateEnabled, PassiveUpdateMode passiveUpdateMode) { - open(); return send(new OpenSessionRequest(this, repositoryName, passiveUpdateEnabled, passiveUpdateMode)); } diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java index 9d8eaf36d3..d2ec0f9f09 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java @@ -15,7 +15,6 @@ import org.eclipse.emf.cdo.common.model.CDOPackageRegistry; import org.eclipse.emf.cdo.common.revision.CDORevisionManager; import org.eclipse.net4j.connector.IConnector; -import org.eclipse.net4j.signal.failover.IFailOverStrategy; import org.eclipse.net4j.util.io.IStreamWrapper; /** @@ -33,13 +32,6 @@ public interface CDOSessionConfiguration extends org.eclipse.emf.cdo.session.CDO public void setConnector(IConnector connector); - public IFailOverStrategy getFailOverStrategy(); - - /** - * The fail-over strategy must be set <b>before</b> the session is opened and can not be changed thereafter. - */ - public void setFailOverStrategy(IFailOverStrategy failOverStrategy); - public IStreamWrapper getStreamWrapper(); public void setStreamWrapper(IStreamWrapper streamWrapper); diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.net4j/META-INF/MANIFEST.MF index 77d28f4ccd..97b482a578 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.server.net4j/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional, org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, - org.eclipse.net4j;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Export-Package: org.eclipse.emf.cdo.server.internal.net4j.bundle;version="4.0.0";x-internal:=true, org.eclipse.emf.cdo.server.internal.net4j.protocol;version="4.0.0";x-friends:="org.eclipse.emf.cdo.tests", org.eclipse.emf.cdo.server.net4j;version="4.0.0" diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF index e68807cb70..d75621587d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-Activator: org.eclipse.emf.cdo.tests.hibernate.Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.net4j.tcp;bundle-version="[3.0.0,4.0.0)", + org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.server.hibernate;bundle-version="[4.0.0,5.0.0)", diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF index f9e4cc4e79..bae030bcad 100644 --- a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.emf.cdo.tests.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . -Require-Bundle: org.eclipse.net4j.tests;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, +Require-Bundle: org.eclipse.net4j.tests;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j.db.derby;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOSessionDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOSessionDefImplTest.java index c9350e6f61..ecaa9f7a72 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOSessionDefImplTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOSessionDefImplTest.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: * Andre Dietisheim - initial API and implementation * Eike Stepper - maintenance @@ -44,39 +44,10 @@ public class CDOSessionDefImplTest extends AbstractCDOTest } } - public void testConnectorAndFailOverStrategyAreMutuallyExclusive() - { - try - { - CDOSessionDef cdoSessionDef = CDODefsFactory.eINSTANCE.createCDOSessionDef(); - cdoSessionDef.setConnectorDef(Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST)); - cdoSessionDef.setFailOverStrategyDef(CDODefsFactory.eINSTANCE.createRetryFailOverStrategyDef()); - fail("IllegalStateException expected!"); - } - catch (IllegalStateException e) - { - // Success - } - - try - { - CDOSessionDef cdoSessionDef = CDODefsFactory.eINSTANCE.createCDOSessionDef(); - cdoSessionDef.setFailOverStrategyDef(CDODefsFactory.eINSTANCE.createRetryFailOverStrategyDef()); - cdoSessionDef.setConnectorDef(Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST)); - fail("IllegalStateException expected!"); - } - catch (IllegalStateException e) - { - // Success - } - } - public void testConnectorAndFailMayBeUnset() { { CDOSessionDef cdoSessionDef = CDODefsFactory.eINSTANCE.createCDOSessionDef(); - cdoSessionDef.setFailOverStrategyDef(CDODefsFactory.eINSTANCE.createRetryFailOverStrategyDef()); - cdoSessionDef.unsetFailOverStrategyDef(); cdoSessionDef.setConnectorDef(Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST)); } @@ -84,7 +55,6 @@ public class CDOSessionDefImplTest extends AbstractCDOTest CDOSessionDef cdoSessionDef = CDODefsFactory.eINSTANCE.createCDOSessionDef(); cdoSessionDef.setConnectorDef(Net4jDefsUtil.createTCPConnectorDef(SessionConfig.TCP.CONNECTOR_HOST)); cdoSessionDef.unsetConnectorDef(); - cdoSessionDef.setFailOverStrategyDef(CDODefsFactory.eINSTANCE.createRetryFailOverStrategyDef()); } } diff --git a/plugins/org.eclipse.emf.cdo.ui.branch/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.branch/META-INF/MANIFEST.MF index cdcfe75c3c..8be8b8a66c 100644 --- a/plugins/org.eclipse.emf.cdo.ui.branch/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.ui.branch/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.emf.cdo.ui.branch;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.emf.cdo.ui.internal.branch.bundle.OM$Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", @@ -11,14 +11,14 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.examples.company;bundle-version="[4.0.0,5.0.0)", - org.eclipse.net4j.tcp;bundle-version="[3.0.0,4.0.0)", + org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)", org.eclipse.zest.core;bundle-version="[1.2.0,2.0.0)", org.eclipse.zest.layouts;bundle-version="[1.1.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.emf.cdo.ui.internal.branch;version="3.0.0";x-internal:=true, - org.eclipse.emf.cdo.ui.internal.branch.bundle;version="3.0.0";x-internal:=true, - org.eclipse.emf.cdo.ui.internal.branch.figure;version="3.0.0";x-internal:=true, - org.eclipse.emf.cdo.ui.internal.branch.geometry;version="3.0.0";x-internal:=true, - org.eclipse.emf.cdo.ui.internal.branch.item;version="3.0.0";x-internal:=true, - org.eclipse.emf.cdo.ui.internal.branch.layout;version="3.0.0";x-internal:=true +Export-Package: org.eclipse.emf.cdo.ui.internal.branch;version="4.0.0";x-internal:=true, + org.eclipse.emf.cdo.ui.internal.branch.bundle;version="4.0.0";x-internal:=true, + org.eclipse.emf.cdo.ui.internal.branch.figure;version="4.0.0";x-internal:=true, + org.eclipse.emf.cdo.ui.internal.branch.geometry;version="4.0.0";x-internal:=true, + org.eclipse.emf.cdo.ui.internal.branch.item;version="4.0.0";x-internal:=true, + org.eclipse.emf.cdo.ui.internal.branch.layout;version="4.0.0";x-internal:=true diff --git a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF index 38fe34a143..6a26d5bdd1 100644 --- a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.ui;bundle-version="[3.4.0,4.0.0)";visibility:=reexport, org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, org.eclipse.emf.ecore.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, - org.eclipse.net4j;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF index e5066ecbc9..11de182dba 100644 --- a/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.net4j.buddies.chat.ui;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.net4j.buddies.chat.internal.ui.bundle.OM$Activator Bundle-Vendor: %providerName Bundle-ClassPath: . Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.net4j.buddies.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.net4j.buddies.chat;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.net4j.buddies.ui;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.eclipse.net4j.buddies.chat;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Export-Package: org.eclipse.net4j.buddies.chat.internal.ui;version="3.0.0", - org.eclipse.net4j.buddies.chat.internal.ui.bundle;version="3.0.0";x-internal:=true, - org.eclipse.net4j.buddies.chat.internal.ui.messages;version="3.0.0";x-internal:=true + org.eclipse.net4j.buddies.chat.internal.ui.bundle;version="4.0.0";x-internal:=true, + org.eclipse.net4j.buddies.chat.internal.ui.messages;version="4.0.0";x-internal:=true Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF index d4940aa0b0..8ee31d26b0 100644 --- a/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.net4j.buddies.chat;singleton:=true -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-Activator: org.eclipse.net4j.buddies.internal.chat.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.net4j.buddies.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.net4j.buddies.chat;version="3.0.100", - org.eclipse.net4j.buddies.internal.chat;version="3.0.100", - org.eclipse.net4j.buddies.internal.chat.bundle;version="3.0.100";x-internal:=true + org.eclipse.net4j.buddies.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport +Export-Package: org.eclipse.net4j.buddies.chat;version="4.0.0", + org.eclipse.net4j.buddies.internal.chat;version="4.0.0", + org.eclipse.net4j.buddies.internal.chat.bundle;version="4.0.0";x-internal:=true Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF index a6ccb698fc..91c048f2cc 100644 --- a/plugins/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.buddies.common/META-INF/MANIFEST.MF @@ -2,18 +2,18 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.net4j.buddies.common -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Vendor: %providerName Bundle-Activator: org.eclipse.net4j.buddies.internal.common.bundle.OM$Activator Bundle-ClassPath: . Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.net4j;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)";resolution:=optional -Export-Package: org.eclipse.net4j.buddies.common;version="3.0.100", - org.eclipse.net4j.buddies.internal.common;version="3.0.100";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server,org.eclipse.net4j.buddies.ui", - org.eclipse.net4j.buddies.internal.common.bundle;version="3.0.100";x-internal:=true, - org.eclipse.net4j.buddies.internal.common.protocol;version="3.0.100";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server", - org.eclipse.net4j.buddies.spi.common;version="3.0.100" +Export-Package: org.eclipse.net4j.buddies.common;version="4.0.0", + org.eclipse.net4j.buddies.internal.common;version="4.0.0";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server,org.eclipse.net4j.buddies.ui", + org.eclipse.net4j.buddies.internal.common.bundle;version="4.0.0";x-internal:=true, + org.eclipse.net4j.buddies.internal.common.protocol;version="4.0.0";x-friends:="org.eclipse.net4j.buddies,org.eclipse.net4j.buddies.server", + org.eclipse.net4j.buddies.spi.common;version="4.0.0" Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF index 9515578b5e..d771090f46 100644 --- a/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.net4j.buddies.server;singleton:=true -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Vendor: %providerName Bundle-Activator: org.eclipse.net4j.buddies.internal.server.bundle.OM$Activator Bundle-ClassPath: . Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional, - org.eclipse.net4j.buddies.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.net4j.buddies.internal.server;version="3.0.100";x-internal:=true, - org.eclipse.net4j.buddies.internal.server.bundle;version="3.0.100";x-internal:=true, - org.eclipse.net4j.buddies.internal.server.messages;version="3.0.100";x-internal:=true, - org.eclipse.net4j.buddies.internal.server.protocol;version="3.0.100";x-internal:=true, + org.eclipse.net4j.buddies.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport +Export-Package: org.eclipse.net4j.buddies.internal.server;version="4.0.0";x-internal:=true, + org.eclipse.net4j.buddies.internal.server.bundle;version="4.0.0";x-internal:=true, + org.eclipse.net4j.buddies.internal.server.messages;version="4.0.0";x-internal:=true, + org.eclipse.net4j.buddies.internal.server.protocol;version="4.0.0";x-internal:=true, org.eclipse.net4j.buddies.server;version="3.0.100" Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF index 4f75095f3f..af33832654 100644 --- a/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.net4j.buddies.ui;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.net4j.buddies.internal.ui.bundle.OM$Activator Bundle-Vendor: %providerName Bundle-ClassPath: . @@ -11,16 +11,16 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.ui;bundle-version="[3.4.0,4.0.0)";visibility:=reexport, org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)";visibility:=reexport, - org.eclipse.net4j;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.net4j.buddies;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.net4j.buddies.chat;bundle-version="[3.0.0,4.0.0)";resolution:=optional -Export-Package: org.eclipse.net4j.buddies.internal.ui;version="3.0.0", - org.eclipse.net4j.buddies.internal.ui.actions;version="3.0.0", - org.eclipse.net4j.buddies.internal.ui.bundle;version="3.0.0";x-internal:=true, - org.eclipse.net4j.buddies.internal.ui.dnd;version="3.0.0", - org.eclipse.net4j.buddies.internal.ui.messages;version="3.0.0";x-internal:=true, - org.eclipse.net4j.buddies.internal.ui.preferences;version="3.0.0", - org.eclipse.net4j.buddies.internal.ui.views;version="3.0.0", - org.eclipse.net4j.buddies.ui;version="3.0.0" + org.eclipse.net4j.buddies;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.eclipse.net4j.buddies.chat;bundle-version="[4.0.0,5.0.0)";resolution:=optional +Export-Package: org.eclipse.net4j.buddies.internal.ui;version="4.0.0", + org.eclipse.net4j.buddies.internal.ui.actions;version="4.0.0", + org.eclipse.net4j.buddies.internal.ui.bundle;version="4.0.0";x-internal:=true, + org.eclipse.net4j.buddies.internal.ui.dnd;version="4.0.0", + org.eclipse.net4j.buddies.internal.ui.messages;version="4.0.0";x-internal:=true, + org.eclipse.net4j.buddies.internal.ui.preferences;version="4.0.0", + org.eclipse.net4j.buddies.internal.ui.views;version="4.0.0", + org.eclipse.net4j.buddies.ui;version="4.0.0" Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.net4j.buddies/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies/META-INF/MANIFEST.MF index 307918520b..547dde8dc1 100644 --- a/plugins/org.eclipse.net4j.buddies/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.buddies/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.net4j.buddies; singleton:=true -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-Activator: org.eclipse.net4j.internal.buddies.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.net4j.buddies.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.net4j.buddies;version="3.0.100", - org.eclipse.net4j.internal.buddies;version="3.0.100";x-friends:="org.eclipse.net4j.buddies.ui", - org.eclipse.net4j.internal.buddies.bundle;version="3.0.100";x-friends:="org.eclipse.net4j.buddies.ui", - org.eclipse.net4j.internal.buddies.protocol;version="3.0.100";x-friends:="org.eclipse.net4j.buddies.ui" + org.eclipse.net4j.buddies.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport +Export-Package: org.eclipse.net4j.buddies;version="4.0.0", + org.eclipse.net4j.internal.buddies;version="4.0.0";x-friends:="org.eclipse.net4j.buddies.ui", + org.eclipse.net4j.internal.buddies.bundle;version="4.0.0";x-friends:="org.eclipse.net4j.buddies.ui", + org.eclipse.net4j.internal.buddies.protocol;version="4.0.0";x-friends:="org.eclipse.net4j.buddies.ui" Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF index af3fe1088e..5d9c712aa1 100644 --- a/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-Activator: org.eclipse.net4j.db.tests.bundle.Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.net4j.tests;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.net4j.tests;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j.db.derby;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j.db.hsqldb;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport, org.eclipse.net4j.db.mysql;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport, diff --git a/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF index ebd05c1ce5..bbc7968f11 100644 --- a/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.net4j.defs;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.net4j.util.defs;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.net4j.tcp;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.net4j.jvm;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.net4j.http;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.eclipse.net4j.jvm;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.eclipse.net4j.http;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.net4j.defs;version="3.0.0", - org.eclipse.net4j.defs.impl;version="3.0.0", - org.eclipse.net4j.defs.util;version="3.0.0" +Export-Package: org.eclipse.net4j.defs;version="4.0.0", + org.eclipse.net4j.defs.impl;version="4.0.0", + org.eclipse.net4j.defs.util;version="4.0.0" diff --git a/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF index c0f92d0cec..7849cee15e 100644 --- a/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.examples;singleton:=true -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Activator: org.eclipse.net4j.internal.examples.bundle.OM$Activator @@ -10,11 +10,11 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional, org.eclipse.ui;bundle-version="[3.4.0,4.0.0)";resolution:=optional, - org.eclipse.net4j.tcp;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.net4j.jvm;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.eclipse.net4j.jvm;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.net4j.examples.echo;version="3.0.100", - org.eclipse.net4j.examples.echo.client;version="3.0.100", - org.eclipse.net4j.examples.echo.server;version="3.0.100", - org.eclipse.net4j.examples.transfer;version="3.0.100", - org.eclipse.net4j.internal.examples.bundle;version="3.0.100" +Export-Package: org.eclipse.net4j.examples.echo;version="4.0.0", + org.eclipse.net4j.examples.echo.client;version="4.0.0", + org.eclipse.net4j.examples.echo.server;version="4.0.0", + org.eclipse.net4j.examples.transfer;version="4.0.0", + org.eclipse.net4j.internal.examples.bundle;version="4.0.0" diff --git a/plugins/org.eclipse.net4j.http.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.http.common/META-INF/MANIFEST.MF index 40c4533721..57ed6eeb99 100644 --- a/plugins/org.eclipse.net4j.http.common/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.http.common/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.http.common -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,12 +10,12 @@ Bundle-Activator: org.eclipse.net4j.http.internal.common.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)";resolution:=optional, - org.eclipse.net4j;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.net4j.http.common;version="3.0.100";uses:="org.eclipse.net4j.connector", - org.eclipse.net4j.http.internal.common;version="3.0.100"; + org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport +Export-Package: org.eclipse.net4j.http.common;version="4.0.0";uses:="org.eclipse.net4j.connector", + org.eclipse.net4j.http.internal.common;version="4.0.0"; x-friends:="org.eclipse.net4j.http, org.eclipse.net4j.http.server, org.eclipse.net4j.http.tests, org.eclipse.net4j.defs", - org.eclipse.net4j.http.internal.common.bundle;version="3.0.100";x-friends:="org.eclipse.net4j.http,org.eclipse.net4j.http.server,org.eclipse.net4j.http.tests", - org.eclipse.net4j.http.internal.common.messages;version="3.0.100";x-internal:=true + org.eclipse.net4j.http.internal.common.bundle;version="4.0.0";x-friends:="org.eclipse.net4j.http,org.eclipse.net4j.http.server,org.eclipse.net4j.http.tests", + org.eclipse.net4j.http.internal.common.messages;version="4.0.0";x-internal:=true diff --git a/plugins/org.eclipse.net4j.http.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.http.server/META-INF/MANIFEST.MF index cc2a878ef6..7afa8aefc8 100644 --- a/plugins/org.eclipse.net4j.http.server/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.http.server/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.http.server;singleton:=true -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,11 +10,11 @@ Bundle-Activator: org.eclipse.net4j.http.internal.server.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)";resolution:=optional, - org.eclipse.net4j.http.common;bundle-version="[3.0.0,4.0.0)", + org.eclipse.net4j.http.common;bundle-version="[4.0.0,5.0.0)", org.eclipse.equinox.http.registry;bundle-version="[1.0.0,2.0.0)" Import-Package: javax.servlet;version="[2.3.0,3.0.0)", javax.servlet.http;version="[2.3.0,3.0.0)" -Export-Package: org.eclipse.net4j.http.internal.server;version="3.0.100";x-friends:="org.eclipse.net4j.http.tests,org.eclipse.net4j.defs", - org.eclipse.net4j.http.internal.server.bundle;version="3.0.100";x-internal:=true, - org.eclipse.net4j.http.internal.server.messages;version="3.0.100";x-internal:=true, - org.eclipse.net4j.http.server;version="3.0.100" +Export-Package: org.eclipse.net4j.http.internal.server;version="4.0.0";x-friends:="org.eclipse.net4j.http.tests,org.eclipse.net4j.defs", + org.eclipse.net4j.http.internal.server.bundle;version="4.0.0";x-internal:=true, + org.eclipse.net4j.http.internal.server.messages;version="4.0.0";x-internal:=true, + org.eclipse.net4j.http.server;version="4.0.0" diff --git a/plugins/org.eclipse.net4j.http.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.http.tests/META-INF/MANIFEST.MF index 9b71d39ec2..5f670ea6b9 100644 --- a/plugins/org.eclipse.net4j.http.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.http.tests/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.http.tests;singleton:=true -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,11 +10,11 @@ Bundle-Activator: org.eclipse.net4j.internal.http.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)";resolution:=optional, - org.eclipse.net4j.tests;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.net4j.http;bundle-version="[3.0.0,4.0.0)", - org.eclipse.net4j.http.server;bundle-version="[3.0.0,4.0.0)" + org.eclipse.net4j.tests;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.eclipse.net4j.http;bundle-version="[4.0.0,5.0.0)", + org.eclipse.net4j.http.server;bundle-version="[4.0.0,5.0.0)" Import-Package: javax.servlet;version="[2.3.0,3.0.0)", javax.servlet.http;version="[2.3.0,3.0.0)", org.apache.commons.httpclient;version="[3.0.1,4.0.0)", org.apache.commons.httpclient.methods;version="[3.0.1,4.0.0)" -Export-Package: org.eclipse.net4j.http.tests;version="3.0.100" +Export-Package: org.eclipse.net4j.http.tests;version="4.0.0" diff --git a/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF index 15ef92fc3a..238ef67245 100644 --- a/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.http;singleton:=true -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,11 +10,11 @@ Bundle-Activator: org.eclipse.net4j.internal.http.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)";resolution:=optional, - org.eclipse.net4j.http.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.net4j.http.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Import-Package: org.apache.commons.codec;version="[1.3.0,2.0.0)", org.apache.commons.httpclient;version="[3.0.0,4.0.0)", org.apache.commons.httpclient.methods;version="[3.0.0,4.0.0)", org.apache.commons.logging;version="[1.1.0,2.0.0)" -Export-Package: org.eclipse.net4j.http;version="3.0.100", - org.eclipse.net4j.internal.http;version="3.0.100";x-friends:="org.eclipse.net4j.http.tests,org.eclipse.net4j.defs", - org.eclipse.net4j.internal.http.bundle;version="3.0.100";x-internal:=true +Export-Package: org.eclipse.net4j.http;version="4.0.0", + org.eclipse.net4j.internal.http;version="4.0.0";x-friends:="org.eclipse.net4j.http.tests,org.eclipse.net4j.defs", + org.eclipse.net4j.internal.http.bundle;version="4.0.0";x-internal:=true diff --git a/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF index 2de80bfd77..0960e35b4f 100644 --- a/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.jms.admin -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Activator: org.eclipse.net4j.jms.internal.admin.bundle.OM @@ -9,9 +9,9 @@ Bundle-ClassPath: . Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.net4j.jms;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.net4j.jms.admin;version="3.0.100", - org.eclipse.net4j.jms.internal.admin;version="3.0.100";x-internal:=true, - org.eclipse.net4j.jms.internal.admin.bundle;version="3.0.100";x-internal:=true, - org.eclipse.net4j.jms.internal.admin.protocol;version="3.0.100";x-internal:=true + org.eclipse.net4j.jms;bundle-version="[4.0.0,5.0.0)";visibility:=reexport +Export-Package: org.eclipse.net4j.jms.admin;version="4.0.0", + org.eclipse.net4j.jms.internal.admin;version="4.0.0";x-internal:=true, + org.eclipse.net4j.jms.internal.admin.bundle;version="4.0.0";x-internal:=true, + org.eclipse.net4j.jms.internal.admin.protocol;version="4.0.0";x-internal:=true Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF index 9e05648c4b..086f670d15 100644 --- a/plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-Activator: org.eclipse.net4j.jms.server.internal.jdbc.bundle.OM Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.net4j.jms.server;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.net4j.jms.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Import-Package: javax.jms;version="[1.1.0,2.0.0)" Export-Package: org.eclipse.net4j.jms.server.internal.jdbc;version="4.0.0";x-internal:=true, diff --git a/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF index 782da2a27a..5ccb2bece0 100644 --- a/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.jms.server -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,12 +10,12 @@ Bundle-Activator: org.eclipse.net4j.jms.internal.server.bundle.OM Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.net4j.jms;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.net4j.jms;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Import-Package: javax.jms;version="[1.1.0,2.0.0)" -Export-Package: org.eclipse.net4j.jms.internal.server;version="3.0.100";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests", - org.eclipse.net4j.jms.internal.server.bundle;version="3.0.100";x-internal:=true, - org.eclipse.net4j.jms.internal.server.messages;version="3.0.100";x-internal:=true, - org.eclipse.net4j.jms.internal.server.protocol;version="3.0.100";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests", - org.eclipse.net4j.jms.internal.server.protocol.admin;version="3.0.100";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests", - org.eclipse.net4j.jms.internal.server.store;version="3.0.100";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests", - org.eclipse.net4j.jms.server;version="3.0.100" +Export-Package: org.eclipse.net4j.jms.internal.server;version="4.0.0";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests", + org.eclipse.net4j.jms.internal.server.bundle;version="4.0.0";x-internal:=true, + org.eclipse.net4j.jms.internal.server.messages;version="4.0.0";x-internal:=true, + org.eclipse.net4j.jms.internal.server.protocol;version="4.0.0";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests", + org.eclipse.net4j.jms.internal.server.protocol.admin;version="4.0.0";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests", + org.eclipse.net4j.jms.internal.server.store;version="4.0.0";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests", + org.eclipse.net4j.jms.server;version="4.0.0" diff --git a/plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF index c6596225e1..9488493d14 100644 --- a/plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.net4j.jms.tests -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Vendor: %providerName Bundle-ClassPath: . Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.net4j.tcp;bundle-version="[3.0.0,4.0.0)", - org.eclipse.net4j.jms;bundle-version="[3.0.0,4.0.0)", - org.eclipse.net4j.jms.admin;bundle-version="[3.0.0,4.0.0)", - org.eclipse.net4j.jms.server;bundle-version="[3.0.0,4.0.0)", + org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)", + org.eclipse.net4j.jms;bundle-version="[4.0.0,5.0.0)", + org.eclipse.net4j.jms.admin;bundle-version="[4.0.0,5.0.0)", + org.eclipse.net4j.jms.server;bundle-version="[4.0.0,5.0.0)", org.eclipse.net4j.jms.server.jdbc;bundle-version="[4.0.0,5.0.0)" Import-Package: javax.jms;version="[1.1.0,2.0.0)", - org.eclipse.net4j.db.derby;version="3.0.0" -Export-Package: org.eclipse.net4j.jms.tests;version="3.0.0" + org.eclipse.net4j.db.derby;version="[4.0.0,5.0.0)" +Export-Package: org.eclipse.net4j.jms.tests;version="4.0.0" diff --git a/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF index 27c0e2ba8c..adcd752c1c 100644 --- a/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.jms -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,11 +10,11 @@ Bundle-Activator: org.eclipse.net4j.internal.jms.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.net4j;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Import-Package: javax.jms;version="[1.1.0,2.0.0)" -Export-Package: org.eclipse.net4j.internal.jms;version="3.0.100", - org.eclipse.net4j.internal.jms.bundle;version="3.0.100";x-internal:=true, - org.eclipse.net4j.internal.jms.messages;version="3.0.100";x-internal:=true, - org.eclipse.net4j.internal.jms.protocol;version="3.0.100", - org.eclipse.net4j.internal.jms.util;version="3.0.100", +Export-Package: org.eclipse.net4j.internal.jms;version="4.0.0", + org.eclipse.net4j.internal.jms.bundle;version="4.0.0";x-internal:=true, + org.eclipse.net4j.internal.jms.messages;version="4.0.0";x-internal:=true, + org.eclipse.net4j.internal.jms.protocol;version="4.0.0", + org.eclipse.net4j.internal.jms.util;version="4.0.0", org.eclipse.net4j.jms;version="3.0.100" diff --git a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF index 4ff01fce69..62f7f943ff 100644 --- a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.jvm;singleton:=true -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,9 +10,9 @@ Bundle-Activator: org.eclipse.net4j.internal.jvm.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional, - org.eclipse.net4j;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)";resolution:=optional -Export-Package: org.eclipse.net4j.internal.jvm;version="3.0.100";x-friends:="org.eclipse.net4j.defs,org.eclipse.net4j.tests", - org.eclipse.net4j.internal.jvm.bundle;version="3.0.100";x-internal:=true, - org.eclipse.net4j.internal.jvm.messages;version="3.0.100";x-internal:=true, - org.eclipse.net4j.jvm;version="3.0.100" +Export-Package: org.eclipse.net4j.internal.jvm;version="4.0.0";x-friends:="org.eclipse.net4j.defs,org.eclipse.net4j.tests", + org.eclipse.net4j.internal.jvm.bundle;version="4.0.0";x-internal:=true, + org.eclipse.net4j.internal.jvm.messages;version="4.0.0";x-internal:=true, + org.eclipse.net4j.jvm;version="4.0.0" diff --git a/plugins/org.eclipse.net4j.tcp/.settings/.api_filters b/plugins/org.eclipse.net4j.tcp/.settings/.api_filters deleted file mode 100644 index 0e24a42d4f..0000000000 --- a/plugins/org.eclipse.net4j.tcp/.settings/.api_filters +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<component id="org.eclipse.net4j.tcp" version="2"> - <resource path="src/org/eclipse/net4j/tcp/ITCPAcceptor.java" type="org.eclipse.net4j.tcp.ITCPAcceptor"> - <filter id="389242988"> - <message_arguments> - <message_argument value="org.eclipse.net4j.tcp.ITCPAcceptor"/> - <message_argument value="DEFAULT_PORT"/> - <message_argument value="2036"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/net4j/tcp/ITCPConnector.java" type="org.eclipse.net4j.tcp.ITCPConnector"> - <filter id="389242988"> - <message_arguments> - <message_argument value="org.eclipse.net4j.tcp.ITCPConnector"/> - <message_argument value="DEFAULT_PORT"/> - <message_argument value="2036"/> - </message_arguments> - </filter> - </resource> -</component> diff --git a/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF index 30db62c937..7c7f343a93 100644 --- a/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.tcp;singleton:=true -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,9 +10,9 @@ Bundle-Activator: org.eclipse.net4j.internal.tcp.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional, - org.eclipse.net4j;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)";resolution:=optional -Export-Package: org.eclipse.net4j.internal.tcp;version="3.1.0";x-friends:="org.eclipse.net4j.tests,org.eclipse.net4j.defs,org.eclipse.emf.cdo.examples", - org.eclipse.net4j.internal.tcp.bundle;version="3.1.0";x-internal:=true, - org.eclipse.net4j.internal.tcp.messages;version="3.1.0";x-internal:=true, - org.eclipse.net4j.tcp;version="3.1.0" +Export-Package: org.eclipse.net4j.internal.tcp;version="4.0.0";x-friends:="org.eclipse.net4j.tests,org.eclipse.net4j.defs,org.eclipse.emf.cdo.examples", + org.eclipse.net4j.internal.tcp.bundle;version="4.0.0";x-internal:=true, + org.eclipse.net4j.internal.tcp.messages;version="4.0.0";x-internal:=true, + org.eclipse.net4j.tcp;version="4.0.0" diff --git a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF index ba461fda0c..4dc1fc8baa 100644 --- a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.tests;singleton:=true -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,22 +10,22 @@ Bundle-Activator: org.eclipse.net4j.tests.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";visibility:=reexport, - org.eclipse.net4j.tcp;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.net4j.jvm;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.net4j.http;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.net4j.http.server;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.net4j.defs;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.eclipse.net4j.jvm;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.eclipse.net4j.http;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.eclipse.net4j.http.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.eclipse.net4j.defs;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j.util.defs;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.junit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport -Export-Package: org.eclipse.net4j.tests;version="3.1.0", - org.eclipse.net4j.tests.apps;version="3.1.0", - org.eclipse.net4j.tests.bugzilla;version="3.1.0", - org.eclipse.net4j.tests.bundle;version="3.1.0";x-internal:=true, - org.eclipse.net4j.tests.data;version="3.1.0", - org.eclipse.net4j.tests.defs;version="3.1.0", - org.eclipse.net4j.tests.signal;version="3.1.0", - org.eclipse.net4j.util.tests;version="3.1.0", - org.eclipse.net4j.util.tests.cache;version="3.1.0", - org.eclipse.net4j.util.tests.defs;version="3.1.0", - org.eclipse.net4j.util.tests.defs.impl;version="3.1.0", - org.eclipse.net4j.util.tests.defs.util;version="3.1.0" +Export-Package: org.eclipse.net4j.tests;version="4.0.0", + org.eclipse.net4j.tests.apps;version="4.0.0", + org.eclipse.net4j.tests.bugzilla;version="4.0.0", + org.eclipse.net4j.tests.bundle;version="4.0.0";x-internal:=true, + org.eclipse.net4j.tests.data;version="4.0.0", + org.eclipse.net4j.tests.defs;version="4.0.0", + org.eclipse.net4j.tests.signal;version="4.0.0", + org.eclipse.net4j.util.tests;version="4.0.0", + org.eclipse.net4j.util.tests.cache;version="4.0.0", + org.eclipse.net4j.util.tests.defs;version="4.0.0", + org.eclipse.net4j.util.tests.defs.impl;version="4.0.0", + org.eclipse.net4j.util.tests.defs.util;version="4.0.0" diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/FailOverTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/FailOverTest.java deleted file mode 100644 index b4f62654b1..0000000000 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/FailOverTest.java +++ /dev/null @@ -1,111 +0,0 @@ -/** - * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.net4j.tests; - -import org.eclipse.net4j.acceptor.IAcceptor; -import org.eclipse.net4j.signal.failover.IFailOverStrategy; -import org.eclipse.net4j.signal.failover.NOOPFailOverStrategy; -import org.eclipse.net4j.signal.failover.RetryFailOverStrategy; -import org.eclipse.net4j.tests.signal.IntFailRequest; -import org.eclipse.net4j.tests.signal.IntRequest; -import org.eclipse.net4j.tests.signal.TestSignalProtocol; - -/** - * @author Eike Stepper - */ -public class FailOverTest extends AbstractProtocolTest -{ - public FailOverTest() - { - } - - public void testFailingBefore() throws Exception - { - int data = 0x0a; - startTransport(); - IFailOverStrategy failOverStrategy = new NOOPFailOverStrategy(getConnector()); - TestSignalProtocol protocol = new TestSignalProtocol(failOverStrategy); - - // Simulate a disconnect from the server. - IAcceptor acceptor = getAcceptor(); - acceptor.close(); - - // Exception HERE - IntRequest request = new IntRequest(protocol, data); - int result = request.send(); - assertEquals(data, result); - } - - public void testFailingBeforeAndRetry() throws Exception - { - int data = 0x0a; - startTransport(); - IFailOverStrategy failOverStrategy = new RetryFailOverStrategy(getConnector()); - TestSignalProtocol protocol = new TestSignalProtocol(failOverStrategy); - - // Simulate a disconnect from the server. - IAcceptor acceptor = getAcceptor(); - acceptor.close(); - - // new Thread() - // { - // @Override - // public void run() - // { - // try - // { - // sleep(1000L); - // restartContainer(); - // getAcceptor(); - // } - // catch (Exception ex) - // { - // throw WrappedException.wrap(ex); - // } - // }; - // }.start(); - - // Exception HERE - IntRequest request = new IntRequest(protocol, data); - int result = request.send(); - assertEquals(data, result); - } - - public void testFailingDuring() throws Exception - { - int data = 0x0a; - startTransport(); - IFailOverStrategy failOverStrategy = new RetryFailOverStrategy(getConnector()); - TestSignalProtocol protocol = new TestSignalProtocol(failOverStrategy); - - // Exception HERE - IntRequest request = new IntRequest(protocol, data); - - // Simulate a disconnect from the server. - IAcceptor acceptor = getAcceptor(); - acceptor.close(); - - int result = request.send(); - assertEquals(data, result); - } - - public void testFailingDuring2() throws Exception - { - int data = 0x0a; - startTransport(); - IFailOverStrategy failOverStrategy = new RetryFailOverStrategy(getConnector()); - TestSignalProtocol protocol = new TestSignalProtocol(failOverStrategy); - - // Exception HERE - int result = new IntFailRequest(protocol, data).send(1000); - assertEquals(data, result); - } -} diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java index d86cf05772..db4c51339b 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java @@ -13,7 +13,6 @@ package org.eclipse.net4j.tests.signal; import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.signal.SignalProtocol; import org.eclipse.net4j.signal.SignalReactor; -import org.eclipse.net4j.signal.failover.IFailOverStrategy; import org.eclipse.net4j.util.factory.ProductCreationException; import org.eclipse.spi.net4j.ServerProtocolFactory; @@ -48,12 +47,6 @@ public class TestSignalProtocol extends SignalProtocol<Object> open(connector); } - public TestSignalProtocol(IFailOverStrategy failOverStrategy) - { - this(); - open(failOverStrategy); - } - public TestSignalProtocol() { super(PROTOCOL_NAME); diff --git a/plugins/org.eclipse.net4j.ui.defs/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.ui.defs/META-INF/MANIFEST.MF index 37f6047001..1a3e7d3ff6 100644 --- a/plugins/org.eclipse.net4j.ui.defs/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.ui.defs/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.net4j.ui.defs;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Require-Bundle: org.eclipse.net4j.defs;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, +Require-Bundle: org.eclipse.net4j.defs;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.net4j.ui.defs;version="3.0.0", - org.eclipse.net4j.ui.defs.impl;version="3.0.0", - org.eclipse.net4j.ui.defs.util;version="3.0.0" +Export-Package: org.eclipse.net4j.ui.defs;version="4.0.0", + org.eclipse.net4j.ui.defs.impl;version="4.0.0", + org.eclipse.net4j.ui.defs.util;version="4.0.0" diff --git a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF index 9ee7e449d1..3e2af8b2e7 100644 --- a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.ui;singleton:=true -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,10 +10,10 @@ Bundle-Activator: org.eclipse.net4j.internal.ui.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.net4j;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.net4j.internal.ui;version="3.1.0";x-friends:="org.eclipse.net4j.ui.defs", - org.eclipse.net4j.internal.ui.bundle;version="3.1.0";x-internal:=true, - org.eclipse.net4j.internal.ui.container;version="3.1.0", - org.eclipse.net4j.internal.ui.messages;version="3.1.0";x-internal:=true, - org.eclipse.net4j.internal.ui.views;version="3.1.0";x-friends:="org.eclipse.net4j.ui.defs" +Export-Package: org.eclipse.net4j.internal.ui;version="4.0.0";x-friends:="org.eclipse.net4j.ui.defs", + org.eclipse.net4j.internal.ui.bundle;version="4.0.0";x-internal:=true, + org.eclipse.net4j.internal.ui.container;version="4.0.0", + org.eclipse.net4j.internal.ui.messages;version="4.0.0";x-internal:=true, + org.eclipse.net4j.internal.ui.views;version="4.0.0";x-friends:="org.eclipse.net4j.ui.defs" diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/container/JVMConnectorWizard.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/container/JVMConnectorWizard.java index 20d1192637..e7ee1c3ae8 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/container/JVMConnectorWizard.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/container/JVMConnectorWizard.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 * Martin Fluegge - initial API and implementation @@ -21,7 +21,7 @@ import org.eclipse.swt.widgets.Composite; /** * @author Eike Stepper * @author Martin Fluegge - * @since 3.1 + * @since 4.0 */ public class JVMConnectorWizard extends ElementWizard { diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/container/TCPConnectorWizard.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/container/TCPConnectorWizard.java index cc5734d49c..8ec900c986 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/container/TCPConnectorWizard.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/container/TCPConnectorWizard.java @@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.Text; /** * @author Eike Stepper * @author Martin Fluegge - * @since 3.1 + * @since 4.0 */ public class TCPConnectorWizard extends ElementWizard implements ModifyListener { diff --git a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF index 7cfbf44bde..7d01d7c014 100644 --- a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j;singleton:=true -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -11,7 +11,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional, org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.internal.net4j;version="3.1.0"; +Export-Package: org.eclipse.internal.net4j;version="4.0.0"; x-friends:="org.eclipse.net4j.http.server, org.eclipse.net4j.jvm, org.eclipse.net4j.tcp, @@ -20,7 +20,7 @@ Export-Package: org.eclipse.internal.net4j;version="3.1.0"; org.eclipse.net4j.http.tests, org.eclipse.net4j.tests, org.eclipse.net4j.defs", - org.eclipse.internal.net4j.buffer;version="3.1.0"; + org.eclipse.internal.net4j.buffer;version="4.0.0"; x-friends:="org.eclipse.net4j.http.server, org.eclipse.net4j.jvm, org.eclipse.net4j.tcp, @@ -29,16 +29,15 @@ Export-Package: org.eclipse.internal.net4j;version="3.1.0"; org.eclipse.net4j.http.tests, org.eclipse.net4j.tests, org.eclipse.net4j.defs", - org.eclipse.internal.net4j.bundle;version="3.1.0";x-internal:=true, - org.eclipse.net4j;version="3.1.0", - org.eclipse.net4j.acceptor;version="3.1.0", - org.eclipse.net4j.buffer;version="3.1.0", - org.eclipse.net4j.channel;version="3.1.0", - org.eclipse.net4j.connector;version="3.1.0", - org.eclipse.net4j.protocol;version="3.1.0", - org.eclipse.net4j.signal;version="3.1.0", - org.eclipse.net4j.signal.failover;version="3.1.0", - org.eclipse.net4j.signal.heartbeat;version="3.1.0", - org.eclipse.net4j.signal.wrapping;version="3.1.0", - org.eclipse.spi.net4j;version="3.1.0" + org.eclipse.internal.net4j.bundle;version="4.0.0";x-internal:=true, + org.eclipse.net4j;version="4.0.0", + org.eclipse.net4j.acceptor;version="4.0.0", + org.eclipse.net4j.buffer;version="4.0.0", + org.eclipse.net4j.channel;version="4.0.0", + org.eclipse.net4j.connector;version="4.0.0", + org.eclipse.net4j.protocol;version="4.0.0", + org.eclipse.net4j.signal;version="4.0.0", + org.eclipse.net4j.signal.heartbeat;version="4.0.0", + org.eclipse.net4j.signal.wrapping;version="4.0.0", + org.eclipse.spi.net4j;version="4.0.0" Eclipse-BuddyPolicy: registered diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/ISignalProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/ISignalProtocol.java index d4e16ca671..7d252824f7 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/ISignalProtocol.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/ISignalProtocol.java @@ -14,7 +14,6 @@ import org.eclipse.net4j.buffer.BufferInputStream; import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.protocol.IProtocol; -import org.eclipse.net4j.signal.failover.IFailOverStrategy; import org.eclipse.net4j.util.event.INotifier; import org.eclipse.net4j.util.io.IStreamWrapper; @@ -38,15 +37,7 @@ public interface ISignalProtocol<INFRA_STRUCTURE> extends IProtocol<INFRA_STRUCT public void addStreamWrapper(IStreamWrapper streamWrapper); - public IFailOverStrategy getFailOverStrategy(); - - public void setFailOverStrategy(IFailOverStrategy failOverStrategy); - - public IChannel open(IFailOverStrategy failOverStrategy); - public IChannel open(IConnector connector); - public IChannel open(); - public void close(); } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java index 57b8dc6df9..b4dae1bb55 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java @@ -12,7 +12,6 @@ package org.eclipse.net4j.signal; import org.eclipse.net4j.buffer.BufferInputStream; import org.eclipse.net4j.buffer.BufferOutputStream; -import org.eclipse.net4j.channel.IChannel; /** * @author Eike Stepper @@ -46,38 +45,10 @@ public abstract class SignalActor extends Signal setCorrelationID(protocol.getNextCorrelationID()); } - /** - * @since 2.0 - */ - protected void resetting() - { - } - @Override protected final void execute(BufferInputStream in, BufferOutputStream out) throws Exception { - IChannel channel = null; - - for (;;) - { - try - { - channel = getProtocol().getChannel(); - doExecute(in, out); - break; - } - catch (Exception ex) - { - if (getProtocol().handleFailOver(this, channel, ex)) - { - resetting(); - } - else - { - throw ex; - } - } - } + doExecute(in, out); } abstract void doExecute(BufferInputStream in, BufferOutputStream out) throws Exception; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java index 4c0c2b0a13..0667bcdcf1 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java @@ -17,8 +17,6 @@ import org.eclipse.net4j.buffer.IBufferProvider; import org.eclipse.net4j.channel.ChannelOutputStream; import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.connector.IConnector; -import org.eclipse.net4j.signal.failover.IFailOverStrategy; -import org.eclipse.net4j.signal.failover.NOOPFailOverStrategy; import org.eclipse.net4j.util.event.IListener; import org.eclipse.net4j.util.io.IORuntimeException; import org.eclipse.net4j.util.io.IStreamWrapper; @@ -72,8 +70,6 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i private IStreamWrapper streamWrapper; - private IFailOverStrategy failOverStrategy; - private Map<Integer, Signal> signals = new HashMap<Integer, Signal>(); private int nextCorrelationID = MIN_CORRELATION_ID; @@ -129,45 +125,9 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i /** * @since 2.0 */ - public IFailOverStrategy getFailOverStrategy() - { - return failOverStrategy; - } - - /** - * @since 2.0 - */ - public void setFailOverStrategy(IFailOverStrategy failOverStrategy) - { - this.failOverStrategy = failOverStrategy; - } - - /** - * @since 2.0 - */ - public IChannel open(IFailOverStrategy failOverStrategy) - { - setFailOverStrategy(failOverStrategy); - return open(); - } - - /** - * @since 2.0 - */ public IChannel open(IConnector connector) { - IFailOverStrategy failOverStrategy = createFailOverStrategy(connector); - return open(failOverStrategy); - } - - /** - * @since 2.0 - */ - public IChannel open() - { - checkState(failOverStrategy, "failOverStrategy"); //$NON-NLS-1$ - failOverStrategy.handleOpen(this); - return getChannel(); + return connector.openChannel(this); } /** @@ -302,7 +262,6 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i signals.clear(); } - failOverStrategy = null; IChannel channel = getChannel(); if (channel != null) { @@ -313,14 +272,6 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i super.doDeactivate(); } - /** - * @since 2.0 - */ - protected IFailOverStrategy createFailOverStrategy(IConnector connector) - { - return new NOOPFailOverStrategy(connector); - } - @Override protected void handleChannelDeactivation() { @@ -461,52 +412,6 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i } } - boolean handleFailOver(SignalActor signalActor, IChannel originalChannel, Exception reason) - { - if (failOverStrategy != null) - { - try - { - synchronized (failOverStrategy) - { - failingOver = true; - if (originalChannel == getChannel()) - { - failOverStrategy.handleFailOver(this, reason); - } - - // Set new OutputStream - int correlationID = signalActor.getCorrelationID(); - short signalID = signalActor.getID(); - signalActor.setBufferOutputStream(new SignalOutputStream(correlationID, signalID, true)); - - // Set new InputStream - if (signalActor instanceof RequestWithConfirmation<?>) - { - long timeout = signalActor.getBufferInputStream().getMillisBeforeTimeout(); - signalActor.setBufferInputStream(new SignalInputStream(timeout)); - } - - return true; - } - } - catch (UnsupportedOperationException ex) - { - // Do nothing - } - catch (Exception ex) - { - OM.LOG.error(ex); - } - finally - { - failingOver = false; - } - } - - return false; - } - void handleRemoteException(int correlationID, Throwable t, boolean responding) { synchronized (signals) diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverEvent.java deleted file mode 100644 index 8ae927cc5a..0000000000 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverEvent.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.net4j.signal.failover; - -import org.eclipse.net4j.channel.IChannel; -import org.eclipse.net4j.connector.IConnector; -import org.eclipse.net4j.util.event.IEvent; - -/** - * @author Eike Stepper - * @noimplement This interface is not intended to be implemented by clients. - */ -public interface IFailOverEvent extends IEvent -{ - /** - * Returns the old channel that was active before the fail over occured. At the time this event is being sent the old - * channel is already closed. - */ - public IChannel getOldChannel(); - - /** - * Returns the new channel that is active after the fail over occured. At the time this event is being sent the new - * channel is already active. - */ - public IChannel getNewChannel(); - - /** - * Returns the connector of the new channel. - */ - public IConnector getNewConnector(); -} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverStrategy.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverStrategy.java deleted file mode 100644 index 44c71efed2..0000000000 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverStrategy.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.net4j.signal.failover; - -import org.eclipse.net4j.signal.ISignalProtocol; -import org.eclipse.net4j.util.event.INotifier; - -/** - * @author Eike Stepper - */ -public interface IFailOverStrategy extends INotifier -{ - /** - * @since 2.0 - */ - public void handleOpen(ISignalProtocol<?> protocol); - - /** - * @since 2.0 - */ - public void handleFailOver(ISignalProtocol<?> protocol, Exception reason); -} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/NOOPFailOverStrategy.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/NOOPFailOverStrategy.java deleted file mode 100644 index ba43d1e562..0000000000 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/NOOPFailOverStrategy.java +++ /dev/null @@ -1,72 +0,0 @@ -/** - * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.net4j.signal.failover; - -import org.eclipse.net4j.connector.IConnector; -import org.eclipse.net4j.signal.ISignalProtocol; -import org.eclipse.net4j.util.event.Notifier; - -/** - * @author Eike Stepper - */ -public class NOOPFailOverStrategy extends Notifier implements IFailOverStrategy -{ - private IConnector connector; - - /** - * @since 2.0 - */ - public NOOPFailOverStrategy(IConnector connector) - { - setConnector(connector); - } - - /** - * @since 2.0 - */ - public IConnector getConnector() - { - return connector; - } - - /** - * @since 2.0 - */ - public void setConnector(IConnector connector) - { - this.connector = connector; - } - - /** - * @since 2.0 - */ - public void handleOpen(ISignalProtocol<?> protocol) - { - connector.openChannel(protocol); - } - - /** - * @since 2.0 - */ - public void handleFailOver(ISignalProtocol<?> protocol, Exception reason) - { - throw new UnsupportedOperationException(); - } - - /** - * @since 2.0 - */ - @Override - public String toString() - { - return "NOOPFailOverStrategy"; //$NON-NLS-1$ - } -} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/RetryFailOverStrategy.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/RetryFailOverStrategy.java deleted file mode 100644 index acd2628bfb..0000000000 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/RetryFailOverStrategy.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.net4j.signal.failover; - -import org.eclipse.net4j.connector.IConnector; -import org.eclipse.net4j.signal.ISignalProtocol; -import org.eclipse.net4j.util.WrappedException; - -import org.eclipse.internal.net4j.bundle.OM; - -import java.text.MessageFormat; - -/** - * @author Eike Stepper - */ -public class RetryFailOverStrategy extends NOOPFailOverStrategy -{ - /** - * @since 2.0 - */ - public static final int RETRY_FOREVER = -1; - - private int retries; - - /** - * @since 2.0 - */ - public RetryFailOverStrategy(IConnector connector, int retries) - { - super(connector); - this.retries = retries; - } - - public RetryFailOverStrategy(IConnector connector) - { - this(connector, RETRY_FOREVER); - } - - /** - * @since 2.0 - */ - public int getRetries() - { - return retries; - } - - /** - * @since 2.0 - */ - public boolean isRetryingForever() - { - return retries < 0; - } - - @Override - public void handleFailOver(ISignalProtocol<?> protocol, Exception reason) - { - Exception exception = null; - int max = isRetryingForever() ? Integer.MAX_VALUE : retries; - for (int i = 0; i < max; i++) - { - try - { - handleOpen(protocol); - return; - } - catch (Exception ex) - { - OM.LOG.error(ex); - exception = ex; - } - } - - if (exception != null) - { - throw WrappedException.wrap(exception); - } - } - - @Override - public String toString() - { - Object arg = isRetryingForever() ? "forever" : retries; - return MessageFormat.format("RetryFailOverStrategy[retries={0}]", arg); //$NON-NLS-1$ - } -} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/heartbeat/HeartBeatProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/heartbeat/HeartBeatProtocol.java index 88d208b207..3805469c89 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/heartbeat/HeartBeatProtocol.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/heartbeat/HeartBeatProtocol.java @@ -55,7 +55,7 @@ public class HeartBeatProtocol extends SignalProtocol<Object> private Timer timer; /** - * @since 3.1 + * @since 4.0 */ protected HeartBeatProtocol(String type, IConnector connector, Timer timer) { @@ -72,7 +72,7 @@ public class HeartBeatProtocol extends SignalProtocol<Object> } /** - * @since 3.1 + * @since 4.0 */ public HeartBeatProtocol(IConnector connector, IManagedContainer container) { @@ -177,7 +177,7 @@ public class HeartBeatProtocol extends SignalProtocol<Object> } /** - * @since 3.1 + * @since 4.0 */ protected void requestingStart(ExtendedDataOutputStream out, long rate) throws IOException { @@ -201,7 +201,7 @@ public class HeartBeatProtocol extends SignalProtocol<Object> private TimerTask heartBeatTimerTask; /** - * @since 3.1 + * @since 4.0 */ protected Server(String type) { @@ -257,7 +257,7 @@ public class HeartBeatProtocol extends SignalProtocol<Object> } /** - * @since 3.1 + * @since 4.0 */ protected void indicatingStart(ExtendedDataInputStream in) throws IOException { diff --git a/plugins/org.gastro.rcp/META-INF/MANIFEST.MF b/plugins/org.gastro.rcp/META-INF/MANIFEST.MF index c6f06db1ab..28885eecbf 100644 --- a/plugins/org.gastro.rcp/META-INF/MANIFEST.MF +++ b/plugins/org.gastro.rcp/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.gastro.internal.rcp.Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, - org.eclipse.net4j.tcp;bundle-version="[2.0.0,4.0.0)";visibility:=reexport, + org.eclipse.net4j.tcp;bundle-version="[2.0.0,5.0.0)";visibility:=reexport, org.eclipse.ui;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, org.eclipse.emf.edit.ui;bundle-version="[2.5.0,3.0.0)";visibility:=reexport, org.gastro.business;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, diff --git a/plugins/org.gastro.server.web/META-INF/MANIFEST.MF b/plugins/org.gastro.server.web/META-INF/MANIFEST.MF index 1052df8401..8fadf3fde9 100644 --- a/plugins/org.gastro.server.web/META-INF/MANIFEST.MF +++ b/plugins/org.gastro.server.web/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)", org.eclipse.equinox.http.servlet;bundle-version="[1.0.0,2.0.0)", org.eclipse.equinox.http.jetty;bundle-version="[2.0.0,4.0.0)", org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)", - org.eclipse.net4j.jvm;bundle-version="[2.0.0,4.0.0)", + org.eclipse.net4j.jvm;bundle-version="[2.0.0,5.0.0)", org.gastro.server;bundle-version="[4.0.0,5.0.0)", org.gastro.business;bundle-version="[4.0.0,5.0.0)", org.gastro.inventory;bundle-version="[4.0.0,5.0.0)" diff --git a/plugins/org.gastro.server/META-INF/MANIFEST.MF b/plugins/org.gastro.server/META-INF/MANIFEST.MF index 07ab1fe521..c584a80aca 100644 --- a/plugins/org.gastro.server/META-INF/MANIFEST.MF +++ b/plugins/org.gastro.server/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.cdo.server.net4j;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.server.db;bundle-version="[4.0.0,5.0.0)", org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)", - org.eclipse.net4j.tcp;bundle-version="[2.0.0,4.0.0)" + org.eclipse.net4j.tcp;bundle-version="[2.0.0,5.0.0)" Bundle-Activator: org.gastro.internal.server.OM$Activator Import-Package: org.h2;version="[1.1.0,1.2.0)", org.h2.api;version="[1.1.0,1.2.0)", diff --git a/plugins/org.gastro.testclient/META-INF/MANIFEST.MF b/plugins/org.gastro.testclient/META-INF/MANIFEST.MF index 1600114a43..d4bf3ad889 100644 --- a/plugins/org.gastro.testclient/META-INF/MANIFEST.MF +++ b/plugins/org.gastro.testclient/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: CDO Gastro Example Test Client Bundle-SymbolicName: org.gastro.testclient Bundle-Version: 4.0.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Require-Bundle: org.eclipse.net4j.tcp;bundle-version="[2.0.0,4.0.0)", +Require-Bundle: org.eclipse.net4j.tcp;bundle-version="[2.0.0,5.0.0)", org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";resolution:=optional, org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)", org.gastro.business;bundle-version="[4.0.0,5.0.0)", |