You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by pr...@apache.org on 2014/04/07 10:32:59 UTC
[1/2] git commit: fixing themeing issue in stratos: STRATOS-576
Repository: incubator-stratos
Updated Branches:
refs/heads/master 8557675ee -> 8bf60e1ac
fixing themeing issue in stratos: STRATOS-576
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/e38de555
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e38de555
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e38de555
Branch: refs/heads/master
Commit: e38de555a86bc72c69c7620cb490065c3a1c30fc
Parents: d17aa8c
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Mon Apr 7 13:55:08 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Mon Apr 7 13:55:08 2014 +0530
----------------------------------------------------------------------
components/org.apache.stratos.styles/pom.xml | 130 +++++++++
.../src/main/resources/META-INF/product.xml | 27 ++
.../src/main/resources/web/favicon.ico | Bin 0 -> 17542 bytes
.../src/main/resources/web/styles/css/main.css | 261 +++++++++++++++++++
.../resources/web/styles/images/def-body-bg.gif | Bin 0 -> 419 bytes
.../web/styles/images/def-header-bg.gif | Bin 0 -> 17875 bytes
.../web/styles/images/def-header-region-bg.gif | Bin 0 -> 22784 bytes
.../main/resources/web/styles/images/logo.gif | Bin 0 -> 3476 bytes
.../resources/web/styles/images/powered.gif | Bin 0 -> 1773 bytes
.../resources/web/styles/images/right-logo.gif | Bin 0 -> 6102 bytes
.../web/styles/images/t-right-logo.gif | Bin 0 -> 3629 bytes
.../org.apache.stratos.styles.feature/pom.xml | 80 ++++++
products/stratos/modules/p2-profile-gen/pom.xml | 9 +
13 files changed, 507 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e38de555/components/org.apache.stratos.styles/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.styles/pom.xml b/components/org.apache.stratos.styles/pom.xml
new file mode 100644
index 0000000..1b8d999
--- /dev/null
+++ b/components/org.apache.stratos.styles/pom.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>stratos-components-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.stratos.manager.styles</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Stratos - Cloud Manager UI styles</name>
+ <url>http://apache.org</url>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>${project.artifactId}</Bundle-Name>
+ <Import-Package>
+ org.wso2.carbon.ui,
+ *;resolution:=optional
+ </Import-Package>
+ <Fragment-Host>org.wso2.carbon.ui</Fragment-Host>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>META-INF/product.xml</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>META-INF/product.xml</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.ui</artifactId>
+ <version>4.2.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.main</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.equinox.http.servlet</artifactId>
+ <version>2.2.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.equinox.http.helper</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.equinox.jsp.jasper</artifactId>
+ <version>1.0.1.R33x_v20070816</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>javax.servlet.jsp</artifactId>
+ <version>2.0.0.v200706191603</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <wso2carbon.version>4.2.0</wso2carbon.version>
+ </properties>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e38de555/components/org.apache.stratos.styles/src/main/resources/META-INF/product.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.styles/src/main/resources/META-INF/product.xml b/components/org.apache.stratos.styles/src/main/resources/META-INF/product.xml
new file mode 100644
index 0000000..e2228bf
--- /dev/null
+++ b/components/org.apache.stratos.styles/src/main/resources/META-INF/product.xml
@@ -0,0 +1,27 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF 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.
+ -->
+<product xmlns="http://products.wso2.org/carbon">
+ <properties>
+ <property name="userforum">http://stratos.incubator.apache.org/community/mailing-lists.html</property>
+ <property name="userguide">http://stratos.incubator.apache.org/index.html</property>
+ <property name="mailinglist">http://stratos.incubator.apache.org/community/mailing-lists.html</property>
+ <property name="issuetracker">https://issues.apache.org/jira/browse/STRATOS</property>
+ <property name="webAdminConsoleTitle">Apache Stratos Controller</property>
+ </properties>
+</product>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e38de555/components/org.apache.stratos.styles/src/main/resources/web/favicon.ico
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.styles/src/main/resources/web/favicon.ico b/components/org.apache.stratos.styles/src/main/resources/web/favicon.ico
new file mode 100644
index 0000000..f7b2bbf
Binary files /dev/null and b/components/org.apache.stratos.styles/src/main/resources/web/favicon.ico differ
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e38de555/components/org.apache.stratos.styles/src/main/resources/web/styles/css/main.css
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.styles/src/main/resources/web/styles/css/main.css b/components/org.apache.stratos.styles/src/main/resources/web/styles/css/main.css
new file mode 100644
index 0000000..833b05d
--- /dev/null
+++ b/components/org.apache.stratos.styles/src/main/resources/web/styles/css/main.css
@@ -0,0 +1,261 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF 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.
+ *
+*/
+
+/* ---------------- template styles ------------------------- */
+body {
+ background-image: url( ../images/def-body-bg.gif);
+ background-position: left top;
+ background-repeat: repeat-x;
+}
+
+table#main-table td#header {
+ background-image: url( ../images/def-header-region-bg.gif);
+ background-position: right top;
+ background-repeat: no-repeat;
+}
+
+table#main-table td#menu-panel {
+ border-right: solid 0px #78BDE8;
+ padding-right: 10px;
+}
+
+table#main-table td#menu-panel table#menu-table {
+ background-image:url("../images/theme-menu-table-bg.gif");
+ background-position:left bottom;
+ background-repeat:no-repeat;
+}
+table#main-table td#menu-panel table#menu-table {
+ background-image: none;
+ background-position:left bottom;
+ background-repeat:no-repeat;
+ border-right:1px solid #B6D8F2;
+ border-bottom:1px solid #B6D8F2;
+}
+table#main-table td#menu-panel table#menu-table tbody tr td img {
+ height: 17px;
+}
+/* ---------------- header styles ------------------ */
+div#header-div {
+ background-image: url( ../images/def-header-bg.gif);
+ height: 121px;
+}
+
+div#header-div div.left-logo {
+ background-image:url("../images/logo.gif");
+ background-position:left center;
+ height:50px;
+ margin-left:50px;
+ margin-top:37px;
+}
+
+div#header-div div.middle-ad {
+ float: left;
+ margin-top: 18px;
+ height: 55px;
+ width: 35%;
+}
+
+div#header-div div.right-logo {
+ /*background-image:url("../images/right-logo.gif");
+ background-position:right top;
+ background-repeat:no-repeat;*/
+ color:#B6D8F2;
+ font-size:0;
+ height:31px;
+ line-height:0;
+ margin-right:20px;
+ margin-top:36px;
+ padding-right:0;
+ padding-top:5px;
+ width:239px;
+}
+div#header-div div.header-links {
+ margin-top: 8px;
+}
+div#header-div div.header-links div.right-links {
+ margin-right: 0px;
+ height: 20px;
+ padding-top: 0px;
+}
+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: 6px;
+ padding-bottom: 7px;
+}
+/* ------------- 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 {
+ display: block !important;
+}
+
+div#menu ul.main li.menu-header {
+ background-image:none;
+ background-position:center top;
+ border-top: 1px solid #CFE3F6;
+ border-bottom:1px solid #78BDE8;
+ height:25px;
+}
+
+div#menu ul.main li a.menu-default {
+}
+
+div#menu ul.main li a.menu-default:hover {
+ background-color: #DAF0FC;
+ border-bottom: solid 1px #72CDF4;
+ border-top: solid 1px #72CDF4;
+ 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;
+}
+div#middle {
+ background-color: #fff;
+}
+
+/* ---- login styles ----- */
+
+
+/* --------------- table styles -------------------- */
+
+.tableOddRow{background-color: white;}
+.tableEvenRow{background-color: #EFECF5;}
+
+.button:hover{
+ background-image:url(../images/esb-button-bg-hover.gif);
+ border:solid 1px #8268A8;
+}
+
+/* =============================================================================================================== */
+
+
+
+.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-color: #fff;
+}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e38de555/components/org.apache.stratos.styles/src/main/resources/web/styles/images/def-body-bg.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.styles/src/main/resources/web/styles/images/def-body-bg.gif b/components/org.apache.stratos.styles/src/main/resources/web/styles/images/def-body-bg.gif
new file mode 100755
index 0000000..5db1464
Binary files /dev/null and b/components/org.apache.stratos.styles/src/main/resources/web/styles/images/def-body-bg.gif differ
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e38de555/components/org.apache.stratos.styles/src/main/resources/web/styles/images/def-header-bg.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.styles/src/main/resources/web/styles/images/def-header-bg.gif b/components/org.apache.stratos.styles/src/main/resources/web/styles/images/def-header-bg.gif
new file mode 100755
index 0000000..758363d
Binary files /dev/null and b/components/org.apache.stratos.styles/src/main/resources/web/styles/images/def-header-bg.gif differ
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e38de555/components/org.apache.stratos.styles/src/main/resources/web/styles/images/def-header-region-bg.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.styles/src/main/resources/web/styles/images/def-header-region-bg.gif b/components/org.apache.stratos.styles/src/main/resources/web/styles/images/def-header-region-bg.gif
new file mode 100755
index 0000000..935ee9e
Binary files /dev/null and b/components/org.apache.stratos.styles/src/main/resources/web/styles/images/def-header-region-bg.gif differ
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e38de555/components/org.apache.stratos.styles/src/main/resources/web/styles/images/logo.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.styles/src/main/resources/web/styles/images/logo.gif b/components/org.apache.stratos.styles/src/main/resources/web/styles/images/logo.gif
new file mode 100755
index 0000000..3b1e913
Binary files /dev/null and b/components/org.apache.stratos.styles/src/main/resources/web/styles/images/logo.gif differ
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e38de555/components/org.apache.stratos.styles/src/main/resources/web/styles/images/powered.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.styles/src/main/resources/web/styles/images/powered.gif b/components/org.apache.stratos.styles/src/main/resources/web/styles/images/powered.gif
new file mode 100644
index 0000000..b8bc163
Binary files /dev/null and b/components/org.apache.stratos.styles/src/main/resources/web/styles/images/powered.gif differ
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e38de555/components/org.apache.stratos.styles/src/main/resources/web/styles/images/right-logo.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.styles/src/main/resources/web/styles/images/right-logo.gif b/components/org.apache.stratos.styles/src/main/resources/web/styles/images/right-logo.gif
new file mode 100755
index 0000000..533d85a
Binary files /dev/null and b/components/org.apache.stratos.styles/src/main/resources/web/styles/images/right-logo.gif differ
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e38de555/components/org.apache.stratos.styles/src/main/resources/web/styles/images/t-right-logo.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.styles/src/main/resources/web/styles/images/t-right-logo.gif b/components/org.apache.stratos.styles/src/main/resources/web/styles/images/t-right-logo.gif
new file mode 100644
index 0000000..f118904
Binary files /dev/null and b/components/org.apache.stratos.styles/src/main/resources/web/styles/images/t-right-logo.gif differ
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e38de555/features/manager/styles/org.apache.stratos.styles.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/styles/org.apache.stratos.styles.feature/pom.xml b/features/manager/styles/org.apache.stratos.styles.feature/pom.xml
new file mode 100644
index 0000000..1b37c06
--- /dev/null
+++ b/features/manager/styles/org.apache.stratos.styles.feature/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>stratos-manager-features</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.stratos.manager.styles.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Stratos - stratos manager admin theme</name>
+ <url>http://apache.org</url>
+ <description></description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.manager.styles</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.wso2.maven</groupId>
+ <artifactId>carbon-p2-plugin</artifactId>
+ <version>${carbon.p2.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>p2-feature-generation</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-feature-gen</goal>
+ </goals>
+ <configuration>
+ <id>org.apache.stratos.manager.styles</id>
+ <propertiesFile>../etc/feature.properties</propertiesFile>
+ <adviceFile>
+ <properties>
+ <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef>
+ <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
+ </properties>
+ </adviceFile>
+ <bundles>
+ <bundleDef>org.apache.stratos:org.apache.stratos.manager.styles:${project.version}</bundleDef>
+ </bundles>
+ <importFeatures>
+ <importFeatureDef>org.wso2.carbon.core.ui:${carbon.version}</importFeatureDef>
+ </importFeatures>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e38de555/products/stratos/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml
index 05e85f8..31d3cba 100644
--- a/products/stratos/modules/p2-profile-gen/pom.xml
+++ b/products/stratos/modules/p2-profile-gen/pom.xml
@@ -183,6 +183,7 @@
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.platform.patch.version.4.2.1}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.resource.properties.feature:${carbon.platform.patch.version.4.2.1}</featureArtifactDef>
<featureArtifactDef>org.apache.stratos:org.apache.stratos.common.feature:${project.version}</featureArtifactDef>
+ <featureArtifactDef>org.apache.stratos:org.apache.stratos.manager.styles.feature:${project.version}</featureArtifactDef>
<featureArtifactDef>org.apache.stratos:org.apache.stratos.tenant.activity.server.feature:${project.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.throttle.server.feature:${carbon.version}</featureArtifactDef>
<featureArtifactDef>org.apache.stratos:org.apache.stratos.logging.mgt.feature:${project.version}</featureArtifactDef>
@@ -373,6 +374,10 @@
<version>${project.version}</version>
</feature>
<feature>
+ <id>org.apache.stratos.manager.styles.feature.group</id>
+ <version>${project.version}</version>
+ </feature>
+ <feature>
<id>org.wso2.carbon.transaction.manager.feature.group</id>
<version>${carbon.platform.patch.version.4.2.1}</version>
</feature>
@@ -649,6 +654,10 @@
<version>${carbon.version}</version>
</feature>
<feature>
+ <id>org.apache.stratos.manager.styles.feature.group</id>
+ <version>${project.version}</version>
+ </feature>
+ <feature>
<id>org.wso2.carbon.captcha.mgt.server.feature.group</id>
<version>${carbon.version}</version>
</feature>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by pr...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8bf60e1a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8bf60e1a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8bf60e1a
Branch: refs/heads/master
Commit: 8bf60e1ace706bba5badd7107eea0a844c957382
Parents: e38de55 8557675
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Mon Apr 7 13:55:22 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Mon Apr 7 13:55:22 2014 +0530
----------------------------------------------------------------------
.../cloud/controller/CloudControllerClient.java | 14 -
.../topology/AutoscalerTopologyReceiver.java | 57 +-
.../stratos/autoscaler/TestRulesPackaged.java | 8 +-
.../stratos/cli/RestCommandLineService.java | 2 +-
.../impl/CloudControllerServiceImpl.java | 44 +-
.../interfaces/CloudControllerService.java | 12 +-
.../cloud/controller/pojo/ClusterContext.java | 18 +-
.../controller/topology/TopologyBuilder.java | 17 +
.../conf/LoadBalancerConfiguration.java | 1 +
.../console/controllers/mycartridges.jag | 2 +-
.../theme1/partials/subscribe_cartridge.hbs | 2 +-
.../console/themes/theme1/ui/js/mycartridges.js | 2 +-
.../console/util/utility.jag | 4 +-
.../client/CloudControllerServiceClient.java | 6 +-
.../category/DefaultLoadBalancerCategory.java | 2 +-
.../utils/ApplicationManagementUtil.java | 7 +-
.../rest/endpoint/services/ServiceUtils.java | 5 -
.../rest/endpoint/services/StratosAdmin.java | 9 +-
.../synapse-configs/default/sequences/main.xml | 8 +-
.../distribution/src/assembly/filter.properties | 8 +-
.../main/resources/CloudControllerService.wsdl | 881 +++++++++----------
tools/puppet3/manifests/nodes.pp | 2 +-
tools/puppet3/modules/tomcat/manifests/init.pp | 4 +-
tools/stratos-installer/demo.sh | 93 +-
tools/stratos-installer/setup.sh | 36 +-
25 files changed, 557 insertions(+), 687 deletions(-)
----------------------------------------------------------------------