Merge pull request #201 from dnwick/master

Added product cep changes to support new carbon dashboard version
wso2-attic · Feb 1, 2016 · f7a9020 · f7a9020
2 parents 8ba0603 + 5beb473
commit f7a9020
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 12 deletions.
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
@@ -244,10 +244,6 @@
  <delete dir="${tempdir}" />
  <!-- Moving identity features downwards in management console UI -->
  <property name="tempdir2" value="target/identity-ui" />
- <mkdir dir="${tempdir2}" />
- <unzip src="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/org.wso2.carbon.identity.account.mgt.menu.ui_${carbon.identity.version}.jar" dest="${tempdir2}" />
- <replace file="${tempdir2}/META-INF/component.xml" token="&lt;parent-menu&gt;identity_menu&lt;/parent-menu&gt;" value="&lt;parent-menu&gt;configure_menu&lt;/parent-menu&gt;" />
- <zip destfile="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/org.wso2.carbon.identity.account.mgt.menu.ui_${carbon.identity.version}.jar" basedir="${tempdir2}" />
  </target>
  </configuration>
  </execution>

diff --git a/modules/distribution/repository/resources/jaggery/config/designer.json b/modules/distribution/repository/resources/jaggery/config/designer.json
@@ -0,0 +1,37 @@
+{
+ "store": {
+ "type": "fs"
+ },
+ "authentication": {
+ "activeMethod": "basic",
+ "methods": {
+ "sso": {
+ "attributes": {
+ "issuer": "portal",
+ "identityProviderURL": "https://localhost:9443/samlsso",
+ "responseSigningEnabled": "false",
+ "acs": "https://localhost:9444/portal/acs",
+ "identityAlias": "wso2carbon",
+ "useTenantKey": false
+ }
+ },
+ "basic": {
+ "attributes": {}
+ }
+ }
+ },
+ "designers": [
+ "Internal/everyone"
+ ],
+ "tenantPrefix": "/t",
+ "shareStore": false,
+ "theme": "basic",
+ "cacheTimeoutSeconds": "5",
+ "cacheSizeBytes": "1073741824",
+ "defaultDashboardRedirect": false,
+ "isCreateGadgetEnable": true,
+ "oauth": {
+ "username": "admin",
+ "password": "admin"
+ }
+}
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
@@ -667,6 +667,24 @@
  <fileMode>644</fileMode>
  </file>
 
+ <!--Copying jaggery config file -->
+ <file>
+ <source>repository/resources/jaggery/config/designer.json</source>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal/configs
+ </outputDirectory>
+ <filtered>true</filtered>
+ <fileMode>644</fileMode>
+ </file>
+
+ <!-- Copying the identity file -->
+ <file>
+ <source>
+ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity.xml
+ </source>
+ <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
+ <fileMode>644</fileMode>
+ </file>
+
  </files>
 
  <!-- Adding rampart mar -->

diff --git a/modules/p2-profile-gen/carbon.product b/modules/p2-profile-gen/carbon.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.2" useFeatures="true" includeLaunchers="true">
+<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.3" useFeatures="true" includeLaunchers="true">
 
  <configIni use="default">
  </configIni>
@@ -13,7 +13,7 @@
  </plugins>
 
  <features>
- <feature id="org.wso2.carbon.core.runtime" version="4.4.2"/>
+ <feature id="org.wso2.carbon.core.runtime" version="4.4.3"/>
  </features>
 
  <configurations>

diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
@@ -118,6 +118,9 @@
  <featureArtifactDef>
  org.jaggeryjs.modules:carbon.feature:${jaggery.modules.version}
  </featureArtifactDef>
+ <featureArtifactDef>
+ org.jaggeryjs.modules:i18n.feature:${jaggery.modules.version}
+ </featureArtifactDef> 
  <featureArtifactDef>
  org.jaggeryjs.modules:process.feature:${jaggery.modules.version}
  </featureArtifactDef>
