diff options
author | Eike Stepper | 2013-07-30 09:02:43 +0000 |
---|---|---|
committer | Eike Stepper | 2013-07-30 09:02:43 +0000 |
commit | 708ed5f3bc8ab92269ab3b7f2114553442199bbf (patch) | |
tree | 5350165d6e78a79051821a9cbc1f904b2a9ab063 | |
parent | 038d94e32064419c44a0cddf9d5ccd4de4e28f4c (diff) | |
download | cdo-708ed5f3bc8ab92269ab3b7f2114553442199bbf.tar.gz cdo-708ed5f3bc8ab92269ab3b7f2114553442199bbf.tar.xz cdo-708ed5f3bc8ab92269ab3b7f2114553442199bbf.zip |
Adjust build for maintenance
26 files changed, 547 insertions, 56 deletions
diff --git a/features/org.eclipse.emf.cdo-feature/feature.xml b/features/org.eclipse.emf.cdo-feature/feature.xml index 7aff642346..31646d0c9e 100644 --- a/features/org.eclipse.emf.cdo-feature/feature.xml +++ b/features/org.eclipse.emf.cdo-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo" label="%featureName" - version="4.2.0.qualifier" + version="4.2.1.qualifier" provider-name="%providerName" license-feature="org.eclipse.emf.cdo.license" license-feature-version="0.0.0"> diff --git a/features/org.eclipse.emf.cdo.defs-feature/feature.xml b/features/org.eclipse.emf.cdo.defs-feature/feature.xml index 24de02834c..5a75edda39 100644 --- a/features/org.eclipse.emf.cdo.defs-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.defs-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.defs" label="%featureName" - version="4.2.0.qualifier" + version="4.2.1.qualifier" provider-name="%providerName" license-feature="org.eclipse.emf.cdo.license" license-feature-version="0.0.0"> diff --git a/features/org.eclipse.emf.cdo.epp-feature/feature.xml b/features/org.eclipse.emf.cdo.epp-feature/feature.xml index ea680ed63f..4e3a85d4d3 100644 --- a/features/org.eclipse.emf.cdo.epp-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.epp-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.epp" label="%featureName" - version="4.2.0.qualifier" + version="4.2.1.qualifier" provider-name="%providerName" license-feature="org.eclipse.emf.cdo.license" license-feature-version="0.0.0"> diff --git a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml index 7e18e5207f..ebaf7e16fe 100644 --- a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.sdk" label="%featureName" - version="4.2.0.qualifier" + version="4.2.1.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg" license-feature="org.eclipse.emf.cdo.license" diff --git a/features/org.eclipse.emf.cdo.server-feature/feature.xml b/features/org.eclipse.emf.cdo.server-feature/feature.xml index bd4b7121e8..1ac9da77ce 100644 --- a/features/org.eclipse.emf.cdo.server-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.server-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.server" label="%featureName" - version="4.2.0.qualifier" + version="4.2.1.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg" license-feature="org.eclipse.emf.cdo.license" diff --git a/features/org.eclipse.emf.cdo.site-feature/feature.xml b/features/org.eclipse.emf.cdo.site-feature/feature.xml index 1d24cdbdee..51109f2fc4 100644 --- a/features/org.eclipse.emf.cdo.site-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.site-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.site" label="CDO Model Repository Site" - version="4.2.0.qualifier" + version="4.2.1.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg" license-feature="org.eclipse.emf.cdo.license" diff --git a/features/org.eclipse.emf.cdo.tests-feature/feature.xml b/features/org.eclipse.emf.cdo.tests-feature/feature.xml index 9c760fb729..9ce9d64bb0 100644 --- a/features/org.eclipse.emf.cdo.tests-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.tests-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.tests" label="%featureName" - version="4.2.0.qualifier" + version="4.2.1.qualifier" provider-name="%providerName" license-feature="org.eclipse.emf.cdo.license" license-feature-version="0.0.0"> diff --git a/features/org.eclipse.net4j.db-feature/feature.xml b/features/org.eclipse.net4j.db-feature/feature.xml index 19419952bf..d111f695ea 100644 --- a/features/org.eclipse.net4j.db-feature/feature.xml +++ b/features/org.eclipse.net4j.db-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.net4j.db" label="%featureName" - version="4.2.0.qualifier" + version="4.2.1.qualifier" provider-name="%providerName" license-feature="org.eclipse.emf.cdo.license" license-feature-version="0.0.0"> diff --git a/features/org.eclipse.net4j.sdk-feature/feature.xml b/features/org.eclipse.net4j.sdk-feature/feature.xml index 41ba8b0ef5..0122025e91 100644 --- a/features/org.eclipse.net4j.sdk-feature/feature.xml +++ b/features/org.eclipse.net4j.sdk-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.net4j.sdk" label="%featureName" - version="4.2.0.qualifier" + version="4.2.1.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg" license-feature="org.eclipse.emf.cdo.license" diff --git a/plugins/org.eclipse.emf.cdo.admin/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.admin/.settings/.api_filters index 76dc368cfc..341e6883e9 100644 --- a/plugins/org.eclipse.emf.cdo.admin/.settings/.api_filters +++ b/plugins/org.eclipse.emf.cdo.admin/.settings/.api_filters @@ -24,5 +24,12 @@ <message_argument value="CDOAdminClientRepositoryImpl"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="CDOAdminClientRepository"/> + <message_argument value="CDOAdminClientRepositoryImpl"/> + <message_argument value="CDOAdminRepository"/> + </message_arguments> + </filter> </resource> </component> diff --git a/plugins/org.eclipse.emf.cdo.net4j/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.net4j/.settings/.api_filters index dd20e7a5f1..d6ff76681e 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/.settings/.api_filters +++ b/plugins/org.eclipse.emf.cdo.net4j/.settings/.api_filters @@ -16,6 +16,13 @@ <message_argument value="CDOSessionRecoveryEventImpl"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="CDOSessionRecoveryEvent"/> + <message_argument value="CDOSessionRecoveryEventImpl"/> + <message_argument value="CDOSessionEvent"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java" type="org.eclipse.emf.cdo.internal.net4j.protocol.CDOClientProtocol"> <filter id="574619656"> diff --git a/plugins/org.eclipse.emf.cdo.releng/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng/META-INF/MANIFEST.MF index 67041751c4..450dc1695e 100644 --- a/plugins/org.eclipse.emf.cdo.releng/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.releng/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CDO Release Engineering Bundle-SymbolicName: org.eclipse.emf.cdo.releng -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.2.1.qualifier Bundle-Vendor: Eclipse Modeling Project Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . -Export-Package: org.eclipse.emf.cdo.releng;version="4.2.0";x-internal:=true +Export-Package: org.eclipse.emf.cdo.releng;version="4.2.1";x-internal:=true diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/.api_filters index e23cfa027c..7b534aeecd 100644 --- a/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/.api_filters +++ b/plugins/org.eclipse.emf.cdo.server.hibernate/.settings/.api_filters @@ -24,5 +24,12 @@ <message_argument value="WrappedHibernateList"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="InternalCDOList"/> + <message_argument value="WrappedHibernateList"/> + <message_argument value="CDOList"/> + </message_arguments> + </filter> </resource> </component> diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server.net4j/.settings/.api_filters index 64694f0c60..5d1cff289d 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/.settings/.api_filters +++ b/plugins/org.eclipse.emf.cdo.server.net4j/.settings/.api_filters @@ -15,5 +15,11 @@ <message_argument value="ReplicateRepositoryIndication"/> </message_arguments> </filter> + <filter id="574664731"> + <message_arguments> + <message_argument value="org.eclipse.emf.cdo.server.internal.net4j.protocol.ReplicateRepositoryIndication.responding(CDODataOutput)"/> + <message_argument value="CDOReplicationContext"/> + </message_arguments> + </filter> </resource> </component> diff --git a/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters index 4a685f1204..f790337344 100644 --- a/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters +++ b/plugins/org.eclipse.emf.cdo.server/.settings/.api_filters @@ -8,6 +8,13 @@ <message_argument value="DelegatingRepository"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="InternalRepository"/> + <message_argument value="DelegatingRepository"/> + <message_argument value="CDOCommonRepository"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/cdo/internal/server/LockingManager.java" type="org.eclipse.emf.cdo.internal.server.LockingManager$DurableView"> <filter id="574619656"> @@ -23,6 +30,13 @@ <message_argument value="DurableView"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="IView"/> + <message_argument value="DurableView"/> + <message_argument value="CDOCommonView"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/cdo/internal/server/QueryManager.java" type="org.eclipse.emf.cdo.internal.server.QueryManager$QueryContext"> <filter id="574660632"> @@ -32,6 +46,13 @@ <message_argument value="QueryContext"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="IQueryContext"/> + <message_argument value="QueryContext"/> + <message_argument value="CDOBranchPoint"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/cdo/internal/server/Repository.java" type="org.eclipse.emf.cdo.internal.server.Repository"> <filter id="574619656"> @@ -47,6 +68,19 @@ <message_argument value="Repository"/> </message_arguments> </filter> + <filter id="574664731"> + <message_arguments> + <message_argument value="org.eclipse.emf.cdo.internal.server.Repository.replicateRaw(CDODataOutput, int, long)"/> + <message_argument value="CDOReplicationInfo"/> + </message_arguments> + </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="InternalRepository"/> + <message_argument value="Repository"/> + <message_argument value="CDOCommonRepository"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/cdo/internal/server/ResourcesQueryHandler.java" type="org.eclipse.emf.cdo.internal.server.ResourcesQueryHandler$QueryContext"> <filter id="574660632"> @@ -56,6 +90,13 @@ <message_argument value="QueryContext"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="QueryResourcesContext"/> + <message_argument value="QueryContext"/> + <message_argument value="CDOBranchPoint"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java" type="org.eclipse.emf.cdo.internal.server.ServerCDOView"> <filter id="574619656"> @@ -87,6 +128,13 @@ <message_argument value="Session"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="InternalSession"/> + <message_argument value="Session"/> + <message_argument value="CDOCommonSession"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/cdo/internal/server/TransactionCommitContext.java" type="org.eclipse.emf.cdo.internal.server.TransactionCommitContext$XRefContext"> <filter id="572522506"> @@ -102,6 +150,13 @@ <message_argument value="XRefContext"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="QueryXRefsContext"/> + <message_argument value="XRefContext"/> + <message_argument value="CDOBranchPoint"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/cdo/internal/server/View.java" type="org.eclipse.emf.cdo.internal.server.View"> <filter id="574619656"> @@ -117,6 +172,13 @@ <message_argument value="View"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="InternalView"/> + <message_argument value="View"/> + <message_argument value="CDOCommonView"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java" type="org.eclipse.emf.cdo.internal.server.XRefsQueryHandler$QueryContext"> <filter id="572522506"> @@ -132,6 +194,13 @@ <message_argument value="QueryContext"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="QueryXRefsContext"/> + <message_argument value="QueryContext"/> + <message_argument value="CDOBranchPoint"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionConfiguration.java" type="org.eclipse.emf.cdo.internal.server.embedded.EmbeddedClientSessionConfiguration$RepositoryInfo"> <filter id="574619656"> @@ -157,6 +226,13 @@ <message_argument value="EmbeddedServerSessionProtocol"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="ISessionProtocol"/> + <message_argument value="EmbeddedServerSessionProtocol"/> + <message_argument value="CDOProtocol"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java" type="org.eclipse.emf.cdo.internal.server.mem.MEMStoreAccessor"> <filter id="574660632"> @@ -190,6 +266,12 @@ <message_argument value="WriteThroughCommitContext"/> </message_arguments> </filter> + <filter id="574664731"> + <message_arguments> + <message_argument value="org.eclipse.emf.cdo.internal.server.syncing.SynchronizableRepository.WriteThroughCommitContext.commit(OMMonitor)"/> + <message_argument value="InternalCDOCommitContext"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/cdo/server/IQueryContext.java" type="org.eclipse.emf.cdo.server.IQueryContext"> <filter id="571473929"> @@ -279,6 +361,13 @@ <message_argument value="DelegatingQueryResourcesContext"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="QueryResourcesContext"/> + <message_argument value="DelegatingQueryResourcesContext"/> + <message_argument value="CDOBranchPoint"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/cdo/spi/server/DurableLockArea.java" type="org.eclipse.emf.cdo.spi.server.DurableLockArea"> <filter id="574619656"> @@ -328,5 +417,12 @@ <message_argument value="Store"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="org.eclipse.emf.cdo.spi.server.Store.createExactMatchContext(CDOID, String, CDOBranchPoint)"/> + <message_argument value="ExactMatch"/> + <message_argument value="CDOBranchPoint"/> + </message_arguments> + </filter> </resource> </component> diff --git a/plugins/org.eclipse.emf.cdo.tests.all/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.all/META-INF/MANIFEST.MF index 27564c4908..707ec0e2a7 100644 --- a/plugins/org.eclipse.emf.cdo.tests.all/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.all/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.all;singleton:=true -Bundle-Version: 4.1.100.qualifier +Bundle-Version: 4.1.101.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -12,5 +12,5 @@ Bundle-ClassPath: . Require-Bundle: org.eclipse.net4j.tests;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.tests.db;bundle-version="[4.0.0,5.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.tests.all;version="4.1.100";x-internal:=true, - org.eclipse.emf.cdo.tests.all.bundle;version="4.1.100";x-internal:=true +Export-Package: org.eclipse.emf.cdo.tests.all;version="4.1.101";x-internal:=true, + org.eclipse.emf.cdo.tests.all.bundle;version="4.1.101";x-internal:=true diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.transfer.ui/.settings/.api_filters index d06de34973..fba41876cd 100644 --- a/plugins/org.eclipse.emf.cdo.transfer.ui/.settings/.api_filters +++ b/plugins/org.eclipse.emf.cdo.transfer.ui/.settings/.api_filters @@ -1,5 +1,93 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.emf.cdo.transfer.ui" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="923795461"> + <message_arguments> + <message_argument value="4.2.0"/> + <message_argument value="4.2.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.AbstractWindowHandler"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.AbstractWindowHandler"/> + <message_argument value="org.eclipse.emf.cdo.transfer.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.ArrangeWindowsHandler"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.ArrangeWindowsHandler"/> + <message_argument value="org.eclipse.emf.cdo.transfer.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.CloseDialogHandler"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.CloseDialogHandler"/> + <message_argument value="org.eclipse.emf.cdo.transfer.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.CocoaTitlePathUpdater"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.CocoaTitlePathUpdater"/> + <message_argument value="org.eclipse.emf.cdo.transfer.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.CocoaUIEnhancer"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.CocoaUIEnhancer"/> + <message_argument value="org.eclipse.emf.cdo.transfer.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.CocoaUtil"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.CocoaUtil"/> + <message_argument value="org.eclipse.emf.cdo.transfer.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.FullscreenWindowHandler"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.FullscreenWindowHandler"/> + <message_argument value="org.eclipse.emf.cdo.transfer.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.MinimizeWindowHandler"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.MinimizeWindowHandler"/> + <message_argument value="org.eclipse.emf.cdo.transfer.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.SWTCocoaEnhancerDelegate"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.SWTCocoaEnhancerDelegate"/> + <message_argument value="org.eclipse.emf.cdo.transfer.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.ZoomWindowHandler"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.ZoomWindowHandler"/> + <message_argument value="org.eclipse.emf.cdo.transfer.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/emf/cdo/transfer/ui/swt/TransferDetailsComposite.java" type="org.eclipse.emf.cdo.transfer.ui.swt.TransferDetailsComposite"> <filter id="574619656"> <message_arguments> @@ -7,5 +95,11 @@ <message_argument value="TransferDetailsComposite"/> </message_arguments> </filter> + <filter id="574664731"> + <message_arguments> + <message_argument value="org.eclipse.emf.cdo.transfer.ui.swt.TransferDetailsComposite"/> + <message_argument value="ModelTransferResolution"/> + </message_arguments> + </filter> </resource> </component> diff --git a/plugins/org.eclipse.emf.cdo.ui/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.ui/.settings/.api_filters index 079ecfe38b..afccb2a7b2 100644 --- a/plugins/org.eclipse.emf.cdo.ui/.settings/.api_filters +++ b/plugins/org.eclipse.emf.cdo.ui/.settings/.api_filters @@ -7,6 +7,12 @@ <message_argument value="4.1.0"/> </message_arguments> </filter> + <filter id="923795461"> + <message_arguments> + <message_argument value="4.2.0"/> + <message_argument value="4.2.0"/> + </message_arguments> + </filter> </resource> <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.IContributorResourceAdapter"> <filter id="305422471"> @@ -800,6 +806,86 @@ </message_arguments> </filter> </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.AbstractWindowHandler"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.AbstractWindowHandler"/> + <message_argument value="org.eclipse.emf.cdo.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.ArrangeWindowsHandler"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.ArrangeWindowsHandler"/> + <message_argument value="org.eclipse.emf.cdo.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.CloseDialogHandler"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.CloseDialogHandler"/> + <message_argument value="org.eclipse.emf.cdo.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.CocoaTitlePathUpdater"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.CocoaTitlePathUpdater"/> + <message_argument value="org.eclipse.emf.cdo.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.CocoaUIEnhancer"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.CocoaUIEnhancer"/> + <message_argument value="org.eclipse.emf.cdo.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.CocoaUtil"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.CocoaUtil"/> + <message_argument value="org.eclipse.emf.cdo.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.FullscreenWindowHandler"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.FullscreenWindowHandler"/> + <message_argument value="org.eclipse.emf.cdo.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.MinimizeWindowHandler"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.MinimizeWindowHandler"/> + <message_argument value="org.eclipse.emf.cdo.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.SWTCocoaEnhancerDelegate"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.SWTCocoaEnhancerDelegate"/> + <message_argument value="org.eclipse.emf.cdo.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.ZoomWindowHandler"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.ZoomWindowHandler"/> + <message_argument value="org.eclipse.emf.cdo.ui_4.2.0"/> + </message_arguments> + </filter> + </resource> <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.model.WorkbenchContentProvider"> <filter id="305422471"> <message_arguments> diff --git a/plugins/org.eclipse.emf.cdo/.settings/.api_filters b/plugins/org.eclipse.emf.cdo/.settings/.api_filters index bc4fc62718..a8efbde16d 100644 --- a/plugins/org.eclipse.emf.cdo/.settings/.api_filters +++ b/plugins/org.eclipse.emf.cdo/.settings/.api_filters @@ -117,6 +117,13 @@ <message_argument value="CDOPushTransaction"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="CDOTransaction"/> + <message_argument value="CDOPushTransaction"/> + <message_argument value="CDOCommonView"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/cdo/transaction/CDOSavepoint.java" type="org.eclipse.emf.cdo.transaction.CDOSavepoint"> <filter id="571473929"> @@ -518,6 +525,13 @@ <message_argument value="CDOObjectReferenceImpl"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="CDOObjectReference"/> + <message_argument value="CDOObjectReferenceImpl"/> + <message_argument value="CDOReference<OBJECT>"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java" type="org.eclipse.emf.internal.cdo.session.CDOSessionImpl"> <filter id="574660632"> @@ -527,6 +541,13 @@ <message_argument value="CDOSessionImpl"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="InternalCDOSession"/> + <message_argument value="CDOSessionImpl"/> + <message_argument value="CDOCommonSession"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java" type="org.eclipse.emf.internal.cdo.session.CDOSessionImpl$OptionsImpl"> <filter id="574660632"> @@ -536,6 +557,13 @@ <message_argument value="OptionsImpl"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="Options"/> + <message_argument value="OptionsImpl"/> + <message_argument value="Options"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/internal/cdo/session/DelegatingSessionProtocol.java" type="org.eclipse.emf.internal.cdo.session.DelegatingSessionProtocol"> <filter id="574660632"> @@ -545,6 +573,13 @@ <message_argument value="DelegatingSessionProtocol"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="CDOSessionProtocol"/> + <message_argument value="DelegatingSessionProtocol"/> + <message_argument value="CDOProtocol"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/internal/cdo/session/SessionProperties.java" type="org.eclipse.emf.internal.cdo.session.SessionProperties"> <filter id="574619656"> @@ -570,6 +605,13 @@ <message_argument value="AbstractCDOView"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="InternalCDOView"/> + <message_argument value="AbstractCDOView"/> + <message_argument value="CDOCommonView"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java" type="org.eclipse.emf.internal.cdo.view.CDOViewImpl$OptionsImpl"> <filter id="574660632"> @@ -579,6 +621,13 @@ <message_argument value="OptionsImpl"/> </message_arguments> </filter> + <filter id="574668824"> + <message_arguments> + <message_argument value="Options"/> + <message_argument value="OptionsImpl"/> + <message_argument value="Options"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java" type="org.eclipse.emf.internal.cdo.view.CDOViewImpl$OptionsImpl$LockNotificationEventImpl"> <filter id="574619656"> diff --git a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF index f07f09cb13..37858a562b 100644 --- a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo; singleton:=true -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.2.1.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,43 +10,43 @@ Bundle-Activator: org.eclipse.emf.internal.cdo.bundle.Activator$Implementation Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)";resolution:=optional, org.eclipse.emf.cdo.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo;version="4.2.0", - org.eclipse.emf.cdo.eresource;version="4.2.0", - org.eclipse.emf.cdo.eresource.impl;version="4.2.0", - org.eclipse.emf.cdo.eresource.util;version="4.2.0", - org.eclipse.emf.cdo.eresource.validation;version="4.2.0", - org.eclipse.emf.cdo.etypes;version="4.2.0", - org.eclipse.emf.cdo.etypes.impl;version="4.2.0", - org.eclipse.emf.cdo.etypes.util;version="4.2.0", - org.eclipse.emf.cdo.session;version="4.2.0", - org.eclipse.emf.cdo.session.remote;version="4.2.0", - org.eclipse.emf.cdo.transaction;version="4.2.0", - org.eclipse.emf.cdo.util;version="4.2.0", - org.eclipse.emf.cdo.view;version="4.2.0", - org.eclipse.emf.internal.cdo;version="4.2.0", - org.eclipse.emf.internal.cdo.analyzer;version="4.2.0"; +Export-Package: org.eclipse.emf.cdo;version="4.2.1", + org.eclipse.emf.cdo.eresource;version="4.2.1", + org.eclipse.emf.cdo.eresource.impl;version="4.2.1", + org.eclipse.emf.cdo.eresource.util;version="4.2.1", + org.eclipse.emf.cdo.eresource.validation;version="4.2.1", + org.eclipse.emf.cdo.etypes;version="4.2.1", + org.eclipse.emf.cdo.etypes.impl;version="4.2.1", + org.eclipse.emf.cdo.etypes.util;version="4.2.1", + org.eclipse.emf.cdo.session;version="4.2.1", + org.eclipse.emf.cdo.session.remote;version="4.2.1", + org.eclipse.emf.cdo.transaction;version="4.2.1", + org.eclipse.emf.cdo.util;version="4.2.1", + org.eclipse.emf.cdo.view;version="4.2.1", + org.eclipse.emf.internal.cdo;version="4.2.1", + org.eclipse.emf.internal.cdo.analyzer;version="4.2.1"; x-friends:="org.eclipse.emf.cdo.net4j, org.eclipse.emf.cdo.server, org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.defs, org.eclipse.emf.cdo.ui", - org.eclipse.emf.internal.cdo.bundle;version="4.2.0";x-friends:="org.eclipse.emf.cdo.ui", - org.eclipse.emf.internal.cdo.messages;version="4.2.0";x-internal:=true, - org.eclipse.emf.internal.cdo.object;version="4.2.0"; + org.eclipse.emf.internal.cdo.bundle;version="4.2.1";x-friends:="org.eclipse.emf.cdo.ui", + org.eclipse.emf.internal.cdo.messages;version="4.2.1";x-internal:=true, + org.eclipse.emf.internal.cdo.object;version="4.2.1"; x-friends:="org.eclipse.emf.cdo.net4j, org.eclipse.emf.cdo.server, org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.defs, org.eclipse.emf.cdo.ui, org.eclipse.emf.cdo.ui.ide", - org.eclipse.emf.internal.cdo.query;version="4.2.0"; + org.eclipse.emf.internal.cdo.query;version="4.2.1"; x-friends:="org.eclipse.emf.cdo.net4j, org.eclipse.emf.cdo.server, org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.defs, org.eclipse.emf.cdo.ui, org.eclipse.emf.cdo.tests.objectivity", - org.eclipse.emf.internal.cdo.session;version="4.2.0"; + org.eclipse.emf.internal.cdo.session;version="4.2.1"; x-friends:="org.eclipse.emf.cdo.net4j, org.eclipse.emf.cdo.server, org.eclipse.emf.cdo.tests, @@ -54,30 +54,30 @@ Export-Package: org.eclipse.emf.cdo;version="4.2.0", org.eclipse.emf.cdo.ui, org.eclipse.emf.cdo.team, org.eclipse.emf.cdo.ui.admin", - org.eclipse.emf.internal.cdo.session.remote;version="4.2.0"; + org.eclipse.emf.internal.cdo.session.remote;version="4.2.1"; x-friends:="org.eclipse.emf.cdo.net4j, org.eclipse.emf.cdo.server, org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.defs, org.eclipse.emf.cdo.ui", - org.eclipse.emf.internal.cdo.transaction;version="4.2.0"; + org.eclipse.emf.internal.cdo.transaction;version="4.2.1"; x-friends:="org.eclipse.emf.cdo.net4j, org.eclipse.emf.cdo.server, org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.defs, org.eclipse.emf.cdo.ui", - org.eclipse.emf.internal.cdo.util;version="4.2.0"; + org.eclipse.emf.internal.cdo.util;version="4.2.1"; x-friends:="org.eclipse.emf.cdo.net4j, org.eclipse.emf.cdo.server, org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.defs, org.eclipse.emf.cdo.ui", - org.eclipse.emf.internal.cdo.view;version="4.2.0"; + org.eclipse.emf.internal.cdo.view;version="4.2.1"; x-friends:="org.eclipse.emf.cdo.net4j, org.eclipse.emf.cdo.server, org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.defs, org.eclipse.emf.cdo.ui, org.eclipse.emf.cdo.ui.ide", - org.eclipse.emf.spi.cdo;version="4.2.0" + org.eclipse.emf.spi.cdo;version="4.2.1" Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/DanglingIntegrityException.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/DanglingIntegrityException.java index 8a46f2d527..2f1ce48217 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/DanglingIntegrityException.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/DanglingIntegrityException.java @@ -37,7 +37,7 @@ public class DanglingIntegrityException extends DataIntegrityException } @Override - public DanglingReferenceException getCause() + public synchronized DanglingReferenceException getCause() { return (DanglingReferenceException)super.getCause(); } diff --git a/plugins/org.eclipse.net4j.db/.settings/org.eclipse.pde.api.tools.prefs b/plugins/org.eclipse.net4j.db/.settings/org.eclipse.pde.api.tools.prefs index 0c17d59e45..931387f3eb 100644 --- a/plugins/org.eclipse.net4j.db/.settings/org.eclipse.pde.api.tools.prefs +++ b/plugins/org.eclipse.net4j.db/.settings/org.eclipse.pde.api.tools.prefs @@ -1,4 +1,3 @@ -#Thu Feb 04 09:44:24 CET 2010 ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error @@ -8,6 +7,9 @@ API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error +API_USE_SCAN_FIELD_SEVERITY=Error +API_USE_SCAN_METHOD_SEVERITY=Error +API_USE_SCAN_TYPE_SEVERITY=Error CLASS_ELEMENT_TYPE_ADDED_METHOD=Error CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error @@ -59,8 +61,7 @@ INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error INVALID_JAVADOC_TAG=Ignore -INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error -MISSING_EE_DESCRIPTIONS=Warning +INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore LEAK_EXTEND=Warning LEAK_FIELD_DECL=Warning LEAK_IMPLEMENT=Warning @@ -76,6 +77,7 @@ METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error +MISSING_EE_DESCRIPTIONS=Warning TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error diff --git a/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF index e3bd28b3f9..55f186e4e0 100644 --- a/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.net4j.db;singleton:=true -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.2.1.qualifier Bundle-Activator: org.eclipse.net4j.internal.db.bundle.OM$Activator Bundle-Vendor: %providerName Bundle-ClassPath: . @@ -10,16 +10,16 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.net4j.db;version="4.2.0", - org.eclipse.net4j.db.ddl;version="4.2.0", - org.eclipse.net4j.db.ddl.delta;version="4.2.0", - org.eclipse.net4j.db.dml;version="4.2.0", - org.eclipse.net4j.internal.db;version="4.2.0";x-internal:=true, - org.eclipse.net4j.internal.db.bundle;version="4.2.0";x-internal:=true, - org.eclipse.net4j.internal.db.ddl;version="4.2.0";x-internal:=true, - org.eclipse.net4j.internal.db.ddl.delta;version="4.2.0";x-internal:=true, - org.eclipse.net4j.internal.db.dml;version="4.2.0";x-internal:=true, - org.eclipse.net4j.spi.db;version="4.2.0", - org.eclipse.net4j.spi.db.ddl;version="4.2.0" +Export-Package: org.eclipse.net4j.db;version="4.2.1", + org.eclipse.net4j.db.ddl;version="4.2.1", + org.eclipse.net4j.db.ddl.delta;version="4.2.1", + org.eclipse.net4j.db.dml;version="4.2.1", + org.eclipse.net4j.internal.db;version="4.2.1";x-internal:=true, + org.eclipse.net4j.internal.db.bundle;version="4.2.1";x-internal:=true, + org.eclipse.net4j.internal.db.ddl;version="4.2.1";x-internal:=true, + org.eclipse.net4j.internal.db.ddl.delta;version="4.2.1";x-internal:=true, + org.eclipse.net4j.internal.db.dml;version="4.2.1";x-internal:=true, + org.eclipse.net4j.spi.db;version="4.2.1", + org.eclipse.net4j.spi.db.ddl;version="4.2.1" Bundle-ActivationPolicy: lazy Eclipse-BuddyPolicy: registered diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBConnection.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBConnection.java index 01a30be35e..1668bc72e9 100644 --- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBConnection.java +++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBConnection.java @@ -36,6 +36,7 @@ import java.util.Map; import java.util.Properties; import java.util.Set; import java.util.TreeMap; +import java.util.concurrent.Executor; /** * @author Eike Stepper @@ -390,6 +391,31 @@ public final class DBConnection implements IDBConnection return delegate.createStruct(typeName, attributes); } + public void abort(Executor arg0) throws SQLException + { + delegate.abort(arg0); + } + + public int getNetworkTimeout() throws SQLException + { + return delegate.getNetworkTimeout(); + } + + public String getSchema() throws SQLException + { + return delegate.getSchema(); + } + + public void setNetworkTimeout(Executor arg0, int arg1) throws SQLException + { + delegate.setNetworkTimeout(arg0, arg1); + } + + public void setSchema(String arg0) throws SQLException + { + delegate.setSchema(arg0); + } + @Deprecated public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBPreparedStatement.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBPreparedStatement.java index e7800f2ab9..9af712f4b5 100644 --- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBPreparedStatement.java +++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBPreparedStatement.java @@ -587,6 +587,16 @@ public final class DBPreparedStatement implements IDBPreparedStatement delegate.setNClob(parameterIndex, reader); } + public void closeOnCompletion() throws SQLException + { + delegate.closeOnCompletion(); + } + + public boolean isCloseOnCompletion() throws SQLException + { + return delegate.isCloseOnCompletion(); + } + /** * @author Eike Stepper */ @@ -1548,5 +1558,15 @@ public final class DBPreparedStatement implements IDBPreparedStatement delegate.updateNClob(columnLabel, reader); } + public <T> T getObject(int arg0, Class<T> arg1) throws SQLException + { + return delegate.getObject(arg0, arg1); + } + + public <T> T getObject(String arg0, Class<T> arg1) throws SQLException + { + return delegate.getObject(arg0, arg1); + } + } } diff --git a/plugins/org.eclipse.net4j.util.ui/.settings/.api_filters b/plugins/org.eclipse.net4j.util.ui/.settings/.api_filters new file mode 100644 index 0000000000..d4fea90d6b --- /dev/null +++ b/plugins/org.eclipse.net4j.util.ui/.settings/.api_filters @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.net4j.util.ui" version="2"> + <resource path="META-INF/MANIFEST.MF"> + <filter id="923795461"> + <message_arguments> + <message_argument value="3.3.0"/> + <message_argument value="3.3.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.AbstractWindowHandler"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.AbstractWindowHandler"/> + <message_argument value="org.eclipse.net4j.util.ui_3.3.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.ArrangeWindowsHandler"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.ArrangeWindowsHandler"/> + <message_argument value="org.eclipse.net4j.util.ui_3.3.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.CloseDialogHandler"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.CloseDialogHandler"/> + <message_argument value="org.eclipse.net4j.util.ui_3.3.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.CocoaTitlePathUpdater"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.CocoaTitlePathUpdater"/> + <message_argument value="org.eclipse.net4j.util.ui_3.3.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.CocoaUIEnhancer"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.CocoaUIEnhancer"/> + <message_argument value="org.eclipse.net4j.util.ui_3.3.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.CocoaUtil"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.CocoaUtil"/> + <message_argument value="org.eclipse.net4j.util.ui_3.3.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.FullscreenWindowHandler"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.FullscreenWindowHandler"/> + <message_argument value="org.eclipse.net4j.util.ui_3.3.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.MinimizeWindowHandler"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.MinimizeWindowHandler"/> + <message_argument value="org.eclipse.net4j.util.ui_3.3.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.SWTCocoaEnhancerDelegate"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.SWTCocoaEnhancerDelegate"/> + <message_argument value="org.eclipse.net4j.util.ui_3.3.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.internal.cocoa.ZoomWindowHandler"> + <filter id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.ui.internal.cocoa.ZoomWindowHandler"/> + <message_argument value="org.eclipse.net4j.util.ui_3.3.0"/> + </message_arguments> + </filter> + </resource> +</component> |