BZ-1018535: kie-commons and uberfire merge

kiegroup · Oct 13, 2013 · 7592f8a · 7592f8a
1 parent e514f74
commit 7592f8a
Show file tree

Hide file tree

Showing 73 changed files with 180 additions and 185 deletions.
diff --git a/...wb-common-screens/kie-wb-common-data-modeller/kie-wb-common-data-modeller-backend/pom.xml b/...wb-common-screens/kie-wb-common-data-modeller/kie-wb-common-data-modeller-backend/pom.xml
@@ -54,8 +54,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.kie.commons</groupId>
-      <artifactId>kie-commons-io</artifactId>
+      <groupId>org.uberfire</groupId>
+      <artifactId>uberfire-io</artifactId>
     </dependency>
 
     <dependency>

diff --git a/.../org/kie/workbench/common/screens/datamodeller/backend/server/DataModelerServiceImpl.java b/.../org/kie/workbench/common/screens/datamodeller/backend/server/DataModelerServiceImpl.java
@@ -26,8 +26,8 @@
 import org.guvnor.common.services.project.builder.events.InvalidateDMOProjectCacheEvent;
 import org.guvnor.common.services.project.model.Project;
 import org.jboss.errai.bus.server.annotations.Service;
-import org.kie.commons.io.IOService;
-import org.kie.commons.java.nio.base.options.CommentedOption;
+import org.uberfire.io.IOService;
+import org.uberfire.java.nio.base.options.CommentedOption;
 import org.kie.workbench.common.screens.datamodeller.model.AnnotationDefinitionTO;
 import org.kie.workbench.common.screens.datamodeller.model.DataModelTO;
 import org.kie.workbench.common.screens.datamodeller.model.DataObjectTO;
