tidy up maven flies
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/8c054377 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/8c054377 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/8c054377 Branch: refs/heads/master Commit: 8c054377a7b24f4f58cbe0f49cb493fee201607a Parents: 4768f4a Author: Tom Barber <[email protected]> Authored: Sun Oct 25 11:56:41 2015 +0000 Committer: Tom Barber <[email protected]> Committed: Sun Oct 25 11:56:41 2015 +0000 ---------------------------------------------------------------------- .../apache/oodt/cas/filemgr/browser/model/CasDB.java | 2 +- .../org/apache/oodt/commons/activity/HistoryTest.java | 4 ++-- .../cas/filemgr/structs/BooleanQueryCriteria.java | 2 +- .../cas/filemgr/structs/FreeTextQueryCriteria.java | 2 +- .../apache/oodt/cas/filemgr/tools/CatalogSearch.java | 2 +- .../org/apache/oodt/cas/filemgr/util/SqlParser.java | 2 +- .../cas/filemgr/versioning/TestBasicVersioner.java | 2 +- .../cas/filemgr/versioning/TestDateTimeVersioner.java | 2 +- pcs/services/pom.xml | 3 +-- .../oodt/product/handlers/ofsn/URLGetHandler.java | 10 +++++----- .../org/apache/oodt/security/sso/OpenSSOImpl.java | 4 ++-- streaming/pom.xml | 1 - .../webcomponents/workflow/model/WorkflowViewer.java | 2 +- webapp/fmbrowser/pom.xml | 1 - webapp/wmonitor/pom.xml | 1 - .../main/java/org/apache/oodt/xmlquery/Statistic.java | 2 +- .../main/java/org/apache/oodt/xmlquery/XMLQuery.java | 14 +++++++------- 17 files changed, 26 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/8c054377/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java ---------------------------------------------------------------------- diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java index c38b5f7..4cdf9b4 100644 --- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java +++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java @@ -118,7 +118,7 @@ public class CasDB { } public String getElementID(String elementName) { - String elementID = new String(); + String elementID = ""; Element e; try { e = client.getElementByName(elementName); http://git-wip-us.apache.org/repos/asf/oodt/blob/8c054377/commons/src/test/java/org/apache/oodt/commons/activity/HistoryTest.java ---------------------------------------------------------------------- diff --git a/commons/src/test/java/org/apache/oodt/commons/activity/HistoryTest.java b/commons/src/test/java/org/apache/oodt/commons/activity/HistoryTest.java index d54ec2f..b2bc65c 100755 --- a/commons/src/test/java/org/apache/oodt/commons/activity/HistoryTest.java +++ b/commons/src/test/java/org/apache/oodt/commons/activity/HistoryTest.java @@ -61,9 +61,9 @@ public class HistoryTest extends TestCase implements Storage { public void testIllegalIncidents() { History.closeTime = 50; Incident one = new Incident(); - one.setActivityID(new String("a")); // Want unique objects + one.setActivityID("a"); // Want unique objects Incident two = new Incident(); - two.setActivityID(new String("a")); // Want unique objects + two.setActivityID("a"); // Want unique objects Incident three = new Incident(); three.setActivityID("b"); History history = new History(one, this); http://git-wip-us.apache.org/repos/asf/oodt/blob/8c054377/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/BooleanQueryCriteria.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/BooleanQueryCriteria.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/BooleanQueryCriteria.java index 9b2d9f6..d76d0bc 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/BooleanQueryCriteria.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/BooleanQueryCriteria.java @@ -159,7 +159,7 @@ public class BooleanQueryCriteria extends QueryCriteria { * @return string equivement of the query */ public String toString() { - String query = new String(); + String query = ""; if (operator == AND) query += "AND("; else if (operator == OR) http://git-wip-us.apache.org/repos/asf/oodt/blob/8c054377/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java index 1f3762f..e665e59 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java @@ -53,7 +53,7 @@ public class FreeTextQueryCriteria extends QueryCriteria { * Default constructor. */ public FreeTextQueryCriteria() { - elementName = new String(); + elementName = ""; values = new ArrayList<String>(); noiseWordHash = new HashSet<String>(); http://git-wip-us.apache.org/repos/asf/oodt/blob/8c054377/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java index 9519a8e..caa24ac 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/CatalogSearch.java @@ -330,7 +330,7 @@ public class CatalogSearch { System.out.println("Exiting..."); System.exit(0); } else if (com.equalsIgnoreCase("query")) { - String query = new String(); + String query = ""; while (tok.hasMoreTokens()) { query += tok.nextToken() + " "; } http://git-wip-us.apache.org/repos/asf/oodt/blob/8c054377/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/SqlParser.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/SqlParser.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/SqlParser.java index 25ebc40..53ff23c 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/SqlParser.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/SqlParser.java @@ -253,7 +253,7 @@ public class SqlParser { char curChar = statement.charAt(i); switch (curChar) { case '(': - stack.push(new String("(")); + stack.push("("); break; case ')': String value = null; http://git-wip-us.apache.org/repos/asf/oodt/blob/8c054377/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestBasicVersioner.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestBasicVersioner.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestBasicVersioner.java index c1f7e95..b480c75 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestBasicVersioner.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestBasicVersioner.java @@ -75,7 +75,7 @@ public class TestBasicVersioner extends TestCase { List refs = new Vector(); try { URL url = this.getClass().getResource("/test.txt"); - String refname = new File(url.getFile()).toURL().toExternalForm().toString(); + String refname = new File(url.getFile()).toURL().toExternalForm(); refs.add(refname); } catch (MalformedURLException e) { fail(e.getMessage()); http://git-wip-us.apache.org/repos/asf/oodt/blob/8c054377/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDateTimeVersioner.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDateTimeVersioner.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDateTimeVersioner.java index 15561a1..e4c4661 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDateTimeVersioner.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/versioning/TestDateTimeVersioner.java @@ -88,7 +88,7 @@ public class TestDateTimeVersioner extends TestCase { List refs = new Vector(); try { URL url = this.getClass().getResource("/test.txt"); - String refname = new File(url.getFile()).toURL().toExternalForm().toString(); + String refname = new File(url.getFile()).toURL().toExternalForm(); refs.add(refname); } catch (MalformedURLException e) { fail(e.getMessage()); http://git-wip-us.apache.org/repos/asf/oodt/blob/8c054377/pcs/services/pom.xml ---------------------------------------------------------------------- diff --git a/pcs/services/pom.xml b/pcs/services/pom.xml index 578420e..b57ac07 100644 --- a/pcs/services/pom.xml +++ b/pcs/services/pom.xml @@ -23,8 +23,7 @@ the License. <version>0.11-SNAPSHOT</version> <relativePath>../../core/pom.xml</relativePath> </parent> - <groupId>org.apache.oodt</groupId> - <artifactId>pcs-services</artifactId> + <artifactId>pcs-services</artifactId> <packaging>war</packaging> <name>OODT Process Control System JAX-RS service layer</name> <description>A web application for exposing services form the underlying http://git-wip-us.apache.org/repos/asf/oodt/blob/8c054377/product/src/main/java/org/apache/oodt/product/handlers/ofsn/URLGetHandler.java ---------------------------------------------------------------------- diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/URLGetHandler.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/URLGetHandler.java index f5e5dab..ca29c9c 100644 --- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/URLGetHandler.java +++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/URLGetHandler.java @@ -64,11 +64,11 @@ public class URLGetHandler extends AbstractCrawlLister implements OFSNGetHandler protected static final String DEFAULT_RETURN_TYPE = "RAW"; // Instance - private String prodServerHostname = new String(); - private String prodServerPort = new String(); - private String prodServerContext = new String(); - private String productRoot = new String(); - private String returnType = new String(); + private String prodServerHostname = ""; + private String prodServerPort = ""; + private String prodServerContext = ""; + private String productRoot = ""; + private String returnType = ""; /* * (non-Javadoc) http://git-wip-us.apache.org/repos/asf/oodt/blob/8c054377/sso/src/main/java/org/apache/oodt/security/sso/OpenSSOImpl.java ---------------------------------------------------------------------- diff --git a/sso/src/main/java/org/apache/oodt/security/sso/OpenSSOImpl.java b/sso/src/main/java/org/apache/oodt/security/sso/OpenSSOImpl.java index c20b683..4333f14 100755 --- a/sso/src/main/java/org/apache/oodt/security/sso/OpenSSOImpl.java +++ b/sso/src/main/java/org/apache/oodt/security/sso/OpenSSOImpl.java @@ -95,7 +95,7 @@ public class OpenSSOImpl extends AbstractWebBasedSingleSignOn implements return false; } - this.addCookie(SSO_COOKIE_KEY, "\"" + new String(ssoToken) + "\""); + this.addCookie(SSO_COOKIE_KEY, "\"" + ssoToken + "\""); this.addCookie(USER_COOKIE_KEY, "\"" + new String(Base64.encodeBase64(username.getBytes())) + "\""); @@ -153,7 +153,7 @@ public class OpenSSOImpl extends AbstractWebBasedSingleSignOn implements protected String getSSOToken() { String cookieVal = this.getCookieVal(SSO_COOKIE_KEY); if (cookieVal != null) { - return new String(cookieVal); + return cookieVal; } else return null; } http://git-wip-us.apache.org/repos/asf/oodt/blob/8c054377/streaming/pom.xml ---------------------------------------------------------------------- diff --git a/streaming/pom.xml b/streaming/pom.xml index ce38282..04c8801 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -24,7 +24,6 @@ the License. <relativePath>../core/pom.xml</relativePath> </parent> - <groupId>org.apache.oodt</groupId> <artifactId>oodt-streaming</artifactId> <name>Apache OODT Streaming</name> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/oodt/blob/8c054377/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java ---------------------------------------------------------------------- diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java index e81ccac..d9f3052 100644 --- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java +++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/model/WorkflowViewer.java @@ -136,7 +136,7 @@ public class WorkflowViewer extends Panel { // add '...' to end of summarized string if applicable if (summarizedString.length() > maxLengthTotal) { return summarizedString.substring(0, - Math.min(maxLengthTotal, summarizedString.length()) - 3).toString() + "..."; + Math.min(maxLengthTotal, summarizedString.length()) - 3) + "..."; } else return summarizedString.toString(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/8c054377/webapp/fmbrowser/pom.xml ---------------------------------------------------------------------- diff --git a/webapp/fmbrowser/pom.xml b/webapp/fmbrowser/pom.xml index dd2cf76..012efff 100644 --- a/webapp/fmbrowser/pom.xml +++ b/webapp/fmbrowser/pom.xml @@ -24,7 +24,6 @@ the License. <version>0.11-SNAPSHOT</version> <relativePath>../../core/pom.xml</relativePath> </parent> - <groupId>org.apache.oodt</groupId> <artifactId>fmbrowser</artifactId> <version>0.11-SNAPSHOT</version> <packaging>war</packaging> http://git-wip-us.apache.org/repos/asf/oodt/blob/8c054377/webapp/wmonitor/pom.xml ---------------------------------------------------------------------- diff --git a/webapp/wmonitor/pom.xml b/webapp/wmonitor/pom.xml index 4349073..7dee4b7 100644 --- a/webapp/wmonitor/pom.xml +++ b/webapp/wmonitor/pom.xml @@ -24,7 +24,6 @@ the License. <version>0.11-SNAPSHOT</version> <relativePath>../../core/pom.xml</relativePath> </parent> - <groupId>org.apache.oodt</groupId> <artifactId>wmonitor</artifactId> <version>0.11-SNAPSHOT</version> <packaging>war</packaging> http://git-wip-us.apache.org/repos/asf/oodt/blob/8c054377/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java index 409f6f6..fd7a565 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java @@ -43,7 +43,7 @@ public class Statistic implements java.io.Serializable, Cloneable public Statistic() { - url = new String("UNKNOWN"); + url = "UNKNOWN"; time = 0; } http://git-wip-us.apache.org/repos/asf/oodt/blob/8c054377/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java index 8013bee..1da150e 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/XMLQuery.java @@ -182,18 +182,18 @@ public class XMLQuery implements java.io.Serializable, Cloneable { } if (keywordQuery == null) keywordQuery = "UNKNOWN"; // init query header (object attributes) - if (id == null) id = new String("UNKNOWN"); - if (title == null) title = new String("UNKNOWN"); - if (desc == null) desc = new String("UNKNOWN"); - if (ddId == null) ddId = new String("UNKNOWN"); + if (id == null) id = "UNKNOWN"; + if (title == null) title = "UNKNOWN"; + if (desc == null) desc = "UNKNOWN"; + if (ddId == null) ddId = "UNKNOWN"; queryHeader = new QueryHeader(id, title, desc, /*type*/"QUERY", /*status*/"ACTIVE", /*security*/"UNKNOWN", /*revision*/"1999-12-12 JSH V1.0 Under Development", ddId); // init query attributes - if (resultModeId == null) resultModeId = new String("ATTRIBUTE"); + if (resultModeId == null) resultModeId = "ATTRIBUTE"; if (propType == null) { - propType = new String("BROADCAST"); - propLevels = new String("N/A"); + propType = "BROADCAST"; + propLevels = "N/A"; } this.resultModeId = resultModeId; this.propogationType = propType;
