diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index d596dfa7..7c01821c 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -244,10 +244,6 @@ - - - - diff --git a/modules/distribution/repository/resources/jaggery/config/designer.json b/modules/distribution/repository/resources/jaggery/config/designer.json new file mode 100644 index 00000000..6acd9d2f --- /dev/null +++ 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 index 33469050..5a166ccd 100644 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -667,6 +667,24 @@ 644 + + + repository/resources/jaggery/config/designer.json + ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal/configs + + true + 644 + + + + + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity.xml + + ${pom.artifactId}-${pom.version}/repository/conf/identity + 644 + + diff --git a/modules/p2-profile-gen/carbon.product b/modules/p2-profile-gen/carbon.product index 68334b24..d57a7d3e 100644 --- a/modules/p2-profile-gen/carbon.product +++ b/modules/p2-profile-gen/carbon.product @@ -1,7 +1,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index ef325a1a..1b5a6c54 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -118,6 +118,9 @@ org.jaggeryjs.modules:carbon.feature:${jaggery.modules.version} + + org.jaggeryjs.modules:i18n.feature:${jaggery.modules.version} + org.jaggeryjs.modules:process.feature:${jaggery.modules.version} @@ -179,6 +182,9 @@ org.wso2.carbon.identity:org.wso2.carbon.identity.core.ui.feature:${carbon.identity.version} + + org.wso2.carbon.identity:org.wso2.carbon.identity.core.server.feature:${carbon.identity.version} + org.wso2.carbon.identity:org.wso2.carbon.security.mgt.feature:${carbon.identity.version} @@ -363,6 +369,10 @@ org.jaggeryjs.modules.carbon.feature.group ${jaggery.modules.version} + + org.jaggeryjs.modules.i18n.feature.group + ${jaggery.modules.version} + org.jaggeryjs.modules.process.feature.group ${jaggery.modules.version} @@ -445,6 +455,10 @@ org.wso2.carbon.identity.core.ui.feature.group ${carbon.identity.version} + + org.wso2.carbon.identity.core.server.feature.group + ${carbon.identity.version} + org.wso2.carbon.security.mgt.feature.group ${carbon.identity.version} @@ -647,6 +661,10 @@ org.jaggeryjs.modules.ws.feature.group ${jaggery.modules.version} + + org.jaggeryjs.modules.i18n.feature.group + ${jaggery.modules.version} + org.wso2.carbon.webapp.mgt.server.feature.group diff --git a/pom.xml b/pom.xml index df3bd1b0..3f5c2f7c 100644 --- a/pom.xml +++ b/pom.xml @@ -714,15 +714,15 @@ - 0.11.0 - 1.4.2 + 0.12.1 + 1.5.0 4.5.3 4.4.8 5.0.10-SNAPSHOT - 1.0.7 - 4.5.6 + 1.0.11-SNAPSHOT + 5.0.7 4.4.8 - 4.4.3 + 4.5.0 1.2.0 3.0.5-SNAPSHOT @@ -730,7 +730,7 @@ 4.0.1-SNAPSHOT - 4.4.2 + 4.4.3 4.4.2