Skip to content

Commit

Permalink
GUVNOR-2521: Consolidate server-side bootstrap logic in various workb…
Browse files Browse the repository at this point in the history
…ench implementations (#425)
  • Loading branch information
paulovmr authored and csadilek committed Jun 3, 2016
1 parent 37b32b8 commit d042779
Show file tree
Hide file tree
Showing 7 changed files with 120 additions and 283 deletions.
16 changes: 15 additions & 1 deletion jbpm-console-ng-showcase/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,11 @@
<groupId>org.jbpm</groupId>
<artifactId>jbpm-services-cdi</artifactId>
</dependency>

<dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-runtime-manager</artifactId>
</dependency>

<!-- jBPM Console Panels -->
<dependency>
Expand Down Expand Up @@ -473,7 +478,7 @@
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-api</artifactId>
<artifactId>cxf-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.cxf</groupId>
Expand All @@ -487,6 +492,11 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
</exclusion>

<exclusion>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
Expand Down Expand Up @@ -1003,6 +1013,10 @@
<artifactId>kie-wb-common-workbench-client</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.kie.workbench.screens</groupId>
<artifactId>kie-wb-common-workbench-backend</artifactId>
</dependency>

<!-- Needed for the Deployment Descriptor Editor -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,98 +22,77 @@
import javax.inject.Inject;
import javax.inject.Named;

import org.guvnor.structure.repositories.Repository;
import org.guvnor.structure.organizationalunit.OrganizationalUnitService;
import org.guvnor.structure.repositories.RepositoryService;
import org.guvnor.structure.server.config.ConfigGroup;
import org.guvnor.structure.server.config.ConfigType;
import org.guvnor.structure.server.config.ConfigurationFactory;
import org.guvnor.structure.server.config.ConfigurationService;
import org.jbpm.console.ng.bd.service.AdministrationService;

import org.kie.workbench.common.services.shared.project.KieProjectService;
import org.kie.workbench.screens.workbench.backend.BaseAppSetup;
import org.uberfire.commons.services.cdi.ApplicationStarted;
import org.uberfire.commons.services.cdi.Startup;
import org.uberfire.io.IOService;

@ApplicationScoped
@Startup
public class AppSetup {
public class AppSetup extends BaseAppSetup {

// default repository section - start
// default repository section - start
private static final String JBPM_WB_PLAYGROUND_ALIAS = "jbpm-playground";
private static final String JBPM_WB_PLAYGROUND_ORIGIN = "https://github.com/droolsjbpm/jbpm-playground.git";


private static final String GLOBAL_SETTINGS = "settings";

@Inject
@Named("ioStrategy")
private IOService ioService;

@Inject
private AdministrationService administrationService;

private Repository repository;

@Inject
private ConfigurationService configurationService;
private Event<ApplicationStarted> applicationStartedEvent;

@Inject
private ConfigurationFactory configurationFactory;
protected AppSetup() {
}

@Inject
private Event<ApplicationStarted> applicationStartedEvent;
public AppSetup( @Named("ioStrategy") final IOService ioService,
final RepositoryService repositoryService,
final OrganizationalUnitService organizationalUnitService,
final KieProjectService projectService,
final ConfigurationService configurationService,
final ConfigurationFactory configurationFactory,
final AdministrationService administrationService,
final Event<ApplicationStarted> applicationStartedEvent ) {
super( ioService, repositoryService, organizationalUnitService, projectService, configurationService, configurationFactory );
this.administrationService = administrationService;
this.applicationStartedEvent = applicationStartedEvent;
}

@PostConstruct
public void onStartup() {
if (!"false".equalsIgnoreCase(System.getProperty("org.kie.demo"))) {
if ( !"false".equalsIgnoreCase( System.getProperty( "org.kie.demo" ) ) ) {
administrationService.bootstrapRepository( "demo", JBPM_WB_PLAYGROUND_ALIAS, JBPM_WB_PLAYGROUND_ORIGIN,
"", "" );
} else if ("true".equalsIgnoreCase(System.getProperty("org.kie.example"))) {
} else if ( "true".equalsIgnoreCase( System.getProperty( "org.kie.example" ) ) ) {
administrationService.bootstrapRepository( "example", "repository1", null, "", "" );
administrationService.bootstrapProject("repository1", "org.kie.example", "project1", "1.0.0-SNAPSHOT");
administrationService.bootstrapProject( "repository1", "org.kie.example", "project1", "1.0.0-SNAPSHOT" );
}

administrationService.bootstrapConfig();

administrationService.bootstrapDeployments();

configurationService.addConfiguration( getGlobalConfiguration() );

// notify cluster service that bootstrap is completed to start synchronization
applicationStartedEvent.fire(new ApplicationStarted());
applicationStartedEvent.fire( new ApplicationStarted() );
}


private ConfigGroup getGlobalConfiguration() {
final ConfigGroup group = configurationFactory.newConfigGroup( ConfigType.GLOBAL,
GLOBAL_SETTINGS,
"" );

/*
group.addConfigItem( configurationFactory.newConfigItem( "drools.dateformat",
"dd-MMM-yyyy" ) );
group.addConfigItem( configurationFactory.newConfigItem( "drools.datetimeformat",
"dd-MMM-yyyy hh:mm:ss" ) );
group.addConfigItem( configurationFactory.newConfigItem( "drools.defaultlanguage",
"en" ) );
group.addConfigItem( configurationFactory.newConfigItem( "drools.defaultcountry",
"US" ) );
*/
GLOBAL_SETTINGS,
"" );

group.addConfigItem( configurationFactory.newConfigItem( "build.enable-incremental",
"true" ) );
"true" ) );
group.addConfigItem( configurationFactory.newConfigItem( "support.runtime.deploy",
"true" ) );

/*
group.addConfigItem( configurationFactory.newConfigItem( "rule-modeller-onlyShowDSLStatements",
"false" ) );
group.addConfigItem( configurationFactory.newConfigItem( "designer.url",
"http://localhost:8080" ) );
group.addConfigItem( configurationFactory.newConfigItem( "designer.context",
"designer" ) );
group.addConfigItem( configurationFactory.newConfigItem( "designer.profile",
"jbpm" ) );
*/
"true" ) );

return group;
}
Expand Down

This file was deleted.

0 comments on commit d042779

Please sign in to comment.