community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing conflicts

Browse Source
This commit is contained in:
geethkokila 2016-12-20 11:19:58 +05:30
parent 51c46095a4
commit 1b4857b7fd
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
View File

@ -21,13 +21,13 @@
<parent> <parent>
<groupId>org.wso2.carbon.devicemgt</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>certificate-mgt</artifactId> <artifactId>certificate-mgt</artifactId>
<version>2.0.4-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.certificate.mgt.core</artifactId> <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
<version>2.0.4-SNAPSHOT</version> <version>2.0.3-SNAPSHOT</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Certificate Management Core</name> <name>WSO2 Carbon - Certificate Management Core</name>
<description>WSO2 Carbon - Certificate Management Core</description> <description>WSO2 Carbon - Certificate Management Core</description>
@ -51,7 +51,8 @@
<Bundle-Version>${carbon.device.mgt.version}</Bundle-Version> <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
<Bundle-Description>Device Management Core Bundle</Bundle-Description> <Bundle-Description>Device Management Core Bundle</Bundle-Description>
<Private-Package> <Private-Package>
org.wso2.carbon.certificate.mgt.core.internal org.wso2.carbon.certificate.mgt.core.internal,
org.wso2.carbon.certificate.mgt.core.util
</Private-Package> </Private-Package>
<Import-Package> <Import-Package>
org.osgi.framework, org.osgi.framework,
@ -97,6 +98,7 @@
</Import-Package> </Import-Package>
<Export-Package> <Export-Package>
!org.wso2.carbon.certificate.mgt.core.internal.*, !org.wso2.carbon.certificate.mgt.core.internal.*,
!org.wso2.carbon.certificate.mgt.core.util,
org.wso2.carbon.certificate.mgt.core.* org.wso2.carbon.certificate.mgt.core.*
</Export-Package> </Export-Package>
</instructions> </instructions>

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/jaggery.conf
View File

@ -108,7 +108,7 @@
"contextParams" : [ "contextParams" : [
{ {
"name" : "Owasp.CsrfGuard.Config", "name" : "Owasp.CsrfGuard.Config",
"value" : "/repository/conf/security/Owasp.CsrfGuard.Carbon.properties" "value" : "/repository/conf/security/Owasp.CsrfGuard.dashboard.properties"
} }
] ]
} }

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/jaggery.conf
View File

@ -71,7 +71,7 @@
"contextParams" : [ "contextParams" : [
{ {
"name" : "Owasp.CsrfGuard.Config", "name" : "Owasp.CsrfGuard.Config",
"value" : "/repository/conf/security/Owasp.CsrfGuard.Carbon.properties" "value" : "/repository/conf/security/Owasp.CsrfGuard.dashboard.properties"
} }
] ]
} }