community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing the old references of the plugins-deployer, and owsap log in the integration tests.

Browse Source
This commit is contained in:
sinthuja 2017-06-22 23:26:45 +05:30
parent 099ce78ea3
commit c04b8e7872
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties
View File

@ -477,6 +477,7 @@ org.owasp.csrfguard.unprotected.socialApis=%servletContext%/social/apis/*
org.owasp.csrfguard.unprotected.appStoreDevices=%servletContext%/store/apps/devices/* org.owasp.csrfguard.unprotected.appStoreDevices=%servletContext%/store/apps/devices/*
org.owasp.csrfguard.unprotected.appStoreApis=%servletContext%/store/apis/* org.owasp.csrfguard.unprotected.appStoreApis=%servletContext%/store/apis/*
org.owasp.csrfguard.unprotected.appPortalClient=%servletContext%/portal/apis/* org.owasp.csrfguard.unprotected.appPortalClient=%servletContext%/portal/apis/*
org.owasp.csrfguard.unprotected.connectedcupAgent=%servletContext%/connected-cup-agent/*
#carbon #carbon
org.owasp.csrfguard.unprotected.Services=%servletContext%/services/* org.owasp.csrfguard.unprotected.Services=%servletContext%/services/*

6
modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java
View File

@ -108,13 +108,13 @@ public class SampleInstallationTest extends IOTIntegrationUIBaseTestCase {
log.info("CARBON_HOME: " + System.getProperty(Constants.CARBON_HOME)); log.info("CARBON_HOME: " + System.getProperty(Constants.CARBON_HOME));
File dir = new File(carbonHome); File dir = new File(carbonHome);
log.info("Sample installation started : mvn clean install -f device-deployer.xml"); log.info("Sample installation started : mvn clean install -f device-plugins-deployer.xml");
try { try {
if (System.getProperty(Constants.OS_NAME).toLowerCase().contains("windows")) { if (System.getProperty(Constants.OS_NAME).toLowerCase().contains("windows")) {
commands = new String[]{"cmd.exe", "/c", "mvn clean install -f device-deployer.xml"}; commands = new String[]{"cmd.exe", "/c", "mvn clean install -f device-plugins-deployer.xml"};
tempProcess = Runtime.getRuntime().exec(commands, null, dir); tempProcess = Runtime.getRuntime().exec(commands, null, dir);
} else { } else {
commands = new String[]{"mvn", "clean", "install", "-f", "device-deployer.xml"}; commands = new String[]{"mvn", "clean", "install", "-f", "device-plugins-deployer.xml"};
tempProcess = Runtime.getRuntime().exec(commands, null, dir); tempProcess = Runtime.getRuntime().exec(commands, null, dir);
} }
boolean buildStatus = waitForMessage(tempProcess.getInputStream(), Constants.BUILD_SUCCESS_MSG); boolean buildStatus = waitForMessage(tempProcess.getInputStream(), Constants.BUILD_SUCCESS_MSG);