You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ad...@apache.org on 2017/04/13 17:50:29 UTC

airavata git commit: Changing package name to core from commons

Repository: airavata
Updated Branches:
  refs/heads/feature-workload-mgmt c99f18abe -> a974f3fb2


Changing package name to core from commons


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a974f3fb
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a974f3fb
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a974f3fb

Branch: refs/heads/feature-workload-mgmt
Commit: a974f3fb203859e2d6390e9d9d46044b1095ca88
Parents: c99f18a
Author: Ajinkya Dhamnaskar <ad...@apache.org>
Authored: Thu Apr 13 13:50:25 2017 -0400
Committer: Ajinkya Dhamnaskar <ad...@apache.org>
Committed: Thu Apr 13 13:50:25 2017 -0400

----------------------------------------------------------------------
 .../worker/core/authentication/AuthenticationInfo.java    |  2 +-
 .../worker/core/authentication/GSIAuthenticationInfo.java |  2 +-
 .../worker/core/authentication/SSHKeyAuthentication.java  |  2 +-
 .../core/authentication/SSHPasswordAuthentication.java    |  2 +-
 .../core/authentication/SSHPublicKeyAuthentication.java   |  2 +-
 .../authentication/SSHPublicKeyFileAuthentication.java    |  2 +-
 .../worker/core/cluster/AbstractRemoteCluster.java        |  6 +++---
 .../apache/airavata/worker/core/cluster/CommandInfo.java  |  2 +-
 .../airavata/worker/core/cluster/CommandOutput.java       |  2 +-
 .../airavata/worker/core/cluster/JobSubmissionOutput.java |  2 +-
 .../apache/airavata/worker/core/cluster/OutputParser.java |  2 +-
 .../airavata/worker/core/cluster/RawCommandInfo.java      |  2 +-
 .../airavata/worker/core/cluster/RemoteCluster.java       |  8 ++++----
 .../apache/airavata/worker/core/cluster/ServerInfo.java   |  2 +-
 .../worker/core/config/DataTransferTaskConfig.java        |  2 +-
 .../worker/core/config/JobSubmitterTaskConfig.java        |  2 +-
 .../airavata/worker/core/config/ResourceConfig.java       |  2 +-
 .../worker/core/config/WorkerYamlConfigruation.java       |  4 ++--
 .../airavata/worker/core/context/ProcessContext.java      | 10 +++++-----
 .../apache/airavata/worker/core/context/TaskContext.java  |  2 +-
 .../airavata/worker/core/exceptions/SSHApiException.java  |  2 +-
 .../airavata/worker/core/exceptions/WorkerException.java  |  2 +-
 .../java/org/apache/airavata/worker/core/task/Task.java   |  4 ++--
 .../apache/airavata/worker/core/task/TaskException.java   |  2 +-
 .../worker/core/utils/JobManagerConfiguration.java        |  6 +++---
 .../airavata/worker/core/utils/WorkerConstants.java       |  2 +-
 .../apache/airavata/worker/core/utils/WorkerFactory.java  |  8 ++++----
 .../apache/airavata/worker/core/utils/WorkerUtils.java    |  8 ++++----
 28 files changed, 47 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/AuthenticationInfo.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/AuthenticationInfo.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/AuthenticationInfo.java
