Bug 419369 - Use IService instead of IService2
https://bugs.eclipse.org/bugs/show_bug.cgi?id=419369
Change-Id: Ibfa7e4b41cd6076e59fd1f78f16f996b668a4911
Reviewed-on: https://git.eclipse.org/r/17358
Tested-by: Hudson CI
Reviewed-by: Matthias Villiger <mvi@bsiag.com>
IP-Clean: Matthias Villiger <mvi@bsiag.com>
diff --git a/org.eclipse.scout.sdk.test/resources/bugsBeforeOpensource/77596/com.bsiag.miniapp.shared/src/com/bsiag/miniapp/shared/services/common/text/DefaultTextProviderService.java b/org.eclipse.scout.sdk.test/resources/bugsBeforeOpensource/77596/com.bsiag.miniapp.shared/src/com/bsiag/miniapp/shared/services/common/text/DefaultTextProviderService.java
index 21fc64f..f301c65 100644
--- a/org.eclipse.scout.sdk.test/resources/bugsBeforeOpensource/77596/com.bsiag.miniapp.shared/src/com/bsiag/miniapp/shared/services/common/text/DefaultTextProviderService.java
+++ b/org.eclipse.scout.sdk.test/resources/bugsBeforeOpensource/77596/com.bsiag.miniapp.shared/src/com/bsiag/miniapp/shared/services/common/text/DefaultTextProviderService.java
@@ -1,9 +1,9 @@
package com.bsiag.miniapp.shared.services.common.text;
import org.eclipse.scout.rt.shared.services.common.text.AbstractDynamicNlsTextProviderService;
-import org.eclipse.scout.service.IService2;
+import org.eclipse.scout.service.IService;
-public class DefaultTextProviderService extends AbstractDynamicNlsTextProviderService implements IService2{
+public class DefaultTextProviderService extends AbstractDynamicNlsTextProviderService implements IService {
@Override
protected String getDynamicNlsBaseName() {
diff --git a/org.eclipse.scout.sdk.test/resources/operation/annotations/test.shared/src/test/shared/services/common/text/DefaultTextProviderService.java b/org.eclipse.scout.sdk.test/resources/operation/annotations/test.shared/src/test/shared/services/common/text/DefaultTextProviderService.java
index a5d42e9..c962459 100644
--- a/org.eclipse.scout.sdk.test/resources/operation/annotations/test.shared/src/test/shared/services/common/text/DefaultTextProviderService.java
+++ b/org.eclipse.scout.sdk.test/resources/operation/annotations/test.shared/src/test/shared/services/common/text/DefaultTextProviderService.java
@@ -1,9 +1,9 @@
package test.shared.services.common.text;
import org.eclipse.scout.rt.shared.services.common.text.AbstractDynamicNlsTextProviderService;
-import org.eclipse.scout.service.IService2;
+import org.eclipse.scout.service.IService;
-public class DefaultTextProviderService extends AbstractDynamicNlsTextProviderService implements IService2{
+public class DefaultTextProviderService extends AbstractDynamicNlsTextProviderService implements IService {
@Override
protected String getDynamicNlsBaseName(){
diff --git a/org.eclipse.scout.sdk.test/resources/operation/formData/formdata.shared/src/formdata/shared/services/common/text/DefaultTextProviderService.java b/org.eclipse.scout.sdk.test/resources/operation/formData/formdata.shared/src/formdata/shared/services/common/text/DefaultTextProviderService.java
index 38de36d..6899c6e 100644
--- a/org.eclipse.scout.sdk.test/resources/operation/formData/formdata.shared/src/formdata/shared/services/common/text/DefaultTextProviderService.java
+++ b/org.eclipse.scout.sdk.test/resources/operation/formData/formdata.shared/src/formdata/shared/services/common/text/DefaultTextProviderService.java
@@ -1,9 +1,9 @@
package formdata.shared.services.common.text;
import org.eclipse.scout.rt.shared.services.common.text.AbstractDynamicNlsTextProviderService;
-import org.eclipse.scout.service.IService2;
+import org.eclipse.scout.service.IService;
-public class DefaultTextProviderService extends AbstractDynamicNlsTextProviderService implements IService2{
+public class DefaultTextProviderService extends AbstractDynamicNlsTextProviderService implements IService {
@Override
protected String getDynamicNlsBaseName() {
diff --git a/org.eclipse.scout.sdk.test/resources/operation/sampleProject/sample.shared/src/sample/shared/empty/IEmptyService.java b/org.eclipse.scout.sdk.test/resources/operation/sampleProject/sample.shared/src/sample/shared/empty/IEmptyService.java
index e5d1be7..5e8859b 100644
--- a/org.eclipse.scout.sdk.test/resources/operation/sampleProject/sample.shared/src/sample/shared/empty/IEmptyService.java
+++ b/org.eclipse.scout.sdk.test/resources/operation/sampleProject/sample.shared/src/sample/shared/empty/IEmptyService.java
@@ -3,10 +3,10 @@
import org.eclipse.scout.commons.exception.ProcessingException;
import org.eclipse.scout.rt.shared.validate.IValidationStrategy;
import org.eclipse.scout.rt.shared.validate.InputValidation;
-import org.eclipse.scout.service.IService2;
+import org.eclipse.scout.service.IService;
@InputValidation(IValidationStrategy.PROCESS.class)
-public interface IEmptyService extends IService2 {
+public interface IEmptyService extends IService {
EmptyFormData prepareCreate(EmptyFormData formData) throws ProcessingException;
diff --git a/org.eclipse.scout.sdk.test/resources/operation/sampleProject/sample.shared/src/sample/shared/person/IPersonService.java b/org.eclipse.scout.sdk.test/resources/operation/sampleProject/sample.shared/src/sample/shared/person/IPersonService.java
index f95ed76..76e97fa 100644
--- a/org.eclipse.scout.sdk.test/resources/operation/sampleProject/sample.shared/src/sample/shared/person/IPersonService.java
+++ b/org.eclipse.scout.sdk.test/resources/operation/sampleProject/sample.shared/src/sample/shared/person/IPersonService.java
@@ -3,10 +3,10 @@
import org.eclipse.scout.commons.exception.ProcessingException;
import org.eclipse.scout.rt.shared.validate.IValidationStrategy;
import org.eclipse.scout.rt.shared.validate.InputValidation;
-import org.eclipse.scout.service.IService2;
+import org.eclipse.scout.service.IService;
@InputValidation(IValidationStrategy.PROCESS.class)
-public interface IPersonService extends IService2 {
+public interface IPersonService extends IService {
PersonFormData prepareCreate(PersonFormData formData) throws ProcessingException;
diff --git a/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/internal/test/operation/service/CalendarServiceNewOperationTest.java b/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/internal/test/operation/service/CalendarServiceNewOperationTest.java
index 3c38287..1a513af 100644
--- a/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/internal/test/operation/service/CalendarServiceNewOperationTest.java
+++ b/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/internal/test/operation/service/CalendarServiceNewOperationTest.java
@@ -21,7 +21,7 @@
/**
* <h3>{@link CalendarServiceNewOperationTest}</h3> ...
- *
+ *
* @author aho
* @since 3.8.0 14.03.2013
*/
@@ -34,7 +34,7 @@
serviceOp.setImplementationPackageName("sample.server.services.test.output");
serviceOp.setInterfaceProject(getSharedJavaProject());
serviceOp.setInterfacePackageName("sample.shared.services.test.output");
- serviceOp.setImplementationSuperTypeSignature(RuntimeClasses.getSuperTypeSignature(RuntimeClasses.IService2, getServerJavaProject()));
+ serviceOp.setImplementationSuperTypeSignature(RuntimeClasses.getSuperTypeSignature(RuntimeClasses.IService, getServerJavaProject()));
serviceOp.addInterfaceInterfaceSignature(SignatureCache.createTypeSignature(RuntimeClasses.ICalendarService));
executeBuildAssertNoCompileErrors(serviceOp);
diff --git a/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/internal/test/operation/service/ProcessServiceNewOperationTest.java b/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/internal/test/operation/service/ProcessServiceNewOperationTest.java
index 623e407..841fc5b 100644
--- a/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/internal/test/operation/service/ProcessServiceNewOperationTest.java
+++ b/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/internal/test/operation/service/ProcessServiceNewOperationTest.java
@@ -20,7 +20,7 @@
/**
* <h3>{@link ProcessServiceNewOperationTest}</h3> ...
- *
+ *
* @author aho
* @since 3.8.0 14.03.2013
*/
@@ -33,7 +33,7 @@
serviceOp.setImplementationPackageName("sample.server.services.test.output");
serviceOp.setInterfaceProject(getSharedJavaProject());
serviceOp.setInterfacePackageName("sample.shared.services.test.output");
- serviceOp.setImplementationSuperTypeSignature(RuntimeClasses.getSuperTypeSignature(RuntimeClasses.IService2, getServerJavaProject()));
+ serviceOp.setImplementationSuperTypeSignature(RuntimeClasses.getSuperTypeSignature(RuntimeClasses.IService, getServerJavaProject()));
serviceOp.setFormData(TypeUtility.getType("sample.shared.form.data.TestFormData"));
serviceOp.setPermissionsEntityName("Test01");
serviceOp.setPermissionsProject(getSharedJavaProject());
diff --git a/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/internal/test/operation/service/ServiceNewOperationTest.java b/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/internal/test/operation/service/ServiceNewOperationTest.java
index a423e2d..69babde 100644
--- a/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/internal/test/operation/service/ServiceNewOperationTest.java
+++ b/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/internal/test/operation/service/ServiceNewOperationTest.java
@@ -26,7 +26,7 @@
/**
* <h3>{@link ServiceNewOperationTest}</h3> ...
- *
+ *
* @author aho
* @since 3.8.0 14.03.2013
*/
@@ -39,7 +39,7 @@
serviceOp.setImplementationPackageName("sample.server.services.test.output");
serviceOp.setInterfaceProject(getSharedJavaProject());
serviceOp.setInterfacePackageName("sample.shared.services.test.output");
- serviceOp.setImplementationSuperTypeSignature(RuntimeClasses.getSuperTypeSignature(RuntimeClasses.IService2, getServerJavaProject()));
+ serviceOp.setImplementationSuperTypeSignature(RuntimeClasses.getSuperTypeSignature(RuntimeClasses.IService, getServerJavaProject()));
executeBuildAssertNoCompileErrors(serviceOp);
SdkAssert.assertExist(serviceOp.getCreatedServiceInterface());
@@ -52,7 +52,7 @@
ServiceNewOperation serviceOp = new ServiceNewOperation(null, "TestService02");
serviceOp.setImplementationProject(getServerJavaProject());
serviceOp.setImplementationPackageName("sample.server.services.test.output");
- serviceOp.setImplementationSuperTypeSignature(RuntimeClasses.getSuperTypeSignature(RuntimeClasses.IService2, getServerJavaProject()));
+ serviceOp.setImplementationSuperTypeSignature(RuntimeClasses.getSuperTypeSignature(RuntimeClasses.IService, getServerJavaProject()));
executeBuildAssertNoCompileErrors(serviceOp);
SdkAssert.assertNotExist(serviceOp.getCreatedServiceInterface());
SdkAssert.assertExist(serviceOp.getCreatedServiceImplementation());
@@ -67,7 +67,7 @@
serviceOp.setInterfaceProject(getSharedJavaProject());
serviceOp.setInterfacePackageName("sample.shared.services.test.output");
serviceOp.addProxyRegistrationProject(getClientJavaProject());
- serviceOp.setImplementationSuperTypeSignature(RuntimeClasses.getSuperTypeSignature(RuntimeClasses.IService2, getServerJavaProject()));
+ serviceOp.setImplementationSuperTypeSignature(RuntimeClasses.getSuperTypeSignature(RuntimeClasses.IService, getServerJavaProject()));
executeBuildAssertNoCompileErrors(serviceOp);
IType serviceInterface = serviceOp.getCreatedServiceInterface();
@@ -87,7 +87,7 @@
serviceOp.setImplementationPackageName("sample.server.services.test.output");
serviceOp.setInterfaceProject(getSharedJavaProject());
serviceOp.setInterfacePackageName("sample.shared.services.test.output");
- serviceOp.setImplementationSuperTypeSignature(RuntimeClasses.getSuperTypeSignature(RuntimeClasses.IService2, getServerJavaProject()));
+ serviceOp.setImplementationSuperTypeSignature(RuntimeClasses.getSuperTypeSignature(RuntimeClasses.IService, getServerJavaProject()));
String methodName = "doStuff";
ServiceMethod method = new ServiceMethod(methodName, serviceOp.getInterfacePackageName() + "." + serviceOp.getInterfaceName());
diff --git a/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/internal/test/types/TypeHierarchyTest1.java b/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/internal/test/types/TypeHierarchyTest1.java
index 7a8b191..e73e5d2 100644
--- a/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/internal/test/types/TypeHierarchyTest1.java
+++ b/org.eclipse.scout.sdk.test/src/org/eclipse/scout/sdk/internal/test/types/TypeHierarchyTest1.java
@@ -125,7 +125,7 @@
serviceOp.addServiceRegistrationProject(serverBundle.getJavaProject());
serviceOp.setImplementationProject(serverBundle.getJavaProject());
serviceOp.setInterfaceProject(sharedBundle.getJavaProject());
- serviceOp.addInterfaceInterfaceSignature(SignatureCache.createTypeSignature(RuntimeClasses.IService2));
+ serviceOp.addInterfaceInterfaceSignature(SignatureCache.createTypeSignature(RuntimeClasses.IService));
serviceOp.setInterfacePackageName(sharedBundle.getDefaultPackage(IDefaultTargetPackage.SHARED_SERVICES) + ".notexisting");
serviceOp.setImplementationPackageName(serverBundle.getDefaultPackage(IDefaultTargetPackage.SERVER_SERVICES) + ".notexisting");
serviceOp.setImplementationSuperTypeSignature(RuntimeClasses.getSuperTypeSignature(RuntimeClasses.IService, serverBundle.getJavaProject()));
diff --git a/org.eclipse.scout.sdk/plugin.xml b/org.eclipse.scout.sdk/plugin.xml
index 31a4ef3..3120f49 100644
--- a/org.eclipse.scout.sdk/plugin.xml
+++ b/org.eclipse.scout.sdk/plugin.xml
@@ -597,12 +597,6 @@
</default>
</element>
<element
- interface="org.eclipse.scout.service.IService2">
- <default
- class="org.eclipse.scout.service.AbstractService">
- </default>
- </element>
- <element
interface="org.eclipse.scout.rt.client.ui.form.fields.smartfield.ISmartField">
<default
class="org.eclipse.scout.rt.client.ui.form.fields.smartfield.AbstractSmartField">
diff --git a/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/extensions/runtime/classes/IRuntimeClasses.java b/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/extensions/runtime/classes/IRuntimeClasses.java
index 27e6bc0..712e3d5 100644
--- a/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/extensions/runtime/classes/IRuntimeClasses.java
+++ b/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/extensions/runtime/classes/IRuntimeClasses.java
@@ -15,7 +15,7 @@
/**
* <h3>{@link RuntimeClasses}</h3> ...
- *
+ *
* @author Andreas Hoegger
* @since 1.0.8 24.01.2009
*/
@@ -178,7 +178,6 @@
String ISequenceBox = "org.eclipse.scout.rt.client.ui.form.fields.sequencebox.ISequenceBox"; // NO_UCD
String IServerSession = "org.eclipse.scout.rt.server.IServerSession"; // NO_UCD
String IService = "org.eclipse.scout.service.IService"; // NO_UCD
- String IService2 = "org.eclipse.scout.service.IService2"; // NO_UCD
String ISmartField = "org.eclipse.scout.rt.client.ui.form.fields.smartfield.ISmartField"; // NO_UCD
String ISMTPService = "org.eclipse.scout.rt.server.services.common.smtp.ISMTPService"; // NO_UCD
String ISplitBox = "org.eclipse.scout.rt.client.ui.form.fields.splitbox.ISplitBox"; // NO_UCD
diff --git a/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/operation/project/template/OutlineTemplateOperation.java b/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/operation/project/template/OutlineTemplateOperation.java
index 5f3190f..cb2403f 100644
--- a/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/operation/project/template/OutlineTemplateOperation.java
+++ b/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/operation/project/template/OutlineTemplateOperation.java
@@ -40,7 +40,7 @@
/**
* <h3>{@link OutlineTemplateOperation}</h3> ...
- *
+ *
* @author Andreas Hoegger
* @since 1.0.8 09.02.2011
*/
@@ -137,7 +137,7 @@
outlineServiceOp.setImplementationProject(server.getJavaProject());
outlineServiceOp.setInterfaceProject(shared.getJavaProject());
outlineServiceOp.setInterfacePackageName(shared.getDefaultPackage(IDefaultTargetPackage.SHARED_SERVICES));
- outlineServiceOp.addInterfaceInterfaceSignature(SignatureCache.createTypeSignature(RuntimeClasses.IService2));
+ outlineServiceOp.addInterfaceInterfaceSignature(SignatureCache.createTypeSignature(RuntimeClasses.IService));
outlineServiceOp.setImplementationPackageName(server.getDefaultPackage(IDefaultTargetPackage.SERVER_SERVICES));
outlineServiceOp.setImplementationSuperTypeSignature(RuntimeClasses.getSuperTypeSignature(RuntimeClasses.IService, server.getJavaProject()));
outlineServiceOp.run(monitor, workingCopyManager);
diff --git a/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/operation/service/ProcessServiceNewOperation.java b/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/operation/service/ProcessServiceNewOperation.java
index 8bc622b..7339f75 100644
--- a/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/operation/service/ProcessServiceNewOperation.java
+++ b/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/operation/service/ProcessServiceNewOperation.java
@@ -34,7 +34,7 @@
/**
* <h3>{@link ProcessServiceNewOperation}</h3> ...
- *
+ *
* @author Andreas Hoegger
* @since 1.0.8 10.02.2010
*/
@@ -63,7 +63,7 @@
public ProcessServiceNewOperation(String interfaceName, String implementationName) {
super(interfaceName, implementationName);
- getInterfaceSourceBuilder().addInterfaceSignature(SignatureCache.createTypeSignature(RuntimeClasses.IService2));
+ getInterfaceSourceBuilder().addInterfaceSignature(SignatureCache.createTypeSignature(RuntimeClasses.IService));
getInterfaceSourceBuilder().addAnnotationSourceBuilder(AnnotationSourceBuilderFactory.createValidationStrategyProcess());
}
diff --git a/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/operation/service/ServiceNewOperation.java b/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/operation/service/ServiceNewOperation.java
index 571d7b3..fb02781 100644
--- a/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/operation/service/ServiceNewOperation.java
+++ b/org.eclipse.scout.sdk/src/org/eclipse/scout/sdk/operation/service/ServiceNewOperation.java
@@ -54,7 +54,7 @@
* In case the service implementation bundle is not set no service implementation will be created nor any service
* registrations added.<br>
* In case the service interface bundle is null no service proxy registrations will be created.
- *
+ *
* @author Andreas Hoegger
* @since 1.0.8 03.02.2010
*/
@@ -114,7 +114,7 @@
if (getInterfaceProject() != null) {
// create interface
List<String> interfaceSignatures = getInterfaceSourceBuilder().getInterfaceSignatures();
- String service2Signature = SignatureCache.createTypeSignature(RuntimeClasses.IService2);
+ String service2Signature = SignatureCache.createTypeSignature(RuntimeClasses.IService);
if (interfaceSignatures.isEmpty()) {
interfaceSignatures.add(service2Signature);
}
@@ -137,7 +137,7 @@
getImplementationSourceBuilder().addInterfaceSignature(SignatureCache.createTypeSignature(getCreatedServiceInterface().getFullyQualifiedName()));
}
if (StringUtility.isNullOrEmpty(getImplementationSourceBuilder().getSuperTypeSignature())) {
- getImplementationSourceBuilder().setSuperTypeSignature(RuntimeClasses.getSuperTypeSignature(RuntimeClasses.IService2, getImplementationProject()));
+ getImplementationSourceBuilder().setSuperTypeSignature(RuntimeClasses.getSuperTypeSignature(RuntimeClasses.IService, getImplementationProject()));
}
PrimaryTypeNewOperation implementationOp = new PrimaryTypeNewOperation(getImplementationSourceBuilder(), getImplementationPackageName(), getImplementationProject());
implementationOp.setIcuCommentSourceBuilder(CommentSourceBuilderFactory.createPreferencesCompilationUnitCommentBuilder());
