diff --git a/.gitignore b/.gitignore index dfb3b8f778a..af632bd0769 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,8 @@ components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/s components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/build/ components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/package-lock.json components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/npm-debug.log +components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/public/dist/ +components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/node_modules/ +components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/dist/ +components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/package-lock.json + diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/fonts/font-wso2.ttf b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/fonts/font-wso2.ttf index e69de29bb2d..27735b28203 100644 Binary files a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/fonts/font-wso2.ttf and b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/fonts/font-wso2.ttf differ diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/fonts/font-wso2.woff b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/fonts/font-wso2.woff index e69de29bb2d..80fd5a7fc26 100644 Binary files a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/fonts/font-wso2.woff and b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/fonts/font-wso2.woff differ diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/fonts/font-wso2.woff2 b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/fonts/font-wso2.woff2 index e69de29bb2d..6087330889a 100644 Binary files a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/fonts/font-wso2.woff2 and b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/fonts/font-wso2.woff2 differ diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/jaggery.conf b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/jaggery.conf new file mode 100755 index 00000000000..5ff8eb120e5 --- /dev/null +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/jaggery.conf @@ -0,0 +1,84 @@ +{ + "welcomeFiles": [ + "index.html" + ], + "urlMappings": [ + { + "url": "/login", + "path": "/index.html" + }, + { + "url": "/assets/apps", + "path": "/index.html" + } + ], + "listeners": [ + { + "class": "org.owasp.csrfguard.CsrfGuardServletContextListener" + }, + { + "class": "org.owasp.csrfguard.CsrfGuardHttpSessionListener" + } + ], + "servlets": [ + { + "name": "JavaScriptServlet", + "class": "org.owasp.csrfguard.servlet.JavaScriptServlet" + } + ], + "servletMappings": [ + { + "name": "JavaScriptServlet", + "url": "/csrf.js" + } + ], + "contextParams": [ + { + "name": "Owasp.CsrfGuard.Config", + "value": "repository/conf/security/Owasp.CsrfGuard.dashboard.properties" + } + ], + "filters": [ + { + "name": "ContentTypeBasedCachePreventionFilter", + "class": "org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter", + "params" : [ + {"name" : "patterns", "value" : "text/html\" ,application/json\" ,text/plain"}, + {"name" : "filterAction", "value" : "enforce"}, + {"name" : "httpHeaders", "value" : "Cache-Control: no-store, no-cache, must-revalidate, private"} + ] + }, + { + "name": "HttpHeaderSecurityFilter", + "class": "org.apache.catalina.filters.HttpHeaderSecurityFilter", + "params": [ + { + "name": "hstsEnabled", + "value": "false" + }, + { + "name": "antiClickJackingOption", + "value": "SAMEORIGIN" + } + ] + }, + { + "name" : "CSRFGuard", + "class" : "org.owasp.csrfguard.CsrfGuardFilter" + } + ], + "filterMappings": [ + { + "name": "HttpHeaderSecurityFilter", + "url": "*" + }, + { + "name" : "CSRFGuard", + "url" : "/*" + }, + { + "name":"ContentTypeBasedCachePreventionFilter", + "url":"*" + } + ] +} diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/locales/en.json b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/locales/en.json index 5e4c21af11c..aff57f632bc 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/locales/en.json +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/locales/en.json @@ -37,5 +37,7 @@ "Alpha.Releases" : "Alpha Releases", "Version" : "Version", "Status" : "Status", - "App.Publisher" : "Application Publisher" + "App.Publisher" : "Application Publisher", + "Login": "Login", + "Logout" : "Logout" } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/themes/default/default-theme.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/themes/default/default-theme.css index 0afbb7ba5f8..2b7f80bffaa 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/themes/default/default-theme.css +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/public/themes/default/default-theme.css @@ -87,7 +87,7 @@ body { .btn-header { margin-top: 15px; - margin-right: 20px; + margin-right: 100px; color: white; } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/App.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/App.jsx index f1084e1993b..b43c3338dc5 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/App.jsx +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/App.jsx @@ -63,6 +63,7 @@ class Base extends Component { } render() { + console.log('came to base ../////'); if (this.state.user !== null) { return (
@@ -106,12 +107,13 @@ class Store extends Component { } render() { + console.log('came to store'); return (
- - + + diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/App.test.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/App.test.js deleted file mode 100644 index 79b7f3f6659..00000000000 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/App.test.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you 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. - */ - -import React from 'react'; -import ReactDOM from 'react-dom'; -import App from './App'; - -it('renders without crashing', () => { - const div = document.createElement('div'); - ReactDOM.render(, div); -}); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/common/configuration.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/common/configuration.js index 0c999fd0611..77d90dc444e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/common/configuration.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/common/configuration.js @@ -25,6 +25,7 @@ class Configuration { constructor() { this.serverConfig = {}; + this.themeConfig = {}; this.hostConstants = { baseURL: window.location.origin, appContext: window.location.pathname.split("/")[1] @@ -35,8 +36,9 @@ class Configuration { let thisObject = this; axios.get(thisObject.hostConstants.baseURL + '/' + thisObject.hostConstants.appContext + "/config.json"). then(function (response) { - console.log('successfully loaded the configuration!'); + console.log('succesfully loadedd....'); thisObject.serverConfig = response.data.config; + thisObject.themeConfig = response.data.theme; Constants.load(); callback(); }).catch(function (error) { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/components/AppStoreBase/BaseLayout.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/components/AppStoreBase/BaseLayout.jsx index 810fd33fa32..6e46e5fda8c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/components/AppStoreBase/BaseLayout.jsx +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/components/AppStoreBase/BaseLayout.jsx @@ -21,7 +21,7 @@ import React, {Component} from 'react'; import {withRouter} from 'react-router-dom'; import AuthHandler from "../../api/authHandler"; import {Col, Container, Input, Row,} from 'reactstrap'; -import FloatingButton from "../UIComponents/FloatingButton/FloatingButton"; +import UserOptions from '../UIComponents/UserOptions/UserOptions'; /** * Base Layout: @@ -36,22 +36,18 @@ class BaseLayout extends Component { this.state = { notifications: 0, user: 'Admin', - openModal: false + openModal: false, + userOptions : false }; this.logout = this.logout.bind(this); this.closeModal = this.closeModal.bind(this); + this.handleUserOptionsOnClick = this.handleUserOptionsOnClick.bind(this); } handleApplicationClick() { this.handleHistory('/assets/apps'); } - handleApplicationCreateClick(event) { - event.preventDefault(); - event.stopPropagation(); - this.setState({openModal: true}); - } - /** * The method to update the history. * to: The URL to route. @@ -68,6 +64,10 @@ class BaseLayout extends Component { this.setState({openModal: false}); } + handleUserOptionsOnClick() { + this.setState({userOptions : true}); + } + render() { return ( @@ -78,7 +78,9 @@ class BaseLayout extends Component {
- + + +
-
- -
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/components/Application/ApplicationListing.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/components/Application/ApplicationListing.jsx index 299e0a15137..39786db9326 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/components/Application/ApplicationListing.jsx +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/components/Application/ApplicationListing.jsx @@ -238,6 +238,7 @@ class ApplicationListing extends Component { } render() { + console.log('render app listing'); return (
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/components/UIComponents/UserOptions/UserOptions.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/components/UIComponents/UserOptions/UserOptions.jsx new file mode 100644 index 00000000000..549b949237e --- /dev/null +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/components/UIComponents/UserOptions/UserOptions.jsx @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you 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. + */ + +import React, {Component} from 'react'; +import './user-options.css'; +import AuthHandler from '../../../api/authHandler'; +import {FormattedMessage} from 'react-intl'; + + +class UserOptions extends Component { + + constructor() { + super(); + this.state = {}; + } + + componentWillMount() { + let user = AuthHandler.getUser(); + if (user) { + if (!AuthHandler.isTokenExpired()) { + this.setState({user: user}); + } else { + this.setState({user: null}); + } + } + } + + render() { + var displayOptions = this.props.userOptions ? "block" : "none"; + if (this.state.user) { + return ( +
+ +
+ ); + } else { + return ( +
+ +
+ ); + } + } +} + +export default UserOptions; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/components/UIComponents/UserOptions/user-options.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/components/UIComponents/UserOptions/user-options.css new file mode 100644 index 00000000000..fb49817aa31 --- /dev/null +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/components/UIComponents/UserOptions/user-options.css @@ -0,0 +1,60 @@ +/*! +~ Copyright (c) 2017 WSO2 Inc. (http://wso2.com) 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. +*/ + +.dropbtn { + background-color: #4CAF50; + color: white; + padding: 16px; + font-size: 16px; + border: none; + cursor: pointer; +} + +/* The container
- needed to position the dropdown content */ +.dropdown { + position: relative; + display: inline-block; +} + +/* Dropdown Content (Hidden by Default) */ +.dropdown-content { + display: none; + position: absolute; + background-color: #f9f9f9; + box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); + z-index: 1; +} + +/* Links inside the dropdown */ +.dropdown-content a { + color: black; + padding: 12px 16px; + text-decoration: none; + display: block; +} + +/* Change color of dropdown links on hover */ +.dropdown-content a:hover {background-color: #f1f1f1} + +/* Show the dropdown menu on hover */ +.dropdown:hover .dropdown-content { + display: block; +} + +/* Change the background color of the dropdown button when the dropdown content is shown */ +.dropdown:hover .dropbtn { + background-color: #3e8e41; +} \ No newline at end of file diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/index.js index b9bc86bba4c..04e93185f8c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/index.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/index.js @@ -46,7 +46,7 @@ function loadStore() { }).catch(error => { addLocaleData(require('react-intl/locale-data/en')); let defaultLocale = Axios.create({ - baseURL: Configuration.hostConstants.baseURL + "/" + Configuration.hostConstants.appContext + "/locales" + baseURL: Configuration.hostConstants.baseURL + "/" + Configuration.hostConstants.appContext + "/locales/" + Constants.defaultLocale + ".json" }).get(); defaultLocale.then(response => { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/theme.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/theme.js index 45127271fd2..f325026f76e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/theme.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/theme.js @@ -17,6 +17,7 @@ */ import axios from 'axios'; +import Configuration from './common/configuration'; /** * This class will read through the configuration file and saves the theme names for the usage in other files. @@ -33,8 +34,8 @@ class Theme { this.selectedTheme = this.defaultThemeType; //TODO Need to get the app context properly when the server is ready - this.baseURL = window.location.origin; - this.appContext = window.location.pathname.split("/")[1]; + this.baseURL = Configuration.hostConstants.baseURL; + this.appContext = Configuration.hostConstants.appContext; this.loadThemeConfigs = this.loadThemeConfigs.bind(this); this.loadThemeFiles = this.loadThemeFiles.bind(this); this.insertThemingScripts = this.insertThemingScripts.bind(this); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/webpack.config.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/webpack.config.js index 8b9124b3f24..00f2d7dc437 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/webpack.config.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/webpack.config.js @@ -64,7 +64,6 @@ const config = { ] }, resolve: { - // you can now require('file') instead of require('file.coffee') extensions: ['.jsx', '.js', '.ttf', '.woff', '.woff2', '.svg'] } diff --git a/components/application-mgt/pom.xml b/components/application-mgt/pom.xml index 5b7f9cad9d9..856111ac6d1 100644 --- a/components/application-mgt/pom.xml +++ b/components/application-mgt/pom.xml @@ -38,6 +38,7 @@ org.wso2.carbon.device.application.mgt.common org.wso2.carbon.device.application.mgt.api org.wso2.carbon.device.application.mgt.publisher.ui + org.wso2.carbon.device.application.mgt.store.ui org.wso2.carbon.device.application.mgt.authhandler diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/src/main/resources/p2.inf b/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/src/main/resources/p2.inf index 7240587940a..47bccfcdb76 100644 --- a/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/src/main/resources/p2.inf +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/src/main/resources/p2.inf @@ -1,4 +1,4 @@ instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps);\ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/publisher/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.publisher.ui_${feature.version}/publisher/public/,target:${installFolder}/../../deployment/server/webapps/publisher/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapp);\ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapps/publisher/);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.publisher.ui_${feature.version}/publisher/public/,target:${installFolder}/../../deployment/server/jaggeryapps/publisher/,overwrite:true);\ diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.store.ui.feature/pom.xml b/features/application-mgt/org.wso2.carbon.device.application.mgt.store.ui.feature/pom.xml index 521c1665051..a21a57348ea 100644 --- a/features/application-mgt/org.wso2.carbon.device.application.mgt.store.ui.feature/pom.xml +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.store.ui.feature/pom.xml @@ -19,15 +19,102 @@ - 4.0.0 org.wso2.carbon.devicemgt application-mgt-feature 3.0.46-SNAPSHOT + + 4.0.0 org.wso2.carbon.device.application.mgt.store.ui.feature 3.0.46-SNAPSHOT + pom + WSO2 Carbon - Application Management Store UI Feature + http://wso2.org + This feature contains Application Management Store UI - + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + package + + unpack + + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.application.mgt.store.ui + ${project.version} + jar + true + + ${project.build.directory}/maven-shared-archive-resources + + **/* + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + copy-resources + generate-resources + + copy-resources + + + src/main/resources + + + resources + + build.properties + p2.inf + + + + + + + + + org.wso2.maven + carbon-p2-plugin + + + p2-feature-generation + package + + p2-feature-gen + + + org.wso2.carbon.device.application.mgt.store.ui + ../../../features/etc/feature.properties + + + + org.wso2.carbon.p2.category.type:server + + org.eclipse.equinox.p2.type.group:false + + + + + + + + + \ No newline at end of file diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.ui.feature/src/main/resources/build.properties b/features/application-mgt/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/build.properties similarity index 100% rename from features/application-mgt/org.wso2.carbon.device.application.mgt.ui.feature/src/main/resources/build.properties rename to features/application-mgt/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/build.properties diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/p2.inf b/features/application-mgt/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/p2.inf new file mode 100644 index 00000000000..fe5d20809cc --- /dev/null +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/p2.inf @@ -0,0 +1,4 @@ +instructions.configure = \ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapps);\ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapps/store/);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.store.ui_${feature.version}/store/public/,target:${installFolder}/../../deployment/server/jaggeryapps/store/,overwrite:true);\ diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.ui.feature/pom.xml b/features/application-mgt/org.wso2.carbon.device.application.mgt.ui.feature/pom.xml deleted file mode 100644 index bee84d4f642..00000000000 --- a/features/application-mgt/org.wso2.carbon.device.application.mgt.ui.feature/pom.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - org.wso2.carbon.devicemgt - application-mgt-feature - 3.0.46-SNAPSHOT - ../pom.xml - - - 4.0.0 - org.wso2.carbon.device.application.mgt.ui.feature - 3.0.46-SNAPSHOT - pom - WSO2 Carbon - Application Management UI Feature - http://wso2.org - This feature contains Application Management console UI - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - package - - unpack - - - - - org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.ui - ${project.version} - zip - true - - ${project.build.directory}/maven-shared-archive-resources - - **/* - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - copy-resources - generate-resources - - copy-resources - - - src/main/resources - - - resources - - build.properties - p2.inf - - - - - - - - - org.wso2.maven - carbon-p2-plugin - - - p2-feature-generation - package - - p2-feature-gen - - - org.wso2.carbon.device.application.mgt.ui - ../../../features/etc/feature.properties - - - - org.wso2.carbon.p2.category.type:server - - org.eclipse.equinox.p2.type.group:false - - - - - - - - - - \ No newline at end of file diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.ui.feature/src/main/resources/p2.inf b/features/application-mgt/org.wso2.carbon.device.application.mgt.ui.feature/src/main/resources/p2.inf deleted file mode 100644 index 529f8f8e7a1..00000000000 --- a/features/application-mgt/org.wso2.carbon.device.application.mgt.ui.feature/src/main/resources/p2.inf +++ /dev/null @@ -1,9 +0,0 @@ -instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapps/application-mgt);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.ui_${feature.version}/jaggeryapps/application-mgt,target:${installFolder}/../../deployment/server/jaggeryapps/application-mgt,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapps/appmgt-uuf-template-app);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.ui_${feature.version}/jaggeryapps/appmgt-uuf-template-app,target:${installFolder}/../../deployment/server/jaggeryapps/appmgt-uuf-template-app,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.ui_${feature.version}/jaggery-modules/utils/,target:${installFolder}/../../modules/utils,overwrite:true);\ - -instructions.unconfigure = \ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/application-mgt);\ diff --git a/features/application-mgt/pom.xml b/features/application-mgt/pom.xml index 4f542af90b2..6dad143b10b 100644 --- a/features/application-mgt/pom.xml +++ b/features/application-mgt/pom.xml @@ -36,10 +36,9 @@ org.wso2.carbon.device.application.mgt.api.feature org.wso2.carbon.device.application.mgt.auth.handler.feature - org.wso2.carbon.device.application.mgt.feature - org.wso2.carbon.device.application.mgt.server.feature org.wso2.carbon.device.application.mgt.publisher.ui.feature + org.wso2.carbon.device.application.mgt.store.ui.feature diff --git a/features/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/build.properties b/features/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/build.properties new file mode 100644 index 00000000000..9c86577d768 --- /dev/null +++ b/features/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/build.properties @@ -0,0 +1 @@ +custom = true diff --git a/features/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/p2.inf b/features/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/p2.inf new file mode 100644 index 00000000000..7240587940a --- /dev/null +++ b/features/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/p2.inf @@ -0,0 +1,4 @@ +instructions.configure = \ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps);\ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/publisher/);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.publisher.ui_${feature.version}/publisher/public/,target:${installFolder}/../../deployment/server/webapps/publisher/,overwrite:true);\