@@ -179,6 +182,9 @@
  <featureArtifactDef>
  org.wso2.carbon.identity:org.wso2.carbon.identity.core.ui.feature:${carbon.identity.version}
  </featureArtifactDef>
+ <featureArtifactDef>
+ org.wso2.carbon.identity:org.wso2.carbon.identity.core.server.feature:${carbon.identity.version}
+ </featureArtifactDef>
  <featureArtifactDef>
  org.wso2.carbon.identity:org.wso2.carbon.security.mgt.feature:${carbon.identity.version}
  </featureArtifactDef>
@@ -363,6 +369,10 @@
  <id>org.jaggeryjs.modules.carbon.feature.group</id>
  <version>${jaggery.modules.version}</version>
  </feature>
+ <feature>
+ <id>org.jaggeryjs.modules.i18n.feature.group</id>
+ <version>${jaggery.modules.version}</version>
+ </feature>
  <feature>
  <id>org.jaggeryjs.modules.process.feature.group</id>
  <version>${jaggery.modules.version}</version>
@@ -445,6 +455,10 @@
  <id>org.wso2.carbon.identity.core.ui.feature.group</id>
  <version>${carbon.identity.version}</version>
  </feature>
+ <feature>
+ <id>org.wso2.carbon.identity.core.server.feature.group</id>
+ <version>${carbon.identity.version}</version>
+ </feature>
  <feature>
  <id>org.wso2.carbon.security.mgt.feature.group</id>
  <version>${carbon.identity.version}</version>
@@ -647,6 +661,10 @@
  <id>org.jaggeryjs.modules.ws.feature.group</id>
  <version>${jaggery.modules.version}</version>
  </feature>
+ <feature>
+ <id>org.jaggeryjs.modules.i18n.feature.group</id>
+ <version>${jaggery.modules.version}</version>
+ </feature>
 
  <feature>
  <id>org.wso2.carbon.webapp.mgt.server.feature.group</id>

diff --git a/pom.xml b/pom.xml
@@ -714,23 +714,23 @@
 
  <properties>
  <!--CEP versions-->
- <jaggery.version>0.11.0</jaggery.version>
- <jaggery.modules.version>1.4.2</jaggery.modules.version>
+ <jaggery.version>0.12.1</jaggery.version>
+ <jaggery.modules.version>1.5.0</jaggery.modules.version>
  <carbon.deployment.version>4.5.3</carbon.deployment.version>
  <carbon.commons.version>4.4.8</carbon.commons.version>
  <carbon.analytics-common.version>5.0.10-SNAPSHOT</carbon.analytics-common.version>
- <carbon.dashboards.version>1.0.7</carbon.dashboards.version>
- <carbon.identity.version>4.5.6</carbon.identity.version>
+ <carbon.dashboards.version>1.0.11-SNAPSHOT</carbon.dashboards.version>
+ <carbon.identity.version>5.0.7</carbon.identity.version>
  <carbon.registry.version>4.4.8</carbon.registry.version>
- <carbon.multitenancy.version>4.4.3</carbon.multitenancy.version>
+ <carbon.multitenancy.version>4.5.0</carbon.multitenancy.version>
  <carbon.metrics.version>1.2.0</carbon.metrics.version>
 
  <siddhi.version>3.0.5-SNAPSHOT</siddhi.version>
  <carbon.event-processing.version>2.0.12-SNAPSHOT</carbon.event-processing.version>
  <cep.version>4.0.1-SNAPSHOT</cep.version>
 
  <!-- Carbon kernel version-->
- <carbon.kernel.version>4.4.2</carbon.kernel.version>
+ <carbon.kernel.version>4.4.3</carbon.kernel.version>
  <!--<carbon.kernel.imp.pkg.version>[4.3.0, 4.4.0)</carbon.kernel.imp.pkg.version>-->
  <!--<carbon.kernel.registry.imp.pkg.version>[1.0.1, 2.0.0)</carbon.kernel.registry.imp.pkg.version>-->
  <test.framework.version>4.4.2</test.framework.version>