orchestrator module building

[tangyong]

1 ApplicationLifecycleInterceptorImpl.java

1)replace @Inject 2)removing unused importing

2 PaaSAppInfoRegistry.java

using javax.inject.Singleton(JSR330) rather than using org.glassfish.hk2.scopes.Singleton

3 ServicesXMLParserImpl.java

if(DeploymentUtils.isWebArchive(ra)) ----> needing to investigate because isWebArchive is not defined in current gf trunk

[Fixing] //TangYong Added ArchiveType warType = locator.getService(ArchiveType.class, "war"); boolean isWar = DeploymentUtils.isArchiveOfType(ra, warType, locator); //if(DeploymentUtils.isWebArchive(ra)){ if(isWar){ inputStream = ra.getEntry("WEB-INF/glassfish-services.xml"); }else{ inputStream = ra.getEntry("META-INF/glassfish-services.xml"); }

4 CollectServiceLogFiles.java

5 CreateExternalService.java

6 CreateSharedService.java

7 DeleteExternalService.java

8 DeleteSharedService.java

9 GenerateGlassFishServicesDeploymentPlan.java

10 GetServiceDescription.java

11 GetServiceMetadata.java

12 HiddenTailServiceLogFile.java

13 ListServiceProvisioningEngines.java

14 ListServices.java

needing to investigate why com.sun.enterprise.admin.util.ColumnFormatter's has been moved

[Conclusion] com.sun.enterprise.admin.util.ColumnFormatter() has been moved into com.sun.enterprise.util.ColumnFormatter(nucleus\common\common-util)

So, the module's pom file needs to be updated:

    \<!-- TangYong Added --\>
    \<dependency\>
        \<groupId\>org.glassfish.main.common\</groupId\>
        \<artifactId\>common-util\</artifactId\>
        \<version\>${project.version}\</version\>
    \</dependency\>

15 PaaSDeploy.java

16 PaaSUndeploy.java

17 RegisterServiceProvisioningEngine.java

18 ScaleService.java

19 ServiceUtil.java

20 SharedServiceLazyInitializer.java

//TangYong Added (needing to investigate in the future) --->whether setting null right? CommandRunner.CommandInvocation commandInvocation = commandRunner.getCommandInvocation("create-cluster", actionReport, null);

21 StartSharedService.java

22 StopSharedService.java

23 UnregisterServiceProvisioningEngine.java

24 RemoteCommandExecutor.java

25 ServicesConfigListener.java

1)org.jvnet.hk2.component.PreDestroy; 2)org.glassfish.internal.api.PostStartup Instead using org.glassfish.internal.api.PostStartupRunLevel --->@PostStartupRunLevel

26 ServiceDescription.java

27 AbstractPaaSDeploymentState.java

28 ConfiguredServiceUnregisterState.java

29 DeployState.java

30 DisableState.java

31 EnableState.java

32 ProvisioningState.java

33 SharedServiceRegistrationState.java

34 SharedServiceUnregisterState.java

35 UndeployState.java