From a6ca6a940975d59e80cf4ba9d67153e2c35b7894 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Thu, 2 May 2019 10:30:42 +0000 Subject: [PATCH] Fix for Bug #16599, Validation portlet not dealing with "<" and ">" signs git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/branches/portlets/user/PerformFISH-Apps/1.3@179229 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 38 ++++++++++++++++--- .../performfish/CompanyFarmRepository.java | 12 +++--- .../performfish/SubmittedFormValidation.java | 4 +- .../util/ImportedBatchChecker.java | 4 +- src/main/webapp/css/main.css | 7 ++-- .../company_private_repository.jsp | 6 +-- .../farmrepository/view_farm_repository.jsp | 6 +-- .../managecompanyadmins/company_admins.jsp | 4 +- .../html/managecompanyusers/company_users.jsp | 4 +- .../managefarmadministratos/farm_admins.jsp | 6 +-- .../manage_farm_users_view.jsp | 6 +-- 11 files changed, 56 insertions(+), 41 deletions(-) diff --git a/pom.xml b/pom.xml index 98e0b24..1acba8c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,8 +1,22 @@ - 4.0.0 + + + gcube-releases + gCube Releases + http://maven.research-infrastructures.eu/nexus/content/repositories/gcube-releases + + false + + + true + + + maven-parent org.gcube.tools @@ -13,7 +27,7 @@ PerformFISH-Apps-portlet war PerformFISH-Apps Portlet - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT PerformFISH Apps is a set of portlet for the implementation of the Form Submission useful to calculate KPIs @@ -53,10 +67,12 @@ org.gcube.resources.discovery ic-client + 1.0.4-4.13.1-162683 org.gcube.resources registry-publisher + 1.2.9-4.13.1-151412 org.apache.httpcomponents @@ -66,19 +82,18 @@ org.gcube.portal storagehub-icons-library + 1.1.1-4.13.1-173244 org.gcube.dvos usermanagement-core + 2.4.0-4.13.1-164813 provided - - org.gcube.portal - storagehub-icons-library - org.gcube.common.portal portal-manager + 2.4.1-4.13.1-169423 provided @@ -89,6 +104,12 @@ org.gcube.common storagehub-client-library + 1.0.3-4.13.1-176597 + + + org.gcube.common + storagehub-model + 1.0.3-4.13.1-176521 org.gcube.core @@ -98,26 +119,31 @@ org.gcube.common home-library + 2.10.2-4.13.1-164488 provided org.gcube.common home-library-jcr + 2.11.5-4.13.1-169333 provided org.gcube.common home-library-model + 1.8.1-4.13.1-164481 provided org.gcube.common authorization-client + 2.0.3-4.13.1-177201 provided org.gcube.common common-authorization + 2.1.5-4.13.1-177311 provided diff --git a/src/main/java/org/gcube/portlets/user/performfish/CompanyFarmRepository.java b/src/main/java/org/gcube/portlets/user/performfish/CompanyFarmRepository.java index a6ccc2c..cc9f03a 100644 --- a/src/main/java/org/gcube/portlets/user/performfish/CompanyFarmRepository.java +++ b/src/main/java/org/gcube/portlets/user/performfish/CompanyFarmRepository.java @@ -182,7 +182,7 @@ public class CompanyFarmRepository extends MVCPortlet { .append(farmId).append("?gcube-token="+authorizationToken); String request = sb.toString(); fixUntrustCertificate() ; - URL url= new URL(request); + URL url= new URL(null, request, new sun.net.www.protocol.https.Handler()); HttpsURLConnection conn= (HttpsURLConnection) url.openConnection(); conn.setDoOutput( true ); conn.setInstanceFollowRedirects( false ); @@ -218,7 +218,7 @@ public class CompanyFarmRepository extends MVCPortlet { */ _log.debug("*** List Processed, no of items = "+jobs.keySet().size()); for (String key : jobs.keySet()) { - System.out.println(jobs.get(key)); + _log.debug(jobs.get(key)); } // StorageHubClient shub = new StorageHubClient(); @@ -235,7 +235,7 @@ public class CompanyFarmRepository extends MVCPortlet { } public void displayVersions(ActionRequest request, ActionResponse response) throws Exception { - System.out.println("**** displayVersionsdisplayVersionsdisplayVersionsdisplayVersions"); + _log.debug("**** displayVersionsdisplayVersionsdisplayVersionsdisplayVersions"); String itemId = ParamUtil.getString(request, "fileItem"); long farmId = ParamUtil.getLong(request, "farmId"); @@ -332,12 +332,14 @@ public class CompanyFarmRepository extends MVCPortlet { e.printStackTrace(); } } - else { + else {//check threshold String batchType = ParamUtil.getString(resourceRequest, "batchType", null); String farmIdStr = ParamUtil.getString(resourceRequest, "farmId", null); String context = Utils.getCurrentContext(resourceRequest); long farmId = Long.parseLong(farmIdStr); boolean analyisisEnabled = false; + _log.debug("check threshold batchType" + batchType + " farmId="+farmIdStr + " context="+context); + _log.info("calling ImportedBatchChecker.checkAnalysisAvailability"); try { analyisisEnabled = ImportedBatchChecker.checkAnalysisAvailability(farmId, batchType, context); } @@ -411,7 +413,7 @@ public class CompanyFarmRepository extends MVCPortlet { int status = -1; try { fixUntrustCertificate() ; - URL url= new URL(request); + URL url= new URL(null, request, new sun.net.www.protocol.https.Handler()); HttpsURLConnection conn= (HttpsURLConnection) url.openConnection(); conn.setDoOutput( true ); conn.setInstanceFollowRedirects( false ); diff --git a/src/main/java/org/gcube/portlets/user/performfish/SubmittedFormValidation.java b/src/main/java/org/gcube/portlets/user/performfish/SubmittedFormValidation.java index 79ec6a8..2e9a919 100644 --- a/src/main/java/org/gcube/portlets/user/performfish/SubmittedFormValidation.java +++ b/src/main/java/org/gcube/portlets/user/performfish/SubmittedFormValidation.java @@ -213,8 +213,8 @@ public class SubmittedFormValidation extends MVCPortlet { String line; List resultLines = new ArrayList<>(); while ((line = reader.readLine()) != null) { - if (line.split("=").length > 1) - resultLines.add(line.split("=")[1]); //if the split fails it means there is no comment + if (line.split("=").length > 1) + resultLines.add(line.substring(line.indexOf("=")+1)); else resultLines.add("Validation is successful"); } diff --git a/src/main/java/org/gcube/portlets/user/performfish/util/ImportedBatchChecker.java b/src/main/java/org/gcube/portlets/user/performfish/util/ImportedBatchChecker.java index 27c3d1e..3f89d36 100644 --- a/src/main/java/org/gcube/portlets/user/performfish/util/ImportedBatchChecker.java +++ b/src/main/java/org/gcube/portlets/user/performfish/util/ImportedBatchChecker.java @@ -94,7 +94,7 @@ public class ImportedBatchChecker { private static long readCSVLines(String csvUrl) throws IOException { - URL url= new URL(csvUrl); + URL url= new URL(null, csvUrl, new sun.net.www.protocol.https.Handler()); HttpURLConnection conn= (HttpURLConnection) url.openConnection(); conn.setDoOutput( true ); conn.setInstanceFollowRedirects( true ); @@ -108,7 +108,7 @@ public class ImportedBatchChecker { } private static JSONObject readFromURL(String request) throws IOException, JSONException { - URL url= new URL(request); + URL url= new URL(null, request, new sun.net.www.protocol.https.Handler()); HttpsURLConnection conn= (HttpsURLConnection) url.openConnection(); conn.setDoOutput( true ); conn.setInstanceFollowRedirects( false ); diff --git a/src/main/webapp/css/main.css b/src/main/webapp/css/main.css index b5fa139..1f5f355 100644 --- a/src/main/webapp/css/main.css +++ b/src/main/webapp/css/main.css @@ -22,10 +22,9 @@ div.submitted-form-validation-portlet { height: 32px; display: block; border: 1px solid #AAA; - border-radius: 32px; - -webkit-border-radius: 16px; - -moz-border-radius: 16px; - background-position: 50% 50%; + border-radius: 2em; + -webkit-border-radius: 2em; + -moz-border-radius: 2em; } /* file upload css */ diff --git a/src/main/webapp/html/companyprivaterepository/company_private_repository.jsp b/src/main/webapp/html/companyprivaterepository/company_private_repository.jsp index 8b2b130..cf70800 100644 --- a/src/main/webapp/html/companyprivaterepository/company_private_repository.jsp +++ b/src/main/webapp/html/companyprivaterepository/company_private_repository.jsp @@ -28,13 +28,11 @@ -
+

