From a2ffaf170d256fbfc7a36bc6a0641ed40ac335a1 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Sun, 4 Oct 2015 01:50:27 +0530 Subject: [PATCH] updated jaggery version and added ES IDP configs --- modules/distribution/pom.xml | 36 ++++----- modules/distribution/src/assembly/bin.xml | 69 +++--------------- .../conf/{ => identity}/sso-idp-config.xml | 19 ++--- .../conf/security/sso-idp-config.xml | 0 .../repository/database/WSO2IDENTITY_DB.h2.db | Bin 2109440 -> 0 bytes pom.xml | 18 ++--- 6 files changed, 43 insertions(+), 99 deletions(-) rename modules/distribution/src/repository/conf/{ => identity}/sso-idp-config.xml (66%) mode change 100755 => 100644 modules/distribution/src/repository/conf/security/sso-idp-config.xml delete mode 100644 modules/distribution/src/repository/database/WSO2IDENTITY_DB.h2.db diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 9b573329..08dc45ba 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -227,7 +227,7 @@ - + @@ -347,31 +347,31 @@ clean_target install + + + + + + + + + + + + + + + - - - - + - - <!––> - + - - - - - - - - - - run diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 2275bfb3..29e26584 100644 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -68,9 +68,6 @@ - **/lib/endorsed/xalan*.jar - **/lib/endorsed/xercesImpl*.jar - **/lib/endorsed/xml-apis*.jar **/conf/thrift-authentication.xml **/repository/components/features/org.wso2.carbon.apimgt.store_${apim.feature.version}/store/** **/repository/components/features/org.wso2.carbon.apimgt.store_${apim.feature.version}/admin-dashboard/** @@ -78,6 +75,7 @@ **/repository/components/features/org.wso2.carbon.apimgt.publisher_${apim.feature.version}/publisher/** **/repository/components/features/org.wso2.carbon.apimgt.core_${apim.feature.version}/libs/** + **/repository/components/plugins/asm-all_4.1.0.wso2v1.jar @@ -128,10 +126,6 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.platform.version}/repository/conf/identity/ ${pom.artifactId}-${pom.version}/repository/conf/identity - - **/identity.xml - **/entitlement.properties - @@ -209,7 +203,7 @@ ${pom.artifactId}-${pom.version}/repository/conf **/api-manager.xml - **/sso-idp-config.xml + @@ -889,36 +883,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/email/email-admin-config.xml @@ -938,14 +902,6 @@ 644 - - - - - - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/social.xml @@ -964,16 +920,6 @@ 644 - - - - - - - - - - @@ -1087,18 +1033,23 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/analytics.war ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps - - 644 src/repository/conf/synapse.properties - ${pom.artifactId}-${pom.version}/repository/conf + ${pom.artifactId}-${pom.version}/repository/conf/ synapse.properties true + + + src/repository/conf/identity/sso-idp-config.xml + ${pom.artifactId}-${pom.version}/repository/conf/identity/ + true + 644 + diff --git a/modules/distribution/src/repository/conf/sso-idp-config.xml b/modules/distribution/src/repository/conf/identity/sso-idp-config.xml similarity index 66% rename from modules/distribution/src/repository/conf/sso-idp-config.xml rename to modules/distribution/src/repository/conf/identity/sso-idp-config.xml index 99f61be9..f084edd9 100755 --- a/modules/distribution/src/repository/conf/sso-idp-config.xml +++ b/modules/distribution/src/repository/conf/identity/sso-idp-config.xml @@ -20,33 +20,26 @@ store - https://localhost:9443/store/acs + https://localhost:9443/store/acs + https://localhost:9443/store/acs true /store/login.jag social + https://localhost:9443/store/acs + https://localhost:9443/social/acs https://localhost:9443/social/acs true /social/login publisher + https://localhost:9443/store/acs + https://localhost:9443/publisher/acs https://localhost:9443/publisher/acs true /publisher/controllers/login.jag - - - emm - https://localhost:9443/emm/acs - true - /emm/login - - - mam - https://localhost:9443/mam/acs - true - /mam/login diff --git a/modules/distribution/src/repository/conf/security/sso-idp-config.xml b/modules/distribution/src/repository/conf/security/sso-idp-config.xml old mode 100755 new mode 100644 diff --git a/modules/distribution/src/repository/database/WSO2IDENTITY_DB.h2.db b/modules/distribution/src/repository/database/WSO2IDENTITY_DB.h2.db deleted file mode 100644 index 16a8b5c818af57b429541192c3648459feb400bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2109440 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 0.12.0-M1 - 1.4.0 - 1.4.0 - 1.4.0 - 1.4.0 + 1.5.0-M1 + 1.5.0-M1 + 1.5.0-M1 + 1.5.0-M1 - 1.4.0 - 1.4.0 - 1.4.0 + 1.5.0-M1 + 1.5.0-M1 + 1.5.0-M1 - 2.3.8-SNAPSHOT - 2.3.8-SNAPSHOT + 2.3.9-SNAPSHOT + 2.3.9-SNAPSHOT 1.0.0