Sharing the user db with analytics and core profiles, and adding the tenant theme,

merge-requests/1/head
sinthuja 8 years ago
parent b1f305aeae
commit 0ba26a3a45

@ -8,7 +8,29 @@
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE</url>
<url>jdbc:h2:../../repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
<validationInterval>30000</validationInterval>
<defaultAutoCommit>false</defaultAutoCommit>
</configuration>
</definition>
</datasource>
<datasource>
<name>WSO2_REGISTRY_DB</name>
<description>The datasource used for registry and user manager</description>
<jndiConfig>
<name>jdbc/WSO2RegDB</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>

@ -29,7 +29,7 @@
<registryRoot>/</registryRoot>
<dbConfig name="wso2registry">
<dataSource>jdbc/WSO2CarbonDB</dataSource>
<dataSource>jdbc/WSO2RegDB</dataSource>
</dbConfig>
<!--<handler class="org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler">

@ -0,0 +1,261 @@
/* ---------------- template styles ------------------------- */
table#main-table td#header {
background-color: #3B003D;
background-image: url(../images/back-repeat.png);
background-repeat: repeat-x;
height: 70px;
border-bottom: solid 1px #000000;
}
table#main-table td#menu-panel {
border-right: solid 1px #989898;
/ / background-image : url(../images/bam-server-menu-panel-bg.gif);
background-position: right top;
background-repeat: repeat-y;
}
/* ---------------- header styles ------------------ */
div#header-div {
background-image: url(../images/bam-header-bg.png);
height: 70px;
}
div#header-div div.left-logo {
background-image: url(../images/bam-header-logo.png);
margin-left: 25px;
margin-top: 22px;
position: absolute;
}
div#header-div div.right-logo {
color: #ffffff;
height: 32px;
margin-right: 20px;
line-height: 30px;
margin-top: 10px;
padding-right: 0px;
padding-top: 0px;
}
div#header-div div.header-links {
margin-top: 0px;
}
div#header-div div.header-links div.right-links {
margin-right: 0px;
height: 27px;
padding-top: 0px;
color: #ffffff;
}
div#header-div div.header-links div.right-links a {
color: #91e9c7;
}
div#header-div div.header-links div.right-links ul {
background-image: none;
background-position: left top;
background-repeat: repeat-x;
padding-left: 25px;
padding-right: 15px;
padding-top: 4px;
padding-bottom: 4px;
}
/* ------------- menu styles ---------------------- */
div#menu {
}
div#menu ul.main {
}
div#menu ul.main li {
}
div#menu ul.main li.normal {
}
div#menu ul.main li a.menu-home {
background-image: url(../images/menu_header.gif);
height: 28px;
}
div#menu ul.main li.menu-header {
background-image: url(../images/bam-server-menu-header.gif);
background-position: left bottom;
background-repeat: repeat-x;
height: 32px;
line-height: 32px;
}
div#menu ul.main li a.menu-default {
}
div#menu ul.main li a.menu-default:hover {
background-color: #EFECF5;
border-bottom: solid 1px #C2B7D8;
border-top: solid 1px #C2B7D8;
color: #00447C;
}
div#menu ul.sub {
}
/* -------------- child no-01 styles -------------- */
div#menu ul.sub li.normal {
}
div#menu ul.sub li a.menu-default {
}
/* ----------- child no-01 (disabled) styles ------------------- */
div#menu ul.sub li a.menu-disabled-link {
}
div#menu ul.sub li a.menu-disabled-link:hover {
}
/* -------------- child no-02 styles -------------- */
div#menu ul.sub li.normal ul.sub li a.menu-default {
}
/* -------------- child no-03 styles -------------- */
div#menu ul.sub li.normal ul.sub li.normal ul.sub li a.menu-default {
}
/* ------------- footer styles -------------------- */
div#footer-div div.footer-content div.poweredby {
background-image: url(../images/powered-synapse.gif);
background-position: right top;
}
/* ---- login styles ----- */
/* --------------- table styles -------------------- */
.tableOddRow {
background-color: white;
}
.tableEvenRow {
background-color: #EFECF5;
}
.button:hover {
}
/* =============================================================================================================== */
.cornerExpand {
position: relative;
top: 3px;
left: -12px;
cursor: pointer;
}
.cornerCollapse {
position: relative;
top: 3px;
left: -12px;
cursor: pointer;
}
/* chanaka */
.form-table td {
padding-bottom: 5px !important;
padding-left: 5px !important;
padding-top: 5px !important;
padding-right: 10px !important;
}
.form-table td div.indented {
padding-left: 7px !important;
color: #595959 !important;
}
.form-table-left {
width: 100px;
}
.longTextField {
width: 270px;
}
.rowAlone {
padding-top: 10px;
padding-bottom: 10px;
}
.tabedBox {
border: solid 1px #cccccc;
margin-left: 10px;
padding: 10px;
margin-bottom: 10px;
}
/* chanaka end */
a.fact-selector-icon-link {
background-image: url(../images/facts-selector.gif);
background-repeat: no-repeat;
background-position: left top;
padding-left: 20px;
line-height: 17px;
height: 17px;
float: left;
position: relative;
margin-left: 10px;
margin-top: 5px;
margin-bottom: 3px;
white-space: nowrap;
}
table#main-table td#middle-content {
background-image: url(../images/menu-margin.gif);
background-position: left top;
background-repeat: repeat-y;
background-color: #ffffff;
}
div#middle {
background-color: #ffffff;
}
/* new theme 01-07-2013 */
table#main-table td.vertical-menu-container {
background-color: #444;
padding-left: 5px;
border-top: 0px;
}
div.menu-panel-buttons {
border-top-left-radius: 7px;
border-bottom-left-radius: 7px;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
padding: 15px 3px;
}
div.selected span {
font-weight: bold;
color: #ffffff;
background-color: #555555;
}
div.menu-panel-buttons span {
}
div.selected {
border: 0px;
background-color: #555555;
box-shadow: none;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 967 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 166 B

@ -1,60 +0,0 @@
/*
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
var getDateString, getDuration;
(function() {
getDateString = function (timestamp) {
var date = new Date();
date.setTime(timestamp);
return date.toString();
};
getDuration = function (durationInMS) {
var time = '';
var date = new Date();
date.setTime(durationInMS);
var day = Math.floor(durationInMS/86400000);
if (day > 0){
//More than 1 day
time = day +' day : ';
durationInMS = durationInMS - (day * 86400000);
}
var hour = Math.floor(durationInMS/3600000);
if (hour > 0){
//More than 1 hour
time = time + hour + ' hour : ';
durationInMS = durationInMS - (hour * 3600000);
}
var minutes = Math.floor(durationInMS/60000);
if (minutes > 0){
//More than 1 minute
time = time + minutes + ' minutes : ';
durationInMS = durationInMS - (minutes * 60000);
}
var seconds = Math.ceil(durationInMS/1000);
if (seconds > 0){
//More than 1 minute
time = time + seconds + ' seconds : ';
}
time = time.slice(0, -2);
return time;
};
}());

@ -615,8 +615,6 @@
<exclude>features/**</exclude>
<exclude>**/org.wso2.carbon.feature.mgt.ui*</exclude>
<exclude>**/artifacts.xml</exclude>
<exclude>p2/**</exclude>
<exclude>lib/**</exclude>
<exclude>**/json_2.0.0.wso2v1.jar</exclude>
<exclude>**/nimbus-jose-jwt_2.26.1.wso2v2.jar</exclude>
</excludes>
@ -840,9 +838,15 @@
<directory>
../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/resources</outputDirectory>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/resources</outputDirectory>
</fileSet>
<fileSet>
<directory>
src/analytics/resources/allthemes
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/resources/allthemes</outputDirectory>
</fileSet>
<!--TODO: Check on using styles-->
<fileSet>
<directory>../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/components
@ -855,11 +859,9 @@
<exclude>**/.settings</exclude>
<exclude>features/**</exclude>
<exclude>**/org.wso2.carbon.feature.mgt.ui*</exclude>
<exclude>lib/**</exclude>
<exclude>**/json_2.0.0.wso2v1.jar</exclude>
<exclude>**/nimbus-jose-jwt_2.26.1.wso2v2.jar</exclude>
<exclude>**/artifacts.xml</exclude>
<exclude>p2/**</exclude>
</excludes>
</fileSet>
@ -996,11 +998,9 @@
<exclude>**/.settings</exclude>
<exclude>features/**</exclude>
<exclude>**/org.wso2.carbon.feature.mgt.ui*</exclude>
<exclude>lib/**</exclude>
<exclude>**/json_2.0.0.wso2v1.jar</exclude>
<exclude>**/nimbus-jose-jwt_2.26.1.wso2v2.jar</exclude>
<exclude>**/artifacts.xml</exclude>
<exclude>p2/**</exclude>
</excludes>
</fileSet>
<!-- ********************************* End of Broker Profile ********************************* -->

@ -25,5 +25,6 @@ default.server.role=IoTServer
cep.server.role=ComplexEventProcessor
das.server.role=DataAnalyticsServer
cdmf.platform.role=CDMFPlatform
cdmf.analytics.role=CDMFAnalytics
geodashboard.role=GeoDashboard
bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator

@ -30,7 +30,7 @@
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;AUTO_SERVER_PORT=9095</url>
<url>jdbc:h2:repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>

@ -207,6 +207,6 @@
</repository>
</repositories>
<properties>
<carbon.device.mgt.plugin.version>3.0.13-SNAPSHOT</carbon.device.mgt.plugin.version>
<carbon.device.mgt.plugin.version>3.0.15-SNAPSHOT</carbon.device.mgt.plugin.version>
</properties>
</project>

@ -1526,14 +1526,14 @@
<carbon.multitenancy.version>4.6.1</carbon.multitenancy.version>
<!-- Carbon Registry -->
<carbon.registry.version>4.6.5-SNAPSHOT</carbon.registry.version>
<carbon.registry.version.iotcore>4.6.5-SNAPSHOT</carbon.registry.version.iotcore>
<carbon.registry.version>4.6.5</carbon.registry.version>
<carbon.registry.version.iotcore>4.6.5</carbon.registry.version.iotcore>
<!-- Carbon Governance -->
<carbon.governance.version>4.7.0</carbon.governance.version>
<!-- Carbon Device Management -->
<carbon.device.mgt.version>2.0.31-SNAPSHOT</carbon.device.mgt.version>
<carbon.device.mgt.version>2.0.32-SNAPSHOT</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management -->

Loading…
Cancel
Save