${theCompanyName} + style="font-size: 1.5em; padding-top: 12px; padding-left: 5px;">${theCompanyName} - Private Repository Content

diff --git a/src/main/webapp/html/farmrepository/view_farm_repository.jsp b/src/main/webapp/html/farmrepository/view_farm_repository.jsp index 4acba56..80186e1 100644 --- a/src/main/webapp/html/farmrepository/view_farm_repository.jsp +++ b/src/main/webapp/html/farmrepository/view_farm_repository.jsp @@ -76,13 +76,11 @@ $(function () { -
+

${theCompanyName} - ${farmyName} Private Repository Content

+ style="font-size: 1.5em; padding-top: 12px; padding-left: 5px;">${theCompanyName} / ${farmyName} - Private Repository Content

diff --git a/src/main/webapp/html/managecompanyadmins/company_admins.jsp b/src/main/webapp/html/managecompanyadmins/company_admins.jsp index 1babb96..4f588ef 100644 --- a/src/main/webapp/html/managecompanyadmins/company_admins.jsp +++ b/src/main/webapp/html/managecompanyadmins/company_admins.jsp @@ -28,9 +28,7 @@ -
+ diff --git a/src/main/webapp/html/managecompanyusers/company_users.jsp b/src/main/webapp/html/managecompanyusers/company_users.jsp index ebc69ed..3fcd3ff 100644 --- a/src/main/webapp/html/managecompanyusers/company_users.jsp +++ b/src/main/webapp/html/managecompanyusers/company_users.jsp @@ -28,9 +28,7 @@ -
+

-

+

${theCompanyName} - ${farmName} + style="font-size: 1.5em; padding-top: 12px; padding-left: 5px;">${theCompanyName} / ${farmName} - Administrators

diff --git a/src/main/webapp/html/managefarmusers/manage_farm_users_view.jsp b/src/main/webapp/html/managefarmusers/manage_farm_users_view.jsp index 6ec7abb..c21c130 100644 --- a/src/main/webapp/html/managefarmusers/manage_farm_users_view.jsp +++ b/src/main/webapp/html/managefarmusers/manage_farm_users_view.jsp @@ -31,12 +31,10 @@ -
+ -

${theCompanyName} - ${farmName} Users

+

${theCompanyName} / ${farmName} - Users