index 51e94c8..8f53891 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/AuthenticationInfo.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/AuthenticationInfo.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.authentication;
+package org.apache.airavata.worker.core.authentication;
 
 /**
  * An empty interface that represents authentication data to the API.

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/GSIAuthenticationInfo.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/GSIAuthenticationInfo.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/GSIAuthenticationInfo.java
index db33fb2..9db685c 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/GSIAuthenticationInfo.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/GSIAuthenticationInfo.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.authentication;
+package org.apache.airavata.worker.core.authentication;
 
 import org.ietf.jgss.GSSCredential;
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHKeyAuthentication.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHKeyAuthentication.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHKeyAuthentication.java
index 57a567e..0e8d871 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHKeyAuthentication.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHKeyAuthentication.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.authentication;
+package org.apache.airavata.worker.core.authentication;
 
 /**
  * User: AmilaJ (amilaj@apache.org)

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHPasswordAuthentication.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHPasswordAuthentication.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHPasswordAuthentication.java
index 2f9d372..c29a81e 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHPasswordAuthentication.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHPasswordAuthentication.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.authentication;
+package org.apache.airavata.worker.core.authentication;
 
 /**
  * Password authentication for vanilla SSH.

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHPublicKeyAuthentication.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHPublicKeyAuthentication.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHPublicKeyAuthentication.java
index 8134065..5b58367 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHPublicKeyAuthentication.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHPublicKeyAuthentication.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.authentication;
+package org.apache.airavata.worker.core.authentication;
 
 /**
  * Public key authentication for vanilla SSH.

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHPublicKeyFileAuthentication.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHPublicKeyFileAuthentication.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHPublicKeyFileAuthentication.java
index 1915d21..458a316 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHPublicKeyFileAuthentication.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/authentication/SSHPublicKeyFileAuthentication.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.authentication;
+package org.apache.airavata.worker.core.authentication;
 
 /**
  * Public key authentication for vanilla SSH.

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/AbstractRemoteCluster.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/AbstractRemoteCluster.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/AbstractRemoteCluster.java
index 11f2c03..48ffc67 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/AbstractRemoteCluster.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/AbstractRemoteCluster.java
@@ -17,10 +17,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.cluster;
+package org.apache.airavata.worker.core.cluster;
 
-import org.apache.airavata.worker.commons.authentication.AuthenticationInfo;
-import org.apache.airavata.worker.commons.utils.JobManagerConfiguration;
+import org.apache.airavata.worker.core.authentication.AuthenticationInfo;
+import org.apache.airavata.worker.core.utils.JobManagerConfiguration;
 
 public abstract class AbstractRemoteCluster implements RemoteCluster {
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/CommandInfo.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/CommandInfo.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/CommandInfo.java
index 559430a..03a6374 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/CommandInfo.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/CommandInfo.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.cluster;
+package org.apache.airavata.worker.core.cluster;
 
 /**
  * Encapsulates information about

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/CommandOutput.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/CommandOutput.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/CommandOutput.java
index 791616c..904ac0b 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/CommandOutput.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/CommandOutput.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.cluster;
+package org.apache.airavata.worker.core.cluster;
 
 
 import com.jcraft.jsch.Channel;

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/JobSubmissionOutput.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/JobSubmissionOutput.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/JobSubmissionOutput.java
index 85cb033..e4d9765 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/JobSubmissionOutput.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/JobSubmissionOutput.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.cluster;
+package org.apache.airavata.worker.core.cluster;
 
 public class JobSubmissionOutput {
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/OutputParser.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/OutputParser.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/OutputParser.java
index f6f1824..e9b74b5 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/OutputParser.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/OutputParser.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.cluster;
+package org.apache.airavata.worker.core.cluster;
 
 import org.apache.airavata.gfac.core.GFacException;
 import org.apache.airavata.gfac.core.SSHApiException;

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/RawCommandInfo.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/RawCommandInfo.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/RawCommandInfo.java
index 6045f4e..10cd310 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/RawCommandInfo.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/RawCommandInfo.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.cluster;
+package org.apache.airavata.worker.core.cluster;
 
 /**
  * The raw command information. String returned by getCommand is directly executed in SSH

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/RemoteCluster.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/RemoteCluster.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/RemoteCluster.java
index 936e1ce..b3dcf06 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/RemoteCluster.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/RemoteCluster.java
@@ -17,13 +17,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.cluster;
+package org.apache.airavata.worker.core.cluster;
 
 import com.jcraft.jsch.Session;
 import org.apache.airavata.model.status.JobStatus;
-import org.apache.airavata.worker.commons.authentication.AuthenticationInfo;
-import org.apache.airavata.worker.commons.exceptions.WorkerException;
-import org.apache.airavata.worker.commons.exceptions.SSHApiException;
+import org.apache.airavata.worker.core.authentication.AuthenticationInfo;
+import org.apache.airavata.worker.core.exceptions.WorkerException;
+import org.apache.airavata.worker.core.exceptions.SSHApiException;
 
 import java.util.List;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/ServerInfo.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/ServerInfo.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/ServerInfo.java
index a451d2b..23a87df 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/ServerInfo.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/cluster/ServerInfo.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.cluster;
+package org.apache.airavata.worker.core.cluster;
 
 /**
  * Encapsulate server information.

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/DataTransferTaskConfig.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/DataTransferTaskConfig.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/DataTransferTaskConfig.java
index 1241435..872128c 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/DataTransferTaskConfig.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/DataTransferTaskConfig.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.config;
+package org.apache.airavata.worker.core.config;
 
 import org.apache.airavata.model.data.movement.DataMovementProtocol;
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/JobSubmitterTaskConfig.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/JobSubmitterTaskConfig.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/JobSubmitterTaskConfig.java
index 5744345..ec69634 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/JobSubmitterTaskConfig.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/JobSubmitterTaskConfig.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.config;
+package org.apache.airavata.worker.core.config;
 
 import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/ResourceConfig.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/ResourceConfig.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/ResourceConfig.java
index 12eed5a..d6b0675 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/ResourceConfig.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/ResourceConfig.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.config;
+package org.apache.airavata.worker.core.config;
 
 import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType;
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/WorkerYamlConfigruation.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/WorkerYamlConfigruation.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/WorkerYamlConfigruation.java
index 5d2e372..b026de9 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/WorkerYamlConfigruation.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/config/WorkerYamlConfigruation.java
@@ -17,12 +17,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.config;
+package org.apache.airavata.worker.core.config;
 
 import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
 import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType;
 import org.apache.airavata.model.data.movement.DataMovementProtocol;
-import org.apache.airavata.worker.commons.exceptions.WorkerException;
+import org.apache.airavata.worker.core.exceptions.WorkerException;
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.InputStream;

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/context/ProcessContext.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/context/ProcessContext.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/context/ProcessContext.java
index 53bda5b..ccb1912 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/context/ProcessContext.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/context/ProcessContext.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.context;
+package org.apache.airavata.worker.core.context;
 
 import org.apache.airavata.common.utils.AiravataUtils;
 import org.apache.airavata.messaging.core.Publisher;
@@ -43,10 +43,10 @@ import org.apache.airavata.model.status.ProcessStatus;
 import org.apache.airavata.model.task.TaskModel;
 import org.apache.airavata.registry.cpi.AppCatalog;
 import org.apache.airavata.registry.cpi.ExperimentCatalog;
-import org.apache.airavata.worker.commons.authentication.SSHKeyAuthentication;
-import org.apache.airavata.worker.commons.cluster.RemoteCluster;
-import org.apache.airavata.worker.commons.cluster.ServerInfo;
-import org.apache.airavata.worker.commons.exceptions.WorkerException;
+import org.apache.airavata.worker.core.authentication.SSHKeyAuthentication;
+import org.apache.airavata.worker.core.cluster.RemoteCluster;
+import org.apache.airavata.worker.core.cluster.ServerInfo;
+import org.apache.airavata.worker.core.exceptions.WorkerException;
 import org.apache.curator.framework.CuratorFramework;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/context/TaskContext.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/context/TaskContext.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/context/TaskContext.java
index f94ebd5..191a51d 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/context/TaskContext.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/context/TaskContext.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.context;
+package org.apache.airavata.worker.core.context;
 
 import org.apache.airavata.common.utils.ThriftUtils;
 import org.apache.airavata.model.application.io.InputDataObjectType;

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/exceptions/SSHApiException.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/exceptions/SSHApiException.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/exceptions/SSHApiException.java
index 0dcdd0e..03c1b7d 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/exceptions/SSHApiException.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/exceptions/SSHApiException.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.exceptions;
+package org.apache.airavata.worker.core.exceptions;
 
 /**
  * An exception class to wrap SSH command execution related errors.

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/exceptions/WorkerException.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/exceptions/WorkerException.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/exceptions/WorkerException.java
index 334ee0f..92560b6 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/exceptions/WorkerException.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/exceptions/WorkerException.java
@@ -1,4 +1,4 @@
-package org.apache.airavata.worker.commons.exceptions;
+package org.apache.airavata.worker.core.exceptions;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/task/Task.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/task/Task.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/task/Task.java
index b7a8b45..d5ca2ce 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/task/Task.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/task/Task.java
@@ -17,11 +17,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.task;
+package org.apache.airavata.worker.core.task;
 
 import org.apache.airavata.model.status.TaskStatus;
 import org.apache.airavata.model.task.TaskTypes;
-import org.apache.airavata.worker.commons.context.TaskContext;
+import org.apache.airavata.worker.core.context.TaskContext;
 
 import java.util.Map;
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/task/TaskException.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/task/TaskException.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/task/TaskException.java
index d290881..cdfb2cf 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/task/TaskException.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/task/TaskException.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.task;
+package org.apache.airavata.worker.core.task;
 
 public class TaskException extends Exception {
 	private static final long serialVersionUID = 8662332011259328779L;

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/JobManagerConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/JobManagerConfiguration.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/JobManagerConfiguration.java
index 022cb79..c403372 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/JobManagerConfiguration.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/JobManagerConfiguration.java
@@ -1,7 +1,7 @@
-package org.apache.airavata.worker.commons.utils;
+package org.apache.airavata.worker.core.utils;
 
-import org.apache.airavata.worker.commons.cluster.OutputParser;
-import org.apache.airavata.worker.commons.cluster.RawCommandInfo;
+import org.apache.airavata.worker.core.cluster.OutputParser;
+import org.apache.airavata.worker.core.cluster.RawCommandInfo;
 
 /**
  * Created by goshenoy on 4/12/17.

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/WorkerConstants.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/WorkerConstants.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/WorkerConstants.java
index 5fa5fc4..dfaa2d4 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/WorkerConstants.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/WorkerConstants.java
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.airavata.worker.commons.utils;
+package org.apache.airavata.worker.core.utils;
 
 public class WorkerConstants {
 	public static final String XPATH_EXPR_GLOBAL_INFLOW_HANDLERS = "/GFac/GlobalHandlers/InHandlers/Handler";

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/WorkerFactory.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/WorkerFactory.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/WorkerFactory.java
index 4ab403f..6dcd275 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/WorkerFactory.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/WorkerFactory.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package org.apache.airavata.worker.commons.utils;
+package org.apache.airavata.worker.core.utils;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
@@ -26,9 +26,9 @@ import com.google.common.cache.RemovalListener;
 import com.jcraft.jsch.Session;
 import org.apache.airavata.common.utils.ServerSettings;
 import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType;
-import org.apache.airavata.worker.commons.config.ResourceConfig;
-import org.apache.airavata.worker.commons.config.WorkerYamlConfigruation;
-import org.apache.airavata.worker.commons.exceptions.WorkerException;
+import org.apache.airavata.worker.core.config.ResourceConfig;
+import org.apache.airavata.worker.core.config.WorkerYamlConfigruation;
+import org.apache.airavata.worker.core.exceptions.WorkerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/a974f3fb/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/WorkerUtils.java
----------------------------------------------------------------------
diff --git a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/WorkerUtils.java b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/WorkerUtils.java
index dd244fb..ef11c20 100644
--- a/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/WorkerUtils.java
+++ b/modules/worker/worker-core/src/main/java/org/apache/airavata/worker/core/utils/WorkerUtils.java
@@ -1,4 +1,4 @@
-package org.apache.airavata.worker.commons.utils;
+package org.apache.airavata.worker.core.utils;
 
 import org.apache.airavata.common.utils.AiravataUtils;
 import org.apache.airavata.messaging.core.MessageContext;
@@ -9,9 +9,9 @@ import org.apache.airavata.model.messaging.event.*;
 import org.apache.airavata.model.status.*;
 import org.apache.airavata.registry.cpi.*;
 import org.apache.airavata.registry.cpi.utils.Constants;
-import org.apache.airavata.worker.commons.context.ProcessContext;
-import org.apache.airavata.worker.commons.context.TaskContext;
-import org.apache.airavata.worker.commons.exceptions.WorkerException;
+import org.apache.airavata.worker.core.context.ProcessContext;
+import org.apache.airavata.worker.core.context.TaskContext;
+import org.apache.airavata.worker.core.exceptions.WorkerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;