Repository: oodt Updated Branches: refs/heads/avro_rpc 92768b495 -> ab96c215d
fix merge Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/ab96c215 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/ab96c215 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/ab96c215 Branch: refs/heads/avro_rpc Commit: ab96c215d592f036ad430cf3e4018ec9de21dcd9 Parents: 92768b4 Author: Tom Barber <[email protected]> Authored: Fri Jul 1 23:14:27 2016 +0100 Committer: Tom Barber <[email protected]> Committed: Fri Jul 1 23:14:27 2016 +0100 ---------------------------------------------------------------------- catalog/pom.xml | 22 + .../AvrorpcCommunicationChannelClient.java | 426 +++++++++++++------ .../AvrorpcCommunicationChannelServer.java | 9 +- .../FilemgrUniquenessCheckComparator.java | 1 + .../org/apache/oodt/pcs/tools/PCSTrace.java | 2 +- .../oodt/pcs/util/WorkflowManagerUtils.java | 2 + .../apache/oodt/cas/pge/PGETaskInstance.java | 10 +- .../apache/oodt/cas/pge/staging/FileStager.java | 5 +- .../oodt/cas/pge/TestPGETaskInstance.java | 2 + .../profile/handlers/cas/CASProfileHandler.java | 2 + .../oodt/cas/product/CASProductHandler.java | 3 +- .../cas/product/data/DataDeliveryServlet.java | 1 + .../product/data/DatasetDeliveryServlet.java | 1 + .../jaxrs/services/CasProductJaxrsService.java | 3 +- .../oodt/cas/product/rdf/RDFDatasetServlet.java | 4 +- .../oodt/cas/product/rdf/RDFProductServlet.java | 4 +- .../oodt/cas/product/rss/RSSProductServlet.java | 1 + .../product/rss/RSSProductTransferServlet.java | 4 +- workflow/pom.xml | 48 +++ .../cli/action/GetFirstPageCliAction.java | 3 +- .../cli/action/GetLastPageCliAction.java | 3 +- .../cli/action/GetNextPageCliAction.java | 3 +- .../cli/action/GetPrevPageCliAction.java | 3 +- .../cas/workflow/examples/BranchRedirector.java | 3 +- .../examples/RandomStatusUpdateTask.java | 2 + .../system/XmlRpcWorkflowManagerClient.java | 7 +- .../cas/workflow/tools/InstanceRepoCleaner.java | 5 +- .../oodt/cas/workflow/util/AvroTypeFactory.java | 2 +- .../system/MockXmlRpcWorkflowManagerClient.java | 6 +- .../system/TestWorkflowManagerClient.java | 4 +- 30 files changed, 439 insertions(+), 152 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/catalog/pom.xml ---------------------------------------------------------------------- diff --git a/catalog/pom.xml b/catalog/pom.xml index 72c538b..77ffa77 100644 --- a/catalog/pom.xml +++ b/catalog/pom.xml @@ -97,6 +97,11 @@ <groupId>xmlrpc</groupId> <artifactId>xmlrpc</artifactId> </dependency> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro-ipc</artifactId> + <version>1.8.1</version> + </dependency> </dependencies> <build> <resources> @@ -116,6 +121,23 @@ </resources> <plugins> <plugin> + <groupId>org.apache.avro</groupId> + <artifactId>avro-maven-plugin</artifactId> + <version>1.7.7</version> + <configuration> + <stringType>String</stringType> + </configuration> + <executions> + <execution> + <id>schemas</id> + <phase>generate-sources</phase> + <goals> + <goal>protocol</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-2</version> http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/avrorpc/AvrorpcCommunicationChannelClient.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/avrorpc/AvrorpcCommunicationChannelClient.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/avrorpc/AvrorpcCommunicationChannelClient.java index 5a859cd..38eac67 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/avrorpc/AvrorpcCommunicationChannelClient.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/avrorpc/AvrorpcCommunicationChannelClient.java @@ -43,108 +43,192 @@ public class AvrorpcCommunicationChannelClient extends AbstractCommunicationChan } @Override - public void shutdown() throws Exception { - this.proxy.avrorpc_shutdown(); + public void shutdown() { + try{ + this.proxy.avrorpc_shutdown(); + } + catch (Exception e){ + + } } @Override - public boolean isRestrictQueryPermissions() throws Exception { - return this.serializer.deserializeObject(Boolean.class,(String) this.proxy.avrorpc_isRestrictQueryPermissions()); + public boolean isRestrictQueryPermissions() { + try { + return this.serializer.deserializeObject(Boolean.class, (String) this.proxy.avrorpc_isRestrictQueryPermissions()); + } + catch (Exception e){ + return false; + } } @Override - public boolean isRestrictIngestPermissions() throws Exception { - return this.serializer.deserializeObject(Boolean.class, (String) this.proxy.avrorpc_isRestrictIngestPermissions()); + public boolean isRestrictIngestPermissions() { + try { + return this.serializer.deserializeObject(Boolean.class, (String) this.proxy.avrorpc_isRestrictIngestPermissions()); + } + catch(Exception e){ +return false; + } } @Override - public void addCatalog(Catalog catalog) throws Exception { - this.proxy.avrorpc_addCatalog1(this.serializer.serializeObject(catalog)); + public void addCatalog(Catalog catalog) { + try { + this.proxy.avrorpc_addCatalog1(this.serializer.serializeObject(catalog)); + } + catch(Exception e){ + + } } @Override - public void replaceCatalog(Catalog catalog) throws Exception { - this.proxy.avrorpc_replaceCatalog( - this.serializer.serializeObject(catalog) - ); + public void replaceCatalog(Catalog catalog) { + try { + this.proxy.avrorpc_replaceCatalog( + this.serializer.serializeObject(catalog) + ); + } + catch(Exception e){ + + } } @Override - public void addCatalog(String catalogId, Index index) throws Exception { - this.proxy.avrorpc_addCatalog2(catalogId, - this.serializer.serializeObject(index)); + public void addCatalog(String catalogId, Index index) { + try { + this.proxy.avrorpc_addCatalog2(catalogId, + this.serializer.serializeObject(index)); + } + catch(Exception e){ + + } } @Override - public void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries) throws Exception { - this.proxy.avrorpc_addCatalog3(catalogId, - this.serializer.serializeObject(index), - this.serializer.serializeObject(dictionaries)); + public void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries) { + try { + this.proxy.avrorpc_addCatalog3(catalogId, + this.serializer.serializeObject(index), + this.serializer.serializeObject(dictionaries)); + } + catch (Exception e){ + + } } @Override - public void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries, boolean restrictQueryPermission, boolean restrictIngestPermission) throws Exception { - this.proxy.avrorpc_addCatalog5(catalogId, - this.serializer.serializeObject(index), - this.serializer.serializeObject(dictionaries), - this.serializer.serializeObject(restrictQueryPermission), - this.serializer.serializeObject(restrictIngestPermission)); + public void addCatalog(String catalogId, Index index, List<Dictionary> dictionaries, boolean restrictQueryPermission, boolean restrictIngestPermission) { + try { + this.proxy.avrorpc_addCatalog5(catalogId, + this.serializer.serializeObject(index), + this.serializer.serializeObject(dictionaries), + this.serializer.serializeObject(restrictQueryPermission), + this.serializer.serializeObject(restrictIngestPermission)); + } + catch(Exception e){ + + } } @Override - public void addDictionary(String catalogId, Dictionary dictionary) throws Exception { - this.proxy.avrorpc_addDictionary(catalogId, - this.serializer.serializeObject(dictionary)); + public void addDictionary(String catalogId, Dictionary dictionary) { + try { + this.proxy.avrorpc_addDictionary(catalogId, + this.serializer.serializeObject(dictionary)); + } + catch (Exception e){ + + } } @Override - public void replaceDictionaries(String catalogId, List<Dictionary> dictionaries) throws Exception { - this.proxy.avrorpc_replaceDictionaries(catalogId, - this.serializer.serializeObject(dictionaries)); + public void replaceDictionaries(String catalogId, List<Dictionary> dictionaries) { + try { + this.proxy.avrorpc_replaceDictionaries(catalogId, + this.serializer.serializeObject(dictionaries)); + } + catch (Exception e){ + + } } @Override - public void replaceIndex(String catalogId, Index index) throws Exception { - this.proxy.avrorpc_replaceIndex(catalogId, - this.serializer.serializeObject(index)); + public void replaceIndex(String catalogId, Index index) { + try { + this.proxy.avrorpc_replaceIndex(catalogId, + this.serializer.serializeObject(index)); + } + catch (Exception e){ + + } } @Override - public void modifyIngestPermission(String catalogId, boolean restrictIngestPermission) throws Exception { - this.proxy.avrorpc_modifyIngestPermission(catalogId, - this.serializer.serializeObject(restrictIngestPermission)); + public void modifyIngestPermission(String catalogId, boolean restrictIngestPermission) { + try { + this.proxy.avrorpc_modifyIngestPermission(catalogId, + this.serializer.serializeObject(restrictIngestPermission)); + } catch (Exception e){ + + } } @Override - public void modifyQueryPermission(String catalogId, boolean restrictQueryPermission) throws Exception { - this.proxy.avrorpc_modifyQueryPermission(catalogId, - this.serializer.serializeObject(restrictQueryPermission)); + public void modifyQueryPermission(String catalogId, boolean restrictQueryPermission) { + try { + this.proxy.avrorpc_modifyQueryPermission(catalogId, + this.serializer.serializeObject(restrictQueryPermission)); + } + catch (Exception e){ + + } } @Override - public void removeCatalog(String catalogUrn) throws Exception { - this.proxy.avrorpc_removeCatalog(catalogUrn); + public void removeCatalog(String catalogUrn) { + try { + this.proxy.avrorpc_removeCatalog(catalogUrn); + } + catch (Exception e){ + + } } @Override - public List<PluginURL> getPluginUrls() throws Exception { - return this.serializer.deserializeObject(List.class,(String)this.proxy.avrorpc_getPluginUrls()); + public List<PluginURL> getPluginUrls() { + try { + return this.serializer.deserializeObject(List.class, (String) this.proxy.avrorpc_getPluginUrls()); + } + catch (Exception e){ + return null; + } } @Override - public void addPluginUrls(List<PluginURL> pluginUrls) throws Exception { - this.proxy.avrorpc_addPluginUrls(this.serializer.serializeObject(pluginUrls)); + public void addPluginUrls(List<PluginURL> pluginUrls) { + try { + this.proxy.avrorpc_addPluginUrls(this.serializer.serializeObject(pluginUrls)); + } + catch (Exception e){ + + } } @Override - public URL getPluginStorageDir() throws Exception { - return this.serializer.deserializeObject(URL.class,this.proxy.avrorpc_getPluginStorageDir()); + public URL getPluginStorageDir() { + try { + return this.serializer.deserializeObject(URL.class, this.proxy.avrorpc_getPluginStorageDir()); + } + catch (Exception e){ + return null; + } } @Override - public void transferUrl(URL fromUrl, URL toURL) throws Exception { + public void transferUrl(URL fromUrl, URL toURL) { System.out.println("Transfering '" + fromUrl + "' to '" + toURL + "'"); FileInputStream is = null; try { @@ -155,7 +239,7 @@ public class AvrorpcCommunicationChannelClient extends AbstractCommunicationChan while ((numBytes = is.read(buf, offset, chunkSize)) != -1) this.transferFile(new File(toURL.getPath()).getAbsolutePath(), buf, offset, numBytes); }catch (Exception e) { - throw e; + }finally { try { is.close(); @@ -164,136 +248,238 @@ public class AvrorpcCommunicationChannelClient extends AbstractCommunicationChan } protected void transferFile(String filePath, byte[] fileData, int offset, - int numBytes) throws Exception { - this.proxy.avrorpc_transferFile(filePath,ByteBuffer.wrap(fileData),offset,numBytes); + int numBytes) { + try { + this.proxy.avrorpc_transferFile(filePath, ByteBuffer.wrap(fileData), offset, numBytes); + } + catch (Exception e){ + + } } @Override - public Set<String> getCurrentCatalogIds() throws Exception { - return this.serializer.deserializeObject(Set.class,(String)this.proxy.avrorpc_getCurrentCatalogIds()); + public Set<String> getCurrentCatalogIds() { + try { + return this.serializer.deserializeObject(Set.class, (String) this.proxy.avrorpc_getCurrentCatalogIds()); + } + catch (Exception e){ + return null; + } + } @Override - public TransactionReceipt ingest(Metadata metadata) throws Exception { - return this.serializer.deserializeObject(TransactionReceipt.class,(String)this.proxy.avrorpc_ingest(this.serializer.serializeObject(metadata))); + public TransactionReceipt ingest(Metadata metadata) { + try { + return this.serializer.deserializeObject(TransactionReceipt.class, (String) this.proxy.avrorpc_ingest(this.serializer.serializeObject(metadata))); + } + catch (Exception e){ + return null; + } } @Override - public void delete(Metadata metadata) throws Exception { - this.proxy.avrorpc_delete(this.serializer.serializeObject(metadata)); + public void delete(Metadata metadata) { + try { + this.proxy.avrorpc_delete(this.serializer.serializeObject(metadata)); + } + catch (Exception e){ + + } } @Override - public List<String> getProperty(String key) throws Exception { - return this.serializer.deserializeObject(List.class,(String)this.proxy.avrorpc_getProperty(key)); + public List<String> getProperty(String key) { + try { + return this.serializer.deserializeObject(List.class, (String) this.proxy.avrorpc_getProperty(key)); + } + catch (Exception e){ + return null; + } } @Override - public Properties getCalalogProperties() throws Exception { - return this.serializer.deserializeObject(Properties.class,(String)this.proxy.avrorpc_getCalalogProperties1()); + public Properties getCalalogProperties() { + try { + return this.serializer.deserializeObject(Properties.class, (String) this.proxy.avrorpc_getCalalogProperties1()); + } + catch (Exception e){ + return null; + } } @Override - public Properties getCalalogProperties(String catalogUrn) throws Exception { - return this.serializer.deserializeObject(Properties.class,(String)this.proxy.avrorpc_getCalalogProperties2(catalogUrn)); + public Properties getCalalogProperties(String catalogUrn) { + try { + return this.serializer.deserializeObject(Properties.class, (String) this.proxy.avrorpc_getCalalogProperties2(catalogUrn)); + } + catch (Exception e){ + return null; + } } @Override - public Page getNextPage(Page page) throws Exception { - return this.serializer.deserializeObject(Page.class,(String)this.proxy.avrorpc_getNextPage2(this.serializer.serializeObject(page))); + public Page getNextPage(Page page) { + try { + return this.serializer.deserializeObject(Page.class, (String) this.proxy.avrorpc_getNextPage2(this.serializer.serializeObject(page))); + } + catch (Exception e){ + return null; + } } @Override - public Page getPage(PageInfo pageInfo, QueryExpression queryExpression) throws Exception { - return this.serializer.deserializeObject(Page.class,(String)this.proxy.avrorpc_getPage2( - this.serializer.serializeObject(pageInfo), this.serializer.serializeObject(queryExpression))); + public Page getPage(PageInfo pageInfo, QueryExpression queryExpression) { + try { + return this.serializer.deserializeObject(Page.class, (String) this.proxy.avrorpc_getPage2( + this.serializer.serializeObject(pageInfo), this.serializer.serializeObject(queryExpression))); + } + catch (Exception e){ + return null; + } } @Override - public Page getPage(PageInfo pageInfo, QueryExpression queryExpression, Set<String> catalogIds) throws Exception { - return this.serializer.deserializeObject(Page.class,(String)this.proxy.avrorpc_getPage3( - this.serializer.serializeObject(pageInfo), - this.serializer.serializeObject(queryExpression), - this.serializer.serializeObject(catalogIds) - )); + public Page getPage(PageInfo pageInfo, QueryExpression queryExpression, Set<String> catalogIds) { + try { + return this.serializer.deserializeObject(Page.class, (String) this.proxy.avrorpc_getPage3( + this.serializer.serializeObject(pageInfo), + this.serializer.serializeObject(queryExpression), + this.serializer.serializeObject(catalogIds) + )); + } + catch (Exception e){ + return null; + } } @Override - public List<TransactionalMetadata> getMetadata(Page page) throws Exception { - return this.serializer.deserializeObject(List.class,(String)this.proxy.avrorpc_getMetadata( - this.serializer.serializeObject(page) - )); + public List<TransactionalMetadata> getMetadata(Page page) { + try { + return this.serializer.deserializeObject(List.class, (String) this.proxy.avrorpc_getMetadata( + this.serializer.serializeObject(page) + )); + } + catch (Exception e){ + return null; + } } @Override - public QueryPager query(QueryExpression queryExpression) throws Exception { - return this.serializer.deserializeObject(QueryPager.class,(String)this.proxy.avrorpc_query1( - this.serializer.serializeObject(queryExpression) - )); + public QueryPager query(QueryExpression queryExpression) { + try { + return this.serializer.deserializeObject(QueryPager.class, (String) this.proxy.avrorpc_query1( + this.serializer.serializeObject(queryExpression) + )); + } + catch (Exception e){ + return null; + } } @Override - public QueryPager query(QueryExpression queryExpression, Set<String> catalogIds) throws Exception { - return this.serializer.deserializeObject(QueryPager.class,(String)this.proxy.avrorpc_query2( - this.serializer.serializeObject(queryExpression), - this.serializer.serializeObject(catalogIds) - )); + public QueryPager query(QueryExpression queryExpression, Set<String> catalogIds) { + try { + return this.serializer.deserializeObject(QueryPager.class, (String) this.proxy.avrorpc_query2( + this.serializer.serializeObject(queryExpression), + this.serializer.serializeObject(catalogIds) + )); + } + catch (Exception e){ + return null; + } } @Override - public List<TransactionalMetadata> getNextPage(QueryPager queryPager) throws Exception { - return this.serializer.deserializeObject(List.class,(String)this.proxy.avrorpc_getNextPage( - this.serializer.serializeObject(queryPager) - )); + public List<TransactionalMetadata> getNextPage(QueryPager queryPager) { + try { + return this.serializer.deserializeObject(List.class, (String) this.proxy.avrorpc_getNextPage( + this.serializer.serializeObject(queryPager) + )); + } + catch (Exception e){ + return null; + } } // somethings is wrong @Override - public List<TransactionId<?>> getTransactionIdsForAllPages(QueryPager queryPager) throws Exception { + public List<TransactionId<?>> getTransactionIdsForAllPages(QueryPager queryPager) { return null; } @Override - public List<TransactionalMetadata> getAllPages(QueryPager queryPager) throws Exception { - return this.serializer.deserializeObject(List.class,(String)this.proxy.avrorpc_getAllPages( - this.serializer.serializeObject(queryPager) - )); + public List<TransactionalMetadata> getAllPages(QueryPager queryPager) { + try { + return this.serializer.deserializeObject(List.class, (String) this.proxy.avrorpc_getAllPages( + this.serializer.serializeObject(queryPager) + )); + } + catch (Exception e){ + return null; + } } @Override - public List<TransactionalMetadata> getMetadataFromTransactionIdStrings(List<String> catalogServiceTransactionIdStrings) throws Exception { - return this.serializer.deserializeObject(List.class,(String)this.proxy.avrorpc_getMetadataFromTransactionIdStrings( - this.serializer.serializeObject(catalogServiceTransactionIdStrings) - )); + public List<TransactionalMetadata> getMetadataFromTransactionIdStrings(List<String> catalogServiceTransactionIdStrings) { + try { + return this.serializer.deserializeObject(List.class, (String) this.proxy.avrorpc_getMetadataFromTransactionIdStrings( + this.serializer.serializeObject(catalogServiceTransactionIdStrings) + )); + } + catch (Exception e){ +return null; + } } @Override - public List<TransactionalMetadata> getMetadataFromTransactionIds(List<TransactionId<?>> catalogServiceTransactionIds) throws Exception { - return this.serializer.deserializeObject(List.class,(String)this.proxy.avrorpc_getMetadataFromTransactionIds( - this.serializer.serializeObject(catalogServiceTransactionIds) - )); + public List<TransactionalMetadata> getMetadataFromTransactionIds(List<TransactionId<?>> catalogServiceTransactionIds) { + try { + return this.serializer.deserializeObject(List.class, (String) this.proxy.avrorpc_getMetadataFromTransactionIds( + this.serializer.serializeObject(catalogServiceTransactionIds) + )); + } + catch (Exception e){ +return null; + } } @Override - public List<TransactionId<?>> getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds, String catalogUrn) throws Exception { - return this.serializer.deserializeObject(List.class,(String)this.proxy.avrorpc_getCatalogServiceTransactionId2( - this.serializer.serializeObject(catalogTransactionIds), - catalogUrn - )); + public List<TransactionId<?>> getCatalogServiceTransactionIds(List<TransactionId<?>> catalogTransactionIds, String catalogUrn) { + try { + return this.serializer.deserializeObject(List.class, (String) this.proxy.avrorpc_getCatalogServiceTransactionId2( + this.serializer.serializeObject(catalogTransactionIds), + catalogUrn + )); + } + catch (Exception e){ + return null; + } } @Override - public TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn) throws Exception { - return this.serializer.deserializeObject(TransactionId.class,(String)this.proxy.avrorpc_getCatalogServiceTransactionId2( - this.serializer.serializeObject(catalogTransactionId), - catalogUrn - )); + public TransactionId<?> getCatalogServiceTransactionId(TransactionId<?> catalogTransactionId, String catalogUrn) { + try { + return this.serializer.deserializeObject(TransactionId.class, (String) this.proxy.avrorpc_getCatalogServiceTransactionId2( + this.serializer.serializeObject(catalogTransactionId), + catalogUrn + )); + } + catch (Exception e){ + return + null; + } } @Override - public TransactionId<?> getCatalogServiceTransactionId(CatalogReceipt catalogReceipt, boolean generateNew) throws Exception { - return this.serializer.deserializeObject(TransactionId.class,(String)this.proxy.avrorpc_getCatalogServiceTransactionId2( - this.serializer.serializeObject(catalogReceipt), - this.serializer.serializeObject(generateNew) - )); + public TransactionId<?> getCatalogServiceTransactionId(CatalogReceipt catalogReceipt, boolean generateNew) { + try { + return this.serializer.deserializeObject(TransactionId.class, (String) this.proxy.avrorpc_getCatalogServiceTransactionId2( + this.serializer.serializeObject(catalogReceipt), + this.serializer.serializeObject(generateNew) + )); + } + catch (Exception e){ + return null; + } } } http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/avrorpc/AvrorpcCommunicationChannelServer.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/avrorpc/AvrorpcCommunicationChannelServer.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/avrorpc/AvrorpcCommunicationChannelServer.java index d6c8255..9003fbb 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/avrorpc/AvrorpcCommunicationChannelServer.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/avrorpc/AvrorpcCommunicationChannelServer.java @@ -420,8 +420,13 @@ public class AvrorpcCommunicationChannelServer extends AbstractCommunicationChan return true;} @Override - public void startup() throws Exception { - avrorpc_startup(); + public void startup() { + try { + avrorpc_startup(); + } + catch (Exception e){ + + } } } http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/crawler/src/main/java/org/apache/oodt/cas/crawl/comparator/FilemgrUniquenessCheckComparator.java ---------------------------------------------------------------------- diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/comparator/FilemgrUniquenessCheckComparator.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/comparator/FilemgrUniquenessCheckComparator.java index 39839ac..95512c1 100644 --- a/crawler/src/main/java/org/apache/oodt/cas/crawl/comparator/FilemgrUniquenessCheckComparator.java +++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/comparator/FilemgrUniquenessCheckComparator.java @@ -23,6 +23,7 @@ import java.io.File; import java.net.URL; //OODT imports +import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient; import org.apache.oodt.cas.filemgr.util.RpcCommunicationFactory; import org.apache.oodt.cas.metadata.exceptions.PreconditionComparatorException; import org.apache.oodt.cas.metadata.preconditions.PreConditionComparator; http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java ---------------------------------------------------------------------- diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java index b22230d..35791ab 100644 --- a/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java +++ b/pcs/core/src/main/java/org/apache/oodt/pcs/tools/PCSTrace.java @@ -60,7 +60,7 @@ public final class PCSTrace implements PCSMetadata, PCSConfigMetadata { public PCSTrace(URL wmgrUrl, URL fmUrl) { fm = new FileManagerUtils(fmUrl); - wm = new WorkflowManagerUtils(wmgrUrl); + wm = new org.apache.oodt.pcs.util.WorkflowManagerUtils(wmgrUrl); } public PCSTrace(String wmgrUrlStr, String fmUrlStr) { http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/pcs/core/src/main/java/org/apache/oodt/pcs/util/WorkflowManagerUtils.java ---------------------------------------------------------------------- diff --git a/pcs/core/src/main/java/org/apache/oodt/pcs/util/WorkflowManagerUtils.java b/pcs/core/src/main/java/org/apache/oodt/pcs/util/WorkflowManagerUtils.java index 01eb558..e74979d 100644 --- a/pcs/core/src/main/java/org/apache/oodt/pcs/util/WorkflowManagerUtils.java +++ b/pcs/core/src/main/java/org/apache/oodt/pcs/util/WorkflowManagerUtils.java @@ -19,7 +19,9 @@ package org.apache.oodt.pcs.util; //JDK imports import org.apache.oodt.cas.workflow.structs.WorkflowInstance; +import org.apache.oodt.cas.workflow.system.WorkflowManagerClient; import org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient; +import org.apache.oodt.cas.workflow.system.rpc.RpcCommunicationFactory; import org.apache.xmlrpc.XmlRpcClient; import java.net.MalformedURLException; http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java ---------------------------------------------------------------------- diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java b/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java index 3ae7668..4f36890 100644 --- a/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java +++ b/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java @@ -139,7 +139,7 @@ public class PGETaskInstance implements WorkflowTaskInstance { } } - protected void updateStatus(String status) throws PGEException, XmlRpcException, IOException { + protected void updateStatus(String status) throws Exception { logger.info("Updating status to workflow as [" + status + "]"); if (!wm.updateWorkflowInstanceStatus(workflowInstId, status)) { throw new PGEException( @@ -250,7 +250,7 @@ public class PGETaskInstance implements WorkflowTaskInstance { pgeConfig.getPropertyAdderCustomArgs()); } - protected XmlRpcWorkflowManagerClient createWorkflowManagerClient() + protected WorkflowManagerClient createWorkflowManagerClient() throws MalformedURLException { String url = pgeMetadata.getMetadata(WORKFLOW_MANAGER_URL); logger.info("Creating WorkflowManager client for url [" + url + "]"); @@ -394,7 +394,7 @@ public class PGETaskInstance implements WorkflowTaskInstance { return pgeScriptName; } - protected void runPge() throws PGEException, XmlRpcException { + protected void runPge() throws Exception { ScriptFile sf = null; try { long startTime = System.currentTimeMillis(); @@ -532,7 +532,7 @@ public class PGETaskInstance implements WorkflowTaskInstance { return crawler; } - protected void runIngestCrawler(ProductCrawler crawler) throws PGEException, IOException, XmlRpcException { + protected void runIngestCrawler(ProductCrawler crawler) throws Exception { // Determine if we need to create Metadata files if (crawler instanceof StdProductCrawler){ this.processOutput(); @@ -584,7 +584,7 @@ public class PGETaskInstance implements WorkflowTaskInstance { } } - protected void updateDynamicMetadata() throws XmlRpcException, IOException { + protected void updateDynamicMetadata() throws Exception { pgeMetadata.commitMarkedDynamicMetadataKeys(); wm.updateMetadataForWorkflow(workflowInstId, pgeMetadata.asMetadata(PgeMetadata.Type.DYNAMIC)); http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java ---------------------------------------------------------------------- diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java b/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java index 78e959c..ab98823 100644 --- a/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java +++ b/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileStager.java @@ -22,7 +22,8 @@ import org.apache.oodt.cas.filemgr.structs.Reference; import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException; import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException; import org.apache.oodt.cas.filemgr.structs.exceptions.DataTransferException; -import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient; +import org.apache.oodt.cas.filemgr.system.FileManagerClient; +import org.apache.oodt.cas.filemgr.util.RpcCommunicationFactory; import org.apache.oodt.cas.pge.config.FileStagingInfo; import org.apache.oodt.cas.pge.exceptions.PGEException; import org.apache.oodt.cas.pge.metadata.PgeMetadata; @@ -86,7 +87,7 @@ public abstract class FileStager { } @VisibleForTesting - static XmlRpcFileManagerClient createFileManagerClient(PgeMetadata pgeMetadata) + static FileManagerClient createFileManagerClient(PgeMetadata pgeMetadata) throws PGEException, MalformedURLException, ConnectionException { String filemgrUrl = pgeMetadata.getMetadata(QUERY_FILE_MANAGER_URL); if (filemgrUrl == null) { http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java ---------------------------------------------------------------------- diff --git a/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java b/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java index 808a51b..4294f2d 100644 --- a/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java +++ b/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java @@ -40,6 +40,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import org.apache.oodt.cas.workflow.system.WorkflowManagerClient; +import org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient; import org.junit.After; import org.junit.Test; import org.w3c.dom.Document; http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java ---------------------------------------------------------------------- diff --git a/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java b/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java index 046eedd..44f2742 100644 --- a/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java +++ b/profile/src/main/java/org/apache/oodt/profile/handlers/cas/CASProfileHandler.java @@ -20,7 +20,9 @@ package org.apache.oodt.profile.handlers.cas; //CAS imports import org.apache.oodt.cas.filemgr.structs.*; +import org.apache.oodt.cas.filemgr.system.FileManagerClient; import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient; +import org.apache.oodt.cas.filemgr.util.RpcCommunicationFactory; import org.apache.oodt.cas.metadata.Metadata; import org.apache.oodt.profile.Profile; import org.apache.oodt.profile.ProfileException; http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java index 33af1ed..4e4d19c 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java @@ -25,6 +25,7 @@ import org.apache.oodt.cas.filemgr.structs.Reference; import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException; import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException; import org.apache.oodt.cas.filemgr.system.FileManagerClient; +import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient; import org.apache.oodt.cas.filemgr.util.RpcCommunicationFactory; import org.apache.oodt.cas.product.data.DataUtils; import org.apache.oodt.product.LargeProductQueryHandler; @@ -62,7 +63,7 @@ import static org.apache.oodt.cas.product.CASProductHandlerMetKeys.FILE_HEADER; public class CASProductHandler implements LargeProductQueryHandler { private static Logger LOG = Logger.getLogger(CASProductHandler.class.getName()); - private XmlRpcFileManagerClient fm; + private FileManagerClient fm; public CASProductHandler() throws MalformedURLException, ConnectionException { http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java index 428b6e2..2f0f023 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataDeliveryServlet.java @@ -24,6 +24,7 @@ import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException; import org.apache.oodt.cas.filemgr.structs.Product; import org.apache.oodt.cas.filemgr.structs.Reference; import org.apache.oodt.cas.filemgr.system.FileManagerClient; +import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient; import org.apache.oodt.cas.filemgr.util.RpcCommunicationFactory; import org.apache.oodt.cas.metadata.Metadata; import org.apache.oodt.cas.metadata.util.PathUtils; http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java index eeb1369..00c89c1 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java @@ -24,6 +24,7 @@ import org.apache.oodt.cas.filemgr.structs.ProductPage; import org.apache.oodt.cas.filemgr.structs.ProductType; import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException; import org.apache.oodt.cas.filemgr.system.FileManagerClient; +import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient; import org.apache.oodt.cas.filemgr.util.RpcCommunicationFactory; import org.apache.oodt.cas.metadata.Metadata; import org.apache.oodt.cas.metadata.util.PathUtils; http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/services/CasProductJaxrsService.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/services/CasProductJaxrsService.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/services/CasProductJaxrsService.java index 273a976..f8d32d3 100755 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/services/CasProductJaxrsService.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/jaxrs/services/CasProductJaxrsService.java @@ -22,6 +22,7 @@ import org.apache.oodt.cas.filemgr.structs.Product; import org.apache.oodt.cas.filemgr.structs.ProductType; import org.apache.oodt.cas.filemgr.structs.Reference; import org.apache.oodt.cas.filemgr.system.FileManagerClient; +import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient; import org.apache.oodt.cas.metadata.Metadata; import org.apache.oodt.cas.product.exceptions.CasProductException; import org.apache.oodt.cas.product.jaxrs.exceptions.BadRequestException; @@ -351,7 +352,7 @@ public class CasProductJaxrsService * @throws Exception if an object cannot be retrieved from the context * attribute */ - public XmlRpcFileManagerClient getContextClient() + public FileManagerClient getContextClient() throws CasProductException { // Get the file manager client from the servlet context. Object clientObject = context.getAttribute("client"); http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java index 5b299e2..03fb813 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java @@ -25,7 +25,9 @@ import org.apache.commons.lang.WordUtils; import org.apache.oodt.cas.filemgr.structs.ProductType; import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException; import org.apache.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException; +import org.apache.oodt.cas.filemgr.system.FileManagerClient; import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient; +import org.apache.oodt.cas.filemgr.util.RpcCommunicationFactory; import org.apache.oodt.cas.metadata.util.PathUtils; import org.apache.oodt.commons.xml.XMLUtils; import org.w3c.dom.Document; @@ -72,7 +74,7 @@ public class RDFDatasetServlet extends HttpServlet { private static final long serialVersionUID = -3660991271642533985L; /* our client to the file manager */ - private XmlRpcFileManagerClient fClient = null; + private FileManagerClient fClient = null; /* our log stream */ private Logger LOG = Logger.getLogger(RDFProductServlet.class.getName()); http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java index 81faab8..df1eeac 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java @@ -28,7 +28,9 @@ import org.apache.oodt.cas.filemgr.structs.ProductType; import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException; import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException; import org.apache.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException; +import org.apache.oodt.cas.filemgr.system.FileManagerClient; import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient; +import org.apache.oodt.cas.filemgr.util.RpcCommunicationFactory; import org.apache.oodt.cas.metadata.Metadata; import org.apache.oodt.cas.metadata.util.PathUtils; import org.apache.oodt.commons.xml.XMLUtils; @@ -78,7 +80,7 @@ public class RDFProductServlet extends HttpServlet { private static final long serialVersionUID = -3660991271646533985L; /* our client to the file manager */ - private XmlRpcFileManagerClient fClient = null; + private FileManagerClient fClient = null; /* our log stream */ private Logger LOG = Logger.getLogger(RDFProductServlet.class.getName()); http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java index beca05f..53bdad8 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java @@ -26,6 +26,7 @@ import org.apache.oodt.cas.filemgr.structs.Reference; import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException; import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException; import org.apache.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException; +import org.apache.oodt.cas.filemgr.system.FileManagerClient; import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient; import org.apache.oodt.cas.metadata.Metadata; import org.apache.oodt.cas.metadata.util.PathUtils; http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java index 224a396..9aaecaf 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java @@ -22,7 +22,9 @@ import org.apache.oodt.cas.filemgr.structs.FileTransferStatus; import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException; import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException; import org.apache.oodt.cas.filemgr.structs.exceptions.DataTransferException; +import org.apache.oodt.cas.filemgr.system.FileManagerClient; import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient; +import org.apache.oodt.cas.filemgr.util.RpcCommunicationFactory; import org.apache.oodt.cas.metadata.Metadata; import org.apache.oodt.cas.metadata.util.PathUtils; import org.apache.oodt.commons.util.DateConvert; @@ -74,7 +76,7 @@ public class RSSProductTransferServlet extends HttpServlet { private static final long serialVersionUID = -7983832512818339079L; /* our client to the file manager */ - private XmlRpcFileManagerClient fClient = null; + private FileManagerClient fClient = null; /* RSS config */ private RSSConfig rssconf; http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/workflow/pom.xml ---------------------------------------------------------------------- diff --git a/workflow/pom.xml b/workflow/pom.xml index 7cd03eb..83e7953 100644 --- a/workflow/pom.xml +++ b/workflow/pom.xml @@ -51,6 +51,18 @@ the License. can be overridden in a specific pom and should have a comment explaing why the version has been overridden --> <dependencies> + <!-- https://mvnrepository.com/artifact/org.apache.avro/avro --> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + <version>1.8.1</version> + </dependency> + <!-- https://mvnrepository.com/artifact/org.apache.avro/avro-ipc --> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro-ipc</artifactId> + <version>1.8.1</version> + </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> @@ -146,6 +158,42 @@ the License. <build> <plugins> <plugin> + <groupId>org.apache.avro</groupId> + <artifactId>avro-maven-plugin</artifactId> + <version>1.7.7</version> + <configuration> + <stringType>String</stringType> + <detail>true</detail> + </configuration> + <executions> + <execution> + <id>schemas</id> + <configuration> + <imports> + <import>${basedir}/src/main/avro/types/AvroWorkflowCondition.avsc</import> + <import>${basedir}/src/main/avro/types/AvroWorkflowTask.avsc</import> + <import>${basedir}/src/main/avro/types/AvroWorkflow.avsc</import> + <import>${basedir}/src/main/avro/types/AvroWorkflowInstance.avsc</import> + <import>${basedir}/src/main/avro/types/AvroWorkflowInstancePage.avsc</import> + </imports> + </configuration> + <goals> + <goal>schema</goal> + </goals> + </execution> + <execution> + <id>protocol</id> + <configuration><imports> + <import>${basedir}/src/main/avro/types</import> + </imports> + </configuration> + <goals> + <goal>idl-protocol</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>2.4</version> <configuration> http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetFirstPageCliAction.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetFirstPageCliAction.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetFirstPageCliAction.java index 4885fba..60f9c99 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetFirstPageCliAction.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetFirstPageCliAction.java @@ -24,6 +24,7 @@ import org.apache.oodt.cas.cli.exception.CmdLineActionException; import org.apache.oodt.cas.workflow.structs.WorkflowInstance; import org.apache.oodt.cas.workflow.structs.WorkflowInstancePage; import org.apache.oodt.cas.workflow.system.WorkflowManagerClient; +import org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient; /** * Gets the first page of workflow instances. @@ -39,7 +40,7 @@ public class GetFirstPageCliAction extends WorkflowCliAction { public void execute(ActionMessagePrinter printer) throws CmdLineActionException { try { - XmlRpcWorkflowManagerClient client = getClient(); + WorkflowManagerClient client = getClient(); WorkflowInstancePage page; if (status != null && !status.equals("")) { page = client.paginateWorkflowInstances(1, status); http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetLastPageCliAction.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetLastPageCliAction.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetLastPageCliAction.java index c37cb3c..f1ccd18 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetLastPageCliAction.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetLastPageCliAction.java @@ -24,6 +24,7 @@ import org.apache.oodt.cas.cli.exception.CmdLineActionException; import org.apache.oodt.cas.workflow.structs.WorkflowInstance; import org.apache.oodt.cas.workflow.structs.WorkflowInstancePage; import org.apache.oodt.cas.workflow.system.WorkflowManagerClient; +import org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient; /** * A {@link CmdLineOption} which gets the last page of workflows. @@ -39,7 +40,7 @@ public class GetLastPageCliAction extends WorkflowCliAction { public void execute(ActionMessagePrinter printer) throws CmdLineActionException { try { - XmlRpcWorkflowManagerClient client = getClient(); + WorkflowManagerClient client = getClient(); WorkflowInstancePage page; if (status != null && !status.equals("")) { WorkflowInstancePage firstPage = client.paginateWorkflowInstances( http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetNextPageCliAction.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetNextPageCliAction.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetNextPageCliAction.java index a5d1b0d..e2babe4 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetNextPageCliAction.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetNextPageCliAction.java @@ -27,6 +27,7 @@ import org.apache.oodt.cas.cli.exception.CmdLineActionException; import org.apache.oodt.cas.workflow.structs.WorkflowInstance; import org.apache.oodt.cas.workflow.structs.WorkflowInstancePage; import org.apache.oodt.cas.workflow.system.WorkflowManagerClient; +import org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient; /** * A {@link CmdLineAction} which gets the next page of workflows. @@ -45,7 +46,7 @@ public class GetNextPageCliAction extends WorkflowCliAction { Validate.isTrue(pageNum != -1); try { - XmlRpcWorkflowManagerClient client = getClient(); + WorkflowManagerClient client = getClient(); WorkflowInstancePage page; if (status != null && !status.equals("")) { page = client.paginateWorkflowInstances(pageNum + 1, status); http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetPrevPageCliAction.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetPrevPageCliAction.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetPrevPageCliAction.java index ece1ef1..c4cd9bc 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetPrevPageCliAction.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/cli/action/GetPrevPageCliAction.java @@ -27,6 +27,7 @@ import org.apache.oodt.cas.cli.exception.CmdLineActionException; import org.apache.oodt.cas.workflow.structs.WorkflowInstance; import org.apache.oodt.cas.workflow.structs.WorkflowInstancePage; import org.apache.oodt.cas.workflow.system.WorkflowManagerClient; +import org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient; /** * A {@link CmdLineAction} which gets the previous page of workflows. @@ -45,7 +46,7 @@ public class GetPrevPageCliAction extends WorkflowCliAction { Validate.isTrue(pageNum != -1); try { - XmlRpcWorkflowManagerClient client = getClient(); + WorkflowManagerClient client = getClient(); WorkflowInstancePage page; if (status != null && !status.equals("")) { page = client.paginateWorkflowInstances(pageNum - 1, status); http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/BranchRedirector.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/BranchRedirector.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/BranchRedirector.java index 8c56c8f..9ae14d8 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/BranchRedirector.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/BranchRedirector.java @@ -27,6 +27,7 @@ import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration; import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance; import org.apache.oodt.cas.workflow.structs.exceptions.WorkflowTaskInstanceException; import org.apache.oodt.cas.workflow.system.WorkflowManagerClient; +import org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient; import org.apache.oodt.cas.workflow.system.rpc.RpcCommunicationFactory; /** @@ -55,7 +56,7 @@ public class BranchRedirector implements WorkflowTaskInstance { @Override public void run(Metadata metadata, WorkflowTaskConfiguration config) throws WorkflowTaskInstanceException { - XmlRpcWorkflowManagerClient wm; + WorkflowManagerClient wm; try { wm = RpcCommunicationFactory.createClient(new URL( http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/RandomStatusUpdateTask.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/RandomStatusUpdateTask.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/RandomStatusUpdateTask.java index b6fa4b8..a1dd885 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/RandomStatusUpdateTask.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/RandomStatusUpdateTask.java @@ -24,7 +24,9 @@ package org.apache.oodt.cas.workflow.examples; import org.apache.oodt.cas.metadata.Metadata; import org.apache.oodt.cas.workflow.structs.WorkflowTaskConfiguration; import org.apache.oodt.cas.workflow.structs.WorkflowTaskInstance; +import org.apache.oodt.cas.workflow.system.WorkflowManagerClient; import org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient; +import org.apache.oodt.cas.workflow.system.rpc.RpcCommunicationFactory; import java.net.MalformedURLException; import java.net.URL; http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java index 2bf78f5..53c70e4 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java @@ -20,7 +20,6 @@ package org.apache.oodt.cas.workflow.system; //APACHE imports -import org.apache.oodt.cas.cli.CmdLineUtility; import org.apache.oodt.cas.metadata.Metadata; import org.apache.oodt.cas.workflow.structs.Workflow; import org.apache.oodt.cas.workflow.structs.WorkflowCondition; @@ -414,7 +413,7 @@ public class XmlRpcWorkflowManagerClient implements WorkflowManagerClient { } - public List getWorkflows() throws XmlRpcException, IOException, RepositoryException { + public Vector getWorkflows() throws XmlRpcException, IOException, RepositoryException { Vector argList = new Vector(); Vector works; Vector workflows; @@ -463,7 +462,7 @@ public class XmlRpcWorkflowManagerClient implements WorkflowManagerClient { return numInsts; } - public List getWorkflowInstancesByStatus(String status) throws XmlRpcException, IOException { + public Vector getWorkflowInstancesByStatus(String status) throws XmlRpcException, IOException { Vector argList = new Vector(); argList.add(status); Vector insts; @@ -487,7 +486,7 @@ public class XmlRpcWorkflowManagerClient implements WorkflowManagerClient { } - public List getWorkflowInstances() throws XmlRpcException, IOException { + public Vector getWorkflowInstances() throws XmlRpcException, IOException { Vector argList = new Vector(); Vector insts; Vector instsUnpacked; http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java index 8ea6e16..de2d6f5 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/tools/InstanceRepoCleaner.java @@ -23,6 +23,7 @@ import org.apache.oodt.cas.workflow.structs.WorkflowInstance; import org.apache.oodt.cas.workflow.structs.WorkflowInstancePage; import org.apache.oodt.cas.workflow.structs.WorkflowStatus; import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException; +import org.apache.oodt.cas.workflow.system.WorkflowManagerClient; import org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient; import org.apache.oodt.commons.date.DateUtils; import org.apache.xmlrpc.XmlRpcException; @@ -74,7 +75,7 @@ public class InstanceRepoCleaner { this.rep = new LuceneWorkflowInstanceRepository(idxPath, 1000); } - public static void main(String[] args) throws IOException, InstanceRepositoryException, XmlRpcException { + public static void main(String[] args) throws Exception { String usage = "InstanceRepoCleaner [options]\n" + "<workflow manager url>\n" + "--idxPath <path>\n"; if (args.length != 1 && args.length != 2) { @@ -94,7 +95,7 @@ public class InstanceRepoCleaner { clean.cleanRepository(); } - public void cleanRepository() throws XmlRpcException, IOException, InstanceRepositoryException { + public void cleanRepository() throws Exception { WorkflowInstancePage page = wm != null ? wm.getFirstPage() : rep .getFirstPage(); while (page != null && page.getPageWorkflows() != null http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/workflow/src/main/java/org/apache/oodt/cas/workflow/util/AvroTypeFactory.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/AvroTypeFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/AvroTypeFactory.java index e1b57ed..eb26437 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/AvroTypeFactory.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/AvroTypeFactory.java @@ -226,7 +226,7 @@ public class AvroTypeFactory { public static Map<String,String> getAvroMetadata(Metadata metadata){ Map<String,String> avroMetadata = new HashMap<String, String>(); - if(metadata.getHashtable().size() > 0) + if(metadata.getHashTable().size() > 0) for (String key : metadata.getAllKeys()){ avroMetadata.put(key,metadata.getMetadata(key)); } http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/workflow/src/test/java/org/apache/oodt/cas/workflow/system/MockXmlRpcWorkflowManagerClient.java ---------------------------------------------------------------------- diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/MockXmlRpcWorkflowManagerClient.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/MockXmlRpcWorkflowManagerClient.java index ba4193d..52903c1 100644 --- a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/MockXmlRpcWorkflowManagerClient.java +++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/MockXmlRpcWorkflowManagerClient.java @@ -272,7 +272,7 @@ public class MockXmlRpcWorkflowManagerClient extends return workflowRepo.getWorkflowById(workflowId); } - public List<Workflow> getWorkflows() throws RepositoryException { + public Vector getWorkflows() throws RepositoryException { lastMethodCallDetails = new MethodCallDetails( "getWorkflows", Lists.newArrayList()); @@ -293,14 +293,14 @@ public class MockXmlRpcWorkflowManagerClient extends return 1; } - public List<WorkflowInstance> getWorkflowInstancesByStatus(String status) { + public Vector getWorkflowInstancesByStatus(String status) { lastMethodCallDetails = new MethodCallDetails( "getWorkflowInstancesByStatus", Lists.newArrayList((Object) status)); return new Vector<WorkflowInstance>(); } - public List<WorkflowInstance> getWorkflowInstances() { + public Vector getWorkflowInstances() { lastMethodCallDetails = new MethodCallDetails( "getWorkflowInstances", Lists.newArrayList()); http://git-wip-us.apache.org/repos/asf/oodt/blob/ab96c215/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestWorkflowManagerClient.java ---------------------------------------------------------------------- diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestWorkflowManagerClient.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestWorkflowManagerClient.java index 4d732b4..566897e 100644 --- a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestWorkflowManagerClient.java +++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestWorkflowManagerClient.java @@ -132,8 +132,8 @@ public class TestWorkflowManagerClient extends TestCase { met = WInst.getSharedContext(); assertNotNull(met); - assertNotNull(met.getHashtable()); - assertEquals(2, met.getHashtable().keySet().size()); + assertNotNull(met.getHashTable()); + assertEquals(2, met.getHashTable().keySet().size()); assertNotNull(met.getAllMetadata("key1")); assertEquals(3, met.getAllMetadata("key1").size()); assertNotNull(met.getAllMetadata("key2"));
