Updated Branches: refs/heads/master 03bd52d81 -> 6282fa367
build issue Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6282fa36 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6282fa36 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6282fa36 Branch: refs/heads/master Commit: 6282fa367c6f0ac4b519eb1a20b7f849f41fe9a9 Parents: 03bd52d Author: chathuri <[email protected]> Authored: Fri Feb 7 14:22:09 2014 -0500 Committer: chathuri <[email protected]> Committed: Fri Feb 7 14:22:09 2014 -0500 ---------------------------------------------------------------------- .../registry/jpa/impl/ExperimentRegistry.java | 4 +-- .../persistance/registry/jpa/impl/UserReg.java | 32 ++++++++++++++++++++ .../registry/jpa/impl/UserRegistry.java | 32 -------------------- 3 files changed, 34 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/6282fa36/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java index b2c816b..4028eed 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java @@ -37,7 +37,7 @@ import java.util.*; public class ExperimentRegistry { private GatewayRegistry gatewayRegistry; - private UserRegistry userRegistry; + private UserReg userRegistry; private final static Logger logger = LoggerFactory.getLogger(ExperimentRegistry.class); public void add(BasicMetadata basicMetadata) { @@ -341,7 +341,7 @@ public class ExperimentRegistry { gatewayRegistry = new GatewayRegistry(); GatewayResource gateway = gatewayRegistry.getGateway(); if (fieldName.equals(Constants.FieldConstants.BasicMetadataConstants.USER_NAME)){ - userRegistry = new UserRegistry(); + userRegistry = new UserReg(); WorkerResource worker = userRegistry.getWorker(gateway.getGatewayName(), (String) value); List<Resource> resources = worker.get(ResourceType.EXPERIMENT_METADATA); for (Resource resource : resources){ http://git-wip-us.apache.org/repos/asf/airavata/blob/6282fa36/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/UserReg.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/UserReg.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/UserReg.java new file mode 100644 index 0000000..a7b013c --- /dev/null +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/UserReg.java @@ -0,0 +1,32 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.apache.airavata.persistance.registry.jpa.impl; + +import org.apache.airavata.persistance.registry.jpa.ResourceUtils; +import org.apache.airavata.persistance.registry.jpa.resources.WorkerResource; + +public class UserReg { + public WorkerResource getWorker (String gatewayName, String username) { + WorkerResource worker = (WorkerResource)ResourceUtils.getWorker(gatewayName, username); + return worker; + } +} http://git-wip-us.apache.org/repos/asf/airavata/blob/6282fa36/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/UserRegistry.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/UserRegistry.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/UserRegistry.java deleted file mode 100644 index 670f155..0000000 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/UserRegistry.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.airavata.persistance.registry.jpa.impl; - -import org.apache.airavata.persistance.registry.jpa.ResourceUtils; -import org.apache.airavata.persistance.registry.jpa.resources.WorkerResource; - -public class UserRegistry { - public WorkerResource getWorker (String gatewayName, String username) { - WorkerResource worker = (WorkerResource)ResourceUtils.getWorker(gatewayName, username); - return worker; - } -}
