community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27 from charithag/master

Browse Source 
Update console logo and removed asm-all_4.1.0.wso2v1.jar
merge-requests/1/head
Charitha Goonetilleke 9 years ago
parent 865372f9e8 4f6dfac0fa
commit 6632cfc272
4 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File

2
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -90,6 +90,8 @@
<exclude>**/plugins/org.wso2.carbon.endpoint.ui*</exclude> <exclude>**/plugins/org.wso2.carbon.endpoint.ui*</exclude>
<exclude>**/plugins/org.wso2.carbon.inbound.ui*</exclude> <exclude>**/plugins/org.wso2.carbon.inbound.ui*</exclude>
<exclude>**/plugins/org.wso2.carbon.rest.api.ui*</exclude> <exclude>**/plugins/org.wso2.carbon.rest.api.ui*</exclude>
<!--TODO: Remove exclude for asm-all jar after fixing java stack issue-->
<exclude>**/asm-all_4.1.0.wso2v1.jar</exclude>
</excludes> </excludes>
</fileSet> </fileSet>

BIN
modules/distribution/src/repository/resources/styles/images/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
modules/iotserver-ui/src/main/resources/web/styles/images/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

38
modules/p2-profile-gen/pom.xml
Unescape View File

@ -159,6 +159,9 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.mobile.device.mgt.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.mobile.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.mdm.mdmmgt.server.feature:${carbon.mobile.device.mgt.version}
</featureArtifactDef>
<!-- Mobile Device Management Features --> <!-- Mobile Device Management Features -->
<!-- IoT Device Management Features --> <!-- IoT Device Management Features -->
@ -788,12 +791,12 @@
<version>${uuf.version}</version> <version>${uuf.version}</version>
</feature> </feature>
<!-- MDM Features --> <!-- IoTServer Features -->
<feature> <feature>
<id>org.wso2.iot.styles.feature.group</id> <id>org.wso2.iot.styles.feature.group</id>
<version>${carbon.iot.device.mgt.version}</version> <version>${carbon.iot.device.mgt.version}</version>
</feature> </feature>
<!-- End of MDM Features --> <!-- End of IoTServer Features -->
<!-- Device Management Features --> <!-- Device Management Features -->
<feature> <feature>
@ -808,18 +811,6 @@
<id>org.wso2.carbon.device.mgt.extensions.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.device.mgt.mobile.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.policy.mgt.server.feature.group</id> <id>org.wso2.carbon.policy.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
@ -858,6 +849,23 @@
</feature> </feature>
<!-- End of Device Management Features --> <!-- End of Device Management Features -->
<feature>
<id>org.wso2.carbon.device.mgt.mobile.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.mdm.mdmmgt.server.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.iot.feature.group</id> <id>org.wso2.carbon.device.mgt.iot.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version> <version>${carbon.mobile.device.mgt.version}</version>
@ -1265,7 +1273,7 @@
<id>org.wso2.carbon.social.feature.group</id> <id>org.wso2.carbon.social.feature.group</id>
<version>${carbon.store.version}</version> <version>${carbon.store.version}</version>
</feature> </feature>
Cipher tool feature <!-- Cipher tool feature -->
<feature> <feature>
<id>org.wso2.ciphertool.feature.group</id> <id>org.wso2.ciphertool.feature.group</id>

Write Preview
Loading…
Cancel
Save