Skip to content
This repository has been archived by the owner on Sep 13, 2022. It is now read-only.

Commit

Permalink
Refactor following guvnor and kie-wb-common changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@manstis
manstis committed Jun 28, 2013
1 parent 226758f commit c3ed554
Show file tree
Hide file tree
Showing 5 changed files with 205 additions and 181 deletions.
310 changes: 161 additions & 149 deletions jbpm-designer-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,154 +2,166 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-designer</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>jbpm-designer-client</artifactId>
<packaging>jar</packaging>

<name>jBPM Designer - Client</name>

<dependencies>

<dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-designer-api</artifactId>
</dependency>

<!-- Errai Core -->
<dependency>
<groupId>org.jboss.errai</groupId>
<artifactId>errai-bus</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.errai</groupId>
<artifactId>errai-ioc</artifactId>
</dependency>

<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<scope>provided</scope>
</dependency>

<!-- CDI Integration Modules -->
<dependency>
<groupId>org.jboss.errai</groupId>
<artifactId>errai-cdi-client</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.errai</groupId>
<artifactId>errai-javax-enterprise</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.errai</groupId>
<artifactId>errai-weld-integration</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.errai</groupId>
<artifactId>errai-cdi-jetty</artifactId>
</dependency>

<dependency>
<groupId>org.uberfire</groupId>
<artifactId>uberfire-workbench</artifactId>
</dependency>


<!-- GWT and GWT Extensions -->
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>


<!-- KIE dependencies -->
<dependency>
<groupId>org.kie.workbench.widgets</groupId>
<artifactId>kie-wb-common-ui</artifactId>
</dependency>
</dependencies>

<build>
<resources>
<!-- Include src/main/java in order not to break the Eclipse GWT plug-in -->
<resource>
<directory>src/main/java</directory>
</resource>
<!-- Include module descriptors from src/main/resources in order not to break the Intellij GWT plug-in -->
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>

<!-- We need source files generated by our Java Annotations Processor -->
<!-- in the resulting JAR for GWT to reference in child projects. Consequentially -->
<!-- copy the source files to the target folder before packaging -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/classes</outputDirectory>
<resources>
<resource>
<directory>target/generated-sources/annotations</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>


</plugins>

</build>
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-designer</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>jbpm-designer-client</artifactId>
<packaging>jar</packaging>

<name>jBPM Designer - Client</name>

<dependencies>

<dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-designer-api</artifactId>
</dependency>

<!-- Errai Core -->
<dependency>
<groupId>org.jboss.errai</groupId>
<artifactId>errai-bus</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.errai</groupId>
<artifactId>errai-ioc</artifactId>
</dependency>

<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<scope>provided</scope>
</dependency>

<!-- CDI Integration Modules -->
<dependency>
<groupId>org.jboss.errai</groupId>
<artifactId>errai-cdi-client</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.errai</groupId>
<artifactId>errai-javax-enterprise</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.errai</groupId>
<artifactId>errai-weld-integration</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.errai</groupId>
<artifactId>errai-cdi-jetty</artifactId>
</dependency>

<dependency>
<groupId>org.uberfire</groupId>
<artifactId>uberfire-workbench</artifactId>
</dependency>


<!-- GWT and GWT Extensions -->
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>


<!-- Guvnor dependencies -->
<dependency>
<groupId>org.guvnor</groupId>
<artifactId>guvnor-project-api</artifactId>
</dependency>

<dependency>
<groupId>org.guvnor</groupId>
<artifactId>guvnor-services-api</artifactId>
</dependency>


<!-- KIE dependencies -->
<dependency>
<groupId>org.kie.workbench.widgets</groupId>
<artifactId>kie-wb-common-ui</artifactId>
</dependency>
</dependencies>

<build>
<resources>
<!-- Include src/main/java in order not to break the Eclipse GWT plug-in -->
<resource>
<directory>src/main/java</directory>
</resource>
<!-- Include module descriptors from src/main/resources in order not to break the Intellij GWT plug-in -->
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>

<!-- We need source files generated by our Java Annotations Processor -->
<!-- in the resulting JAR for GWT to reference in child projects. Consequentially -->
<!-- copy the source files to the target folder before packaging -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/classes</outputDirectory>
<resources>
<resource>
<directory>target/generated-sources/annotations</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>


</plugins>

</build>

</project>
12 changes: 5 additions & 7 deletions jbpm-designer-client/src/main/java/org/jbpm/designer/client/DesignerPresenter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,29 @@
import com.google.gwt.dom.client.Document;
import com.google.gwt.dom.client.FrameElement;
import com.google.gwt.dom.client.ScriptElement;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.IsWidget;
import org.guvnor.common.services.shared.file.DeleteService;
import org.jboss.errai.bus.client.api.RemoteCallback;
import org.jboss.errai.ioc.client.api.Caller;
import org.jbpm.designer.client.type.Bpmn2Type;
import org.jbpm.designer.service.DesignerAssetService;
import org.kie.workbench.common.widgets.client.callbacks.HasBusyIndicatorDefaultErrorCallback;
import org.kie.workbench.common.widgets.client.resources.i18n.CommonConstants;
import org.kie.workbench.common.widgets.client.widget.BusyIndicatorView;
import org.uberfire.backend.vfs.Path;
import org.uberfire.backend.vfs.PathFactory;
import org.uberfire.backend.vfs.VFSService;
import org.uberfire.client.annotations.OnStart;
import org.uberfire.client.annotations.WorkbenchEditor;
import org.uberfire.client.annotations.WorkbenchPartTitle;
import org.uberfire.client.annotations.WorkbenchPartView;
import org.uberfire.client.mvp.PlaceManager;
import org.uberfire.client.mvp.UberView;
import org.uberfire.mvp.PlaceRequest;
import org.uberfire.mvp.impl.DefaultPlaceRequest;
import org.uberfire.mvp.impl.PathPlaceRequest;
import org.uberfire.workbench.events.NotificationEvent;
import org.uberfire.workbench.events.ResourceDeletedEvent;
import org.uberfire.workbench.events.ResourceUpdatedEvent;
import org.uberfire.backend.vfs.VFSService;
import org.kie.workbench.common.widgets.client.resources.i18n.CommonConstants;
import org.kie.workbench.common.services.shared.file.DeleteService;
import org.kie.workbench.common.widgets.client.widget.BusyIndicatorView;
import org.kie.workbench.common.widgets.client.callbacks.HasBusyIndicatorDefaultErrorCallback;

@Dependent
@WorkbenchEditor(identifier = "jbpm.designer", supportedTypes = { Bpmn2Type.class })
Expand Down
3 changes: 1 addition & 2 deletions jbpm-designer-client/src/main/java/org/jbpm/designer/client/handlers/NewProcessHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@

import com.google.gwt.core.client.Callback;
import com.google.gwt.user.client.ui.IsWidget;
import org.guvnor.common.services.project.model.Package;
import org.jboss.errai.bus.client.api.RemoteCallback;
import org.jboss.errai.ioc.client.api.Caller;
import org.jbpm.designer.client.type.Bpmn2Type;
import org.jbpm.designer.service.DesignerAssetService;
import org.kie.workbench.common.services.shared.context.*;
import org.kie.workbench.common.services.shared.context.Package;
import org.kie.workbench.common.widgets.client.handlers.DefaultNewResourceHandler;
import org.kie.workbench.common.widgets.client.handlers.NewResourcePresenter;
import org.uberfire.backend.vfs.Path;
Expand Down

0 comments on commit c3ed554

Please sign in to comment.