Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AF-913]: Added Category to resource type #966

Merged
merged 1 commit into from Feb 26, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view

This file was deleted.

Expand Up @@ -36,7 +36,6 @@
import org.jbpm.workbench.wi.dd.model.ItemObjectModel;
import org.jbpm.workbench.wi.dd.model.Parameter;
import org.jbpm.workbench.wi.dd.service.DDEditorService;
import org.jbpm.workbench.wi.dd.type.DDResourceTypeDefinition;
import org.jbpm.workbench.wi.dd.validation.DeploymentDescriptorValidationMessage;
import org.kie.internal.runtime.conf.AuditMode;
import org.kie.internal.runtime.conf.DeploymentDescriptor;
Expand Down Expand Up @@ -77,9 +76,6 @@ public class DDEditorServiceImpl
@Inject
private CommentedOptionFactory commentedOptionFactory;

@Inject
private DDResourceTypeDefinition resourceTypeDefinition;

@Override
public DeploymentDescriptorModel load(Path path) {
return super.loadContent(path);
Expand Down Expand Up @@ -498,7 +494,7 @@ public void createIfNotExists(Path path) {

@Override
public boolean accepts(Path path) {
return this.resourceTypeDefinition.accept(path);
return path.getFileName().equals("kie-deployment-descriptor.xml");
}

@Override
Expand Down
20 changes: 20 additions & 0 deletions jbpm-wb-integration/jbpm-wb-integration-client/pom.xml
Expand Up @@ -91,6 +91,16 @@
<artifactId>jbpm-wb-common-client</artifactId>
</dependency>

<dependency>
<groupId>org.kie.workbench.screens</groupId>
<artifactId>kie-wb-common-project-editor-api</artifactId>
</dependency>

<dependency>
<groupId>org.kie.workbench.screens</groupId>
<artifactId>kie-wb-common-library-client</artifactId>
</dependency>

<dependency>
<groupId>org.kie.workbench.screens</groupId>
<artifactId>kie-wb-common-library-api</artifactId>
Expand Down Expand Up @@ -170,6 +180,16 @@
<artifactId>errai-data-binding</artifactId>
</dependency>

<dependency>
<groupId>com.google.elemental2</groupId>
<artifactId>elemental2-dom</artifactId>
</dependency>

<dependency>
<groupId>com.google.elemental2</groupId>
<artifactId>elemental2-promise</artifactId>
</dependency>

<dependency>
<groupId>org.uberfire</groupId>
<artifactId>uberfire-commons-editor-client</artifactId>
Expand Down
@@ -0,0 +1,75 @@
/*
* Copyright 2018 Red Hat, Inc. and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.jbpm.workbench.wi.client.editors.deployment.descriptor;

import java.util.Arrays;
import java.util.List;

import javax.enterprise.context.Dependent;
import javax.inject.Inject;

import org.kie.workbench.common.screens.library.client.settings.SettingsPresenter;
import org.kie.workbench.common.screens.library.client.settings.SettingsSections;
import org.kie.workbench.common.screens.library.client.settings.dependencies.DependenciesPresenter;
import org.kie.workbench.common.screens.library.client.settings.externaldataobjects.ExternalDataObjectsPresenter;
import org.kie.workbench.common.screens.library.client.settings.generalsettings.GeneralSettingsPresenter;
import org.kie.workbench.common.screens.library.client.settings.knowledgebases.KnowledgeBasesPresenter;
import org.kie.workbench.common.screens.library.client.settings.persistence.PersistencePresenter;
import org.kie.workbench.common.screens.library.client.settings.validation.ValidationPresenter;

@Dependent
public class CustomizedSettingsSections implements SettingsSections {

private final GeneralSettingsPresenter generalSettingsSection;
private final DependenciesPresenter dependenciesSettingsSection;
private final KnowledgeBasesPresenter knowledgeBasesSettingsSection;
private final ExternalDataObjectsPresenter externalDataObjectsSettingsSection;
private final ValidationPresenter validationSettingsSection;
private final DeploymentsSectionPresenter deploymentsSettingsSection;
private final PersistencePresenter persistenceSettingsSection;

@Inject
public CustomizedSettingsSections(final GeneralSettingsPresenter generalSettingsSection,
final DependenciesPresenter dependenciesSettingsSection,
final KnowledgeBasesPresenter knowledgeBasesSettingsSection,
final ExternalDataObjectsPresenter externalDataObjectsSettingsSection,
final ValidationPresenter validationSettingsSection,
final DeploymentsSectionPresenter deploymentsSettingsSection,
final PersistencePresenter persistenceSettingsSection) {

this.generalSettingsSection = generalSettingsSection;
this.dependenciesSettingsSection = dependenciesSettingsSection;
this.knowledgeBasesSettingsSection = knowledgeBasesSettingsSection;
this.externalDataObjectsSettingsSection = externalDataObjectsSettingsSection;
this.validationSettingsSection = validationSettingsSection;
this.deploymentsSettingsSection = deploymentsSettingsSection;
this.persistenceSettingsSection = persistenceSettingsSection;
}

@Override
public List<SettingsPresenter.Section> getList() {
return Arrays.asList(
generalSettingsSection,
dependenciesSettingsSection,
knowledgeBasesSettingsSection,
externalDataObjectsSettingsSection,
validationSettingsSection,
deploymentsSettingsSection,
persistenceSettingsSection
);
}
}