@@ -159,7 +159,7 @@ public GenerationResult saveModel( DataModelTO dataModel,
 
         try {
             //ensure java sources directory exists.
-            org.kie.commons.java.nio.file.Path javaPath = ensureProjectJavaPath( paths.convert( projectPath ) );
+            org.uberfire.java.nio.file.Path javaPath = ensureProjectJavaPath( paths.convert( projectPath ) );
 
             if (overwrite) {
                 mergeWithExistingModel(dataModel, project);
@@ -307,12 +307,12 @@ private void notifyFileChanges( List<Path> deleteableFiles,
     }
 
     private List<Path> calculateDeleteableFiles( DataModelTO dataModel,
-                                                 org.kie.commons.java.nio.file.Path javaPath ) {
+                                                 org.uberfire.java.nio.file.Path javaPath ) {
 
         List<DataObjectTO> currentObjects = dataModel.getDataObjects();
         List<DataObjectTO> deletedObjects = dataModel.getDeletedDataObjects();
         List<Path> deleteableFiles = new ArrayList<Path>();
-        org.kie.commons.java.nio.file.Path filePath;
+        org.uberfire.java.nio.file.Path filePath;
 
         //process deleted persistent objects.
         for ( DataObjectTO dataObject : deletedObjects ) {
@@ -375,12 +375,12 @@ private void cleanupFiles( List<Path> deleteableFiles, CommentedOption option )
      * This auxiliary method deletes the files that belongs to data objects that was removed in memory.
      */
     private List<ResourceChange> cleanupFiles( DataModelTO dataModel,
-                                               org.kie.commons.java.nio.file.Path javaPath ) {
+                                               org.uberfire.java.nio.file.Path javaPath ) {
 
         List<DataObjectTO> currentObjects = dataModel.getDataObjects();
         List<DataObjectTO> deletedObjects = dataModel.getDeletedDataObjects();
         List<ResourceChange> fileChanges = new ArrayList<ResourceChange>();
-        org.kie.commons.java.nio.file.Path filePath;
+        org.uberfire.java.nio.file.Path filePath;
 
         //process deleted persistent objects.
         for ( DataObjectTO dataObject : deletedObjects ) {
@@ -423,23 +423,23 @@ private List<ResourceChange> cleanupFiles( DataModelTO dataModel,
         return fileChanges;
     }
 
-    private void cleanupEmptyDirs( org.kie.commons.java.nio.file.Path pojectPath ) {
+    private void cleanupEmptyDirs( org.uberfire.java.nio.file.Path pojectPath ) {
         FileUtils fileUtils = FileUtils.getInstance();
         List<String> deleteableFiles = new ArrayList<String>();
         deleteableFiles.add( ".gitignore" );
         fileUtils.cleanEmptyDirectories( ioService, pojectPath, false, deleteableFiles );
     }
 
-    private org.kie.commons.java.nio.file.Path existsProjectJavaPath( org.kie.commons.java.nio.file.Path projectPath ) {
-        org.kie.commons.java.nio.file.Path javaPath = projectPath.resolve( "src" ).resolve( "main" ).resolve( "java" );
+    private org.uberfire.java.nio.file.Path existsProjectJavaPath( org.uberfire.java.nio.file.Path projectPath ) {
+        org.uberfire.java.nio.file.Path javaPath = projectPath.resolve( "src" ).resolve( "main" ).resolve( "java" );
         if ( ioService.exists( javaPath ) ) {
             return javaPath;
         }
         return null;
     }
 
-    private org.kie.commons.java.nio.file.Path ensureProjectJavaPath( org.kie.commons.java.nio.file.Path projectPath ) {
-        org.kie.commons.java.nio.file.Path javaPath = projectPath.resolve( "src" );
+    private org.uberfire.java.nio.file.Path ensureProjectJavaPath( org.uberfire.java.nio.file.Path projectPath ) {
+        org.uberfire.java.nio.file.Path javaPath = projectPath.resolve( "src" );
         if ( !ioService.exists( javaPath ) ) {
             javaPath = ioService.createDirectory( javaPath );
         }
@@ -458,12 +458,12 @@ private org.kie.commons.java.nio.file.Path ensureProjectJavaPath( org.kie.common
     /**
      * Given a className calculates the path to the java file allocating the corresponding pojo.
      */
-    private org.kie.commons.java.nio.file.Path calculateFilePath( String className,
-                                                                  org.kie.commons.java.nio.file.Path javaPath ) {
+    private org.uberfire.java.nio.file.Path calculateFilePath( String className,
+                                                                  org.uberfire.java.nio.file.Path javaPath ) {
 
         String name = NamingUtils.getInstance().extractClassName( className );
         String packageName = NamingUtils.getInstance().extractPackageName( className );
-        org.kie.commons.java.nio.file.Path filePath = javaPath;
+        org.uberfire.java.nio.file.Path filePath = javaPath;
 
         if ( packageName != null ) {
             List<String> packageNameTokens = NamingUtils.getInstance().tokenizePackageName( packageName );

diff --git a/...g/kie/workbench/common/screens/defaulteditor/backend/server/DefaultEditorServiceImpl.java b/...g/kie/workbench/common/screens/defaulteditor/backend/server/DefaultEditorServiceImpl.java
@@ -25,8 +25,8 @@
 import org.guvnor.common.services.shared.metadata.MetadataService;
 import org.guvnor.common.services.shared.metadata.model.Metadata;
 import org.jboss.errai.bus.server.annotations.Service;
-import org.kie.commons.io.IOService;
-import org.kie.commons.java.nio.base.options.CommentedOption;
+import org.uberfire.io.IOService;
+import org.uberfire.java.nio.base.options.CommentedOption;
 import org.kie.workbench.common.screens.defaulteditor.service.DefaultEditorService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...mon-home-api/src/main/java/org/kie/workbench/common/screens/home/model/CarouselEntry.java b/...mon-home-api/src/main/java/org/kie/workbench/common/screens/home/model/CarouselEntry.java
@@ -1,6 +1,6 @@
 package org.kie.workbench.common.screens.home.model;
 
-import org.kie.commons.validation.PortablePreconditions;
+import org.uberfire.commons.validation.PortablePreconditions;
 
 /**
  * An Entry in the Carousel

diff --git a/...-common-home-api/src/main/java/org/kie/workbench/common/screens/home/model/HomeModel.java b/...-common-home-api/src/main/java/org/kie/workbench/common/screens/home/model/HomeModel.java
@@ -4,7 +4,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.kie.commons.validation.PortablePreconditions;
+import org.uberfire.commons.validation.PortablePreconditions;
 
 /**
  * Model defining the Home Screen content

diff --git a/...wb-common-home-api/src/main/java/org/kie/workbench/common/screens/home/model/Section.java b/...wb-common-home-api/src/main/java/org/kie/workbench/common/screens/home/model/Section.java
@@ -5,7 +5,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.kie.commons.validation.PortablePreconditions;
+import org.uberfire.commons.validation.PortablePreconditions;
 import org.uberfire.security.authz.RuntimeResource;
 
 import static java.util.Collections.*;

diff --git a/...mmon-home-api/src/main/java/org/kie/workbench/common/screens/home/model/SectionEntry.java b/...mmon-home-api/src/main/java/org/kie/workbench/common/screens/home/model/SectionEntry.java
@@ -1,6 +1,6 @@
 package org.kie.workbench.common.screens.home.model;
 
-import org.kie.commons.validation.PortablePreconditions;
+import org.uberfire.commons.validation.PortablePreconditions;
 import org.uberfire.mvp.Command;
 
 /**

diff --git a/...n/java/org/kie/workbench/common/screens/javaeditor/client/editor/JavaEditorPresenter.java b/...n/java/org/kie/workbench/common/screens/javaeditor/client/editor/JavaEditorPresenter.java
@@ -38,7 +38,7 @@
 import org.uberfire.lifecycle.OnStartup;
 import org.uberfire.workbench.type.FileNameUtil;
 
-import static org.kie.commons.validation.PortablePreconditions.*;
+import static org.uberfire.commons.validation.PortablePreconditions.*;
 
 @WorkbenchEditor(identifier = "JavaEditor", supportedTypes = { JavaResourceType.class })
 public class JavaEditorPresenter {

diff --git a/...-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-backend/pom.xml b/...-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-backend/pom.xml
@@ -59,8 +59,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.kie.commons</groupId>
-      <artifactId>kie-commons-io</artifactId>
+      <groupId>org.uberfire</groupId>
+      <artifactId>uberfire-io</artifactId>
     </dependency>
 
     <dependency>

diff --git a/...ava/org/kie/workbench/common/screens/projecteditor/client/handlers/NewProjectHandler.java b/...ava/org/kie/workbench/common/screens/projecteditor/client/handlers/NewProjectHandler.java
@@ -11,9 +11,8 @@
 import com.google.gwt.user.client.ui.IsWidget;
 import org.guvnor.common.services.project.context.ProjectContext;
 import org.guvnor.common.services.project.model.Package;
-import org.kie.commons.data.Pair;
+import org.uberfire.commons.data.Pair;
 import org.kie.workbench.common.screens.projecteditor.client.resources.ProjectEditorResources;
-import org.kie.workbench.common.screens.projecteditor.client.resources.i18n.ProjectEditorConstants;
 import org.kie.workbench.common.screens.projecteditor.client.wizard.NewProjectWizard;
 import org.kie.workbench.common.services.shared.validation.ValidatorWithReasonCallback;
 import org.kie.workbench.common.widgets.client.handlers.NewResourceHandler;

diff --git a/...xplorer-api/src/main/java/org/kie/workbench/common/screens/explorer/model/FolderItem.java b/...xplorer-api/src/main/java/org/kie/workbench/common/screens/explorer/model/FolderItem.java
@@ -16,7 +16,7 @@
 package org.kie.workbench.common.screens.explorer.model;
 
 import org.jboss.errai.common.client.api.annotations.Portable;
-import org.kie.commons.validation.PortablePreconditions;
+import org.uberfire.commons.validation.PortablePreconditions;
 import org.uberfire.backend.vfs.Path;
 
 /**

diff --git a/...orer-api/src/main/java/org/kie/workbench/common/screens/explorer/model/FolderListing.java b/...orer-api/src/main/java/org/kie/workbench/common/screens/explorer/model/FolderListing.java
@@ -19,7 +19,7 @@
 import java.util.List;
 
 import org.jboss.errai.common.client.api.annotations.Portable;
-import org.kie.commons.validation.PortablePreconditions;
+import org.uberfire.commons.validation.PortablePreconditions;
 import org.uberfire.backend.vfs.Path;
 
 /**

diff --git a/...in/java/org/kie/workbench/common/screens/explorer/backend/server/ExplorerServiceImpl.java b/...in/java/org/kie/workbench/common/screens/explorer/backend/server/ExplorerServiceImpl.java
@@ -31,9 +31,9 @@
 import org.guvnor.common.services.project.model.Project;
 import org.guvnor.common.services.project.service.ProjectService;
 import org.jboss.errai.bus.server.annotations.Service;
-import org.kie.commons.io.IOService;
-import org.kie.commons.java.nio.file.DirectoryStream;
-import org.kie.commons.java.nio.file.Files;
+import org.uberfire.io.IOService;
+import org.uberfire.java.nio.file.DirectoryStream;
+import org.uberfire.java.nio.file.Files;
 import org.kie.workbench.common.screens.explorer.model.FolderItem;
 import org.kie.workbench.common.screens.explorer.model.FolderItemType;
 import org.kie.workbench.common.screens.explorer.model.FolderListing;
@@ -173,8 +173,8 @@ public Set<Project> getProjects( final Repository repository ) {
             return authorizedProjects;
         }
         final Path repositoryRoot = repository.getRoot();
-        final DirectoryStream<org.kie.commons.java.nio.file.Path> nioRepositoryPaths = ioService.newDirectoryStream( paths.convert( repositoryRoot ) );
-        for ( org.kie.commons.java.nio.file.Path nioRepositoryPath : nioRepositoryPaths ) {
+        final DirectoryStream<org.uberfire.java.nio.file.Path> nioRepositoryPaths = ioService.newDirectoryStream( paths.convert( repositoryRoot ) );
+        for ( org.uberfire.java.nio.file.Path nioRepositoryPath : nioRepositoryPaths ) {
             if ( Files.isDirectory( nioRepositoryPath ) ) {
                 final org.uberfire.backend.vfs.Path projectPath = paths.convert( nioRepositoryPath );
                 final Project project = projectService.resolveProject( projectPath );
@@ -209,11 +209,11 @@ public Collection<FolderItem> getItems( final Package pkg ) {
 
     private Collection<FolderItem> getItems( final Path packagePath ) {
         final Collection<FolderItem> folderItems = new HashSet<FolderItem>();
-        final org.kie.commons.java.nio.file.Path nioPackagePath = paths.convert( packagePath );
+        final org.uberfire.java.nio.file.Path nioPackagePath = paths.convert( packagePath );
         if ( Files.exists( nioPackagePath ) ) {
-            final DirectoryStream<org.kie.commons.java.nio.file.Path> nioPaths = ioService.newDirectoryStream( nioPackagePath,
+            final DirectoryStream<org.uberfire.java.nio.file.Path> nioPaths = ioService.newDirectoryStream( nioPackagePath,
                                                                                                                dotFileFilter );
-            for ( org.kie.commons.java.nio.file.Path nioPath : nioPaths ) {
+            for ( org.uberfire.java.nio.file.Path nioPath : nioPaths ) {
                 if ( Files.isRegularFile( nioPath ) ) {
                     final org.uberfire.backend.vfs.Path path = paths.convert( nioPath );
                     final FolderItem folderItem = new FolderItem( path,
@@ -233,15 +233,15 @@ public FolderListing getFolderListing( final Path path ) {
         final Collection<FolderItem> folderItems = new HashSet<FolderItem>();
 
         //Scan upwards until the path exists (as the current path could have been deleted)
-        org.kie.commons.java.nio.file.Path nioPath = paths.convert( path );
+        org.uberfire.java.nio.file.Path nioPath = paths.convert( path );
         while ( !Files.exists( nioPath ) ) {
             nioPath = nioPath.getParent();
         }
         final Path basePath = paths.convert( nioPath );
         final Path baseParentPath = paths.convert( nioPath.getParent() );
-        final DirectoryStream<org.kie.commons.java.nio.file.Path> nioPaths = ioService.newDirectoryStream( nioPath,
+        final DirectoryStream<org.uberfire.java.nio.file.Path> nioPaths = ioService.newDirectoryStream( nioPath,
                                                                                                            dotFileFilter );
-        for ( org.kie.commons.java.nio.file.Path np : nioPaths ) {
+        for ( org.uberfire.java.nio.file.Path np : nioPaths ) {
             if ( Files.isRegularFile( np ) ) {
                 final org.uberfire.backend.vfs.Path p = paths.convert( np );
                 final FolderItem folderItem = new FolderItem( p,
@@ -267,7 +267,7 @@ public FolderListing getFolderListing( final Path path ) {
     }
 
     private List<Path> getPathSegments( final Path path ) {
-        org.kie.commons.java.nio.file.Path nioSegmentPath = paths.convert( path );
+        org.uberfire.java.nio.file.Path nioSegmentPath = paths.convert( path );
         //We're not interested in the terminal segment prior to root (i.e. the Project name)
         final int segmentCount = nioSegmentPath.getNameCount() - 1;
         if ( segmentCount < 1 ) {

diff --git a/...bench/common/screens/projectimportsscreen/client/forms/ProjectImportsScreenPresenter.java b/...bench/common/screens/projectimportsscreen/client/forms/ProjectImportsScreenPresenter.java
@@ -43,7 +43,7 @@
 import org.uberfire.workbench.events.NotificationEvent;
 import org.uberfire.workbench.model.menu.Menus;
 
-import static org.kie.commons.validation.PortablePreconditions.*;
+import static org.uberfire.commons.validation.PortablePreconditions.*;
 
 @WorkbenchEditor(identifier = "projectConfigScreen", supportedTypes = {ProjectImportsResourceType.class})
 public class ProjectImportsScreenPresenter

diff --git a/...wb-common-screens/kie-wb-common-search-screen/kie-wb-common-search-screen-backend/pom.xml b/...wb-common-screens/kie-wb-common-search-screen/kie-wb-common-search-screen-backend/pom.xml
@@ -16,8 +16,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.commons</groupId>
-      <artifactId>kieora-api</artifactId>
+      <groupId>org.uberfire</groupId>
+      <artifactId>uberfire-metadata-api</artifactId>
     </dependency>
 
     <dependency>

diff --git a/...c/main/java/org/kie/workbench/common/screens/search/backend/server/SearchServiceImpl.java b/...c/main/java/org/kie/workbench/common/screens/search/backend/server/SearchServiceImpl.java
@@ -1,7 +1,6 @@
 package org.kie.workbench.common.screens.search.backend.server;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -17,12 +16,12 @@
 import org.guvnor.common.services.backend.exceptions.ExceptionUtilities;
 import org.guvnor.common.services.backend.metadata.attribute.OtherMetaView;
 import org.jboss.errai.bus.server.annotations.Service;
-import org.kie.commons.io.IOSearchService;
-import org.kie.commons.io.IOService;
-import org.kie.commons.io.attribute.DublinCoreView;
-import org.kie.commons.java.nio.base.version.VersionAttributeView;
-import org.kie.commons.java.nio.file.Path;
-import org.kie.kieora.search.DateRange;
+import org.uberfire.io.IOSearchService;
+import org.uberfire.io.IOService;
+import org.uberfire.io.attribute.DublinCoreView;
+import org.uberfire.java.nio.base.version.VersionAttributeView;
+import org.uberfire.java.nio.file.Path;
+import org.uberfire.metadata.search.DateRange;
 import org.kie.workbench.common.screens.search.model.QueryMetadataPageRequest;
 import org.kie.workbench.common.screens.search.model.SearchPageRow;
 import org.kie.workbench.common.screens.search.model.SearchTermPageRequest;

diff --git a/kie-wb-common-services/kie-wb-common-data-modeller-core/pom.xml b/kie-wb-common-services/kie-wb-common-data-modeller-core/pom.xml
@@ -25,8 +25,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.kie.commons</groupId>
-      <artifactId>kie-commons-io</artifactId>
+      <groupId>org.uberfire</groupId>
+      <artifactId>uberfire-io</artifactId>
     </dependency>
 
     <dependency>

diff --git a/...main/java/org/kie/workbench/common/services/datamodeller/driver/FileChangeDescriptor.java b/...main/java/org/kie/workbench/common/services/datamodeller/driver/FileChangeDescriptor.java
@@ -16,7 +16,7 @@
 
 package org.kie.workbench.common.services.datamodeller.driver;
 
-import org.kie.commons.java.nio.file.Path;
+import org.uberfire.java.nio.file.Path;
 
 public class FileChangeDescriptor {
 

diff --git a/...core/src/main/java/org/kie/workbench/common/services/datamodeller/driver/ModelDriver.java b/...core/src/main/java/org/kie/workbench/common/services/datamodeller/driver/ModelDriver.java
@@ -17,11 +17,11 @@
 package org.kie.workbench.common.services.datamodeller.driver;
 
 
-import org.kie.commons.java.nio.file.OpenOption;
+import org.uberfire.java.nio.file.OpenOption;
 import org.kie.workbench.common.services.datamodeller.core.AnnotationDefinition;
 import org.kie.workbench.common.services.datamodeller.core.DataModel;
-import org.kie.commons.io.IOService;
-import org.kie.commons.java.nio.file.Path;
+import org.uberfire.io.IOService;
+import org.uberfire.java.nio.file.Path;
 
 import java.util.List;
 

diff --git a/...ava/org/kie/workbench/common/services/datamodeller/driver/impl/DataModelOracleDriver.java b/...ava/org/kie/workbench/common/services/datamodeller/driver/impl/DataModelOracleDriver.java
@@ -28,11 +28,9 @@
 import org.drools.workbench.models.datamodel.oracle.ModelField;
 import org.drools.workbench.models.datamodel.oracle.ProjectDataModelOracle;
 import org.drools.workbench.models.datamodel.oracle.TypeSource;
-import org.kie.commons.io.IOService;
-import org.kie.commons.java.nio.base.options.CommentedOption;
-import org.kie.commons.java.nio.file.OpenOption;
-import org.kie.commons.java.nio.file.Option;
-import org.kie.commons.java.nio.file.Path;
+import org.uberfire.io.IOService;
+import org.uberfire.java.nio.file.OpenOption;
+import org.uberfire.java.nio.file.Path;
 import org.kie.workbench.common.services.datamodeller.codegen.GenerationContext;
 import org.kie.workbench.common.services.datamodeller.codegen.GenerationEngine;
 import org.kie.workbench.common.services.datamodeller.codegen.GenerationListener;
@@ -378,15 +376,15 @@ static class PropertyPosition {
 
     static class OracleGenerationListener implements GenerationListener {
 
-        org.kie.commons.java.nio.file.Path output;
+        org.uberfire.java.nio.file.Path output;
 
         IOService ioService;
 
         OpenOption option;
 
         List<FileChangeDescriptor> fileChanges = new ArrayList<FileChangeDescriptor>();
 
-        public OracleGenerationListener(IOService ioService, org.kie.commons.java.nio.file.Path output, OpenOption option) {
+        public OracleGenerationListener(IOService ioService, org.uberfire.java.nio.file.Path output, OpenOption option) {
             this.ioService = ioService;
             this.output = output;
             this.option = option;
@@ -396,8 +394,8 @@ public OracleGenerationListener(IOService ioService, org.kie.commons.java.nio.fi
         public void assetGenerated(String fileName, String content) {
 
             String subDir;
-            org.kie.commons.java.nio.file.Path subDirPath;
-            org.kie.commons.java.nio.file.Path destFilePath;
+            org.uberfire.java.nio.file.Path subDirPath;
+            org.uberfire.java.nio.file.Path destFilePath;
             StringTokenizer dirNames;
 
             subDirPath = output;