community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated jaggery version and added ES IDP configs

Browse Source
merge-requests/1/head
ayyoob 9 years ago
parent fc4e53de99
commit a2ffaf170d
6 changed files with 43 additions and 99 deletions
Show Stats Download Patch File Download Diff File

36
modules/distribution/pom.xml
Unescape View File

@ -227,7 +227,7 @@
</concat>
<delete file="target/wso2iot-${project.version}.zip"/>
<delete dir="${tempdir}"/>
<!--<delete dir="${tempdir}"/>-->
</tasks>
</configuration>
</execution>
@ -347,31 +347,31 @@
<id>clean_target</id>
<phase>install</phase>
<configuration>
<!--<tasks>-->
<!--<delete dir="target/jars"/>-->
<!--<delete dir="target/*.xml"/>-->
<!--<delete dir="target/archive-tmp"/>-->
<!--<delete dir="target/dependency-maven-plugin-markers"/>-->
<!--<delete dir="target/maven-archiver"/>-->
<!--<delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>-->
<!--<delete file="target/wso2iot-${project.version}.jar"/>-->
<!--<delete dir="target/sources"/>-->
<!--<delete dir="target/site"/>-->
<!--<delete dir="target/shindig" />-->
<!--<delete dir="target/jaxwebapps"/>-->
<!--</tasks>-->
<tasks>
<delete dir="target/jars"/>
<delete dir="target/*.xml"/>
<delete dir="target/archive-tmp"/>
<delete dir="target/dependency-maven-plugin-markers"/>
<delete dir="target/maven-archiver"/>
<delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
<delete file="target/wso2iot-${project.version}.jar"/>
<delete dir="target/wso2carbon-core-${carbon.platform.version}"/>
<delete dir="target/sources"/>
<delete dir="target/site"/>
<delete dir="target/antrun"/>
<delete dir="src/site"/>
&lt;!&ndash;<delete dir="target/shindig" />&ndash;&gt;
<delete dir="target/jaxwebapps"/>
<delete dir="target/antrun"/>
</tasks>
<!-- <tasks>-->
<!-- <delete dir="target/archive-tmp"/>-->
<!-- <delete dir="target/dependency-maven-plugin-markers"/>-->
<!-- <delete dir="target/maven-archiver"/>-->
<!-- <delete dir="target/wso2carbon-core-${carbon.platform.version}"/>-->
<!-- <delete dir="target/sources"/>-->
<!-- <delete dir="target/site"/>-->
<!-- <delete dir="src/site"/>-->
<!-- </tasks>-->
</configuration>
<goals>
<goal>run</goal>

69
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -68,9 +68,6 @@
<!--<exclude>**/repository/components/plugins/compass_2.0.1.wso2v2.jar</exclude>-->
<!--<exclude>**/repository/components/plugins/poi_3.9.0.wso2v1.jar</exclude>-->
<exclude>**/lib/endorsed/xalan*.jar</exclude>
<exclude>**/lib/endorsed/xercesImpl*.jar</exclude>
<exclude>**/lib/endorsed/xml-apis*.jar</exclude>
<exclude>**/conf/thrift-authentication.xml</exclude>
<exclude>**/repository/components/features/org.wso2.carbon.apimgt.store_${apim.feature.version}/store/**</exclude>
<exclude>**/repository/components/features/org.wso2.carbon.apimgt.store_${apim.feature.version}/admin-dashboard/**</exclude>
@ -78,6 +75,7 @@
<exclude>**/repository/components/features/org.wso2.carbon.apimgt.publisher_${apim.feature.version}/publisher/**</exclude>
<exclude>**/repository/components/features/org.wso2.carbon.apimgt.core_${apim.feature.version}/libs/**</exclude>
<!--below dependency fails synapse startup-->
<exclude>**/repository/components/plugins/asm-all_4.1.0.wso2v1.jar</exclude>
@ -128,10 +126,6 @@
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.platform.version}/repository/conf/identity/</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
<includes>
<include>**/identity.xml</include>
<include>**/entitlement.properties</include>
</includes>
</fileSet>
@ -209,7 +203,7 @@
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<includes>
<include>**/api-manager.xml</include>
<include>**/sso-idp-config.xml</include>
<!--<include>**/sso-idp-config.xml</include>-->
</includes>
</fileSet>
<fileSet>
@ -889,36 +883,6 @@
<!--========================================================================================================-->
<!-- Enterprise Store Features -->
<!--============ Added with ES Features ===============-->
<!--<file>-->
<!--<source>src/repository/conf/registry.xml</source>-->
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>-->
<!--<filtered>true</filtered>-->
<!--</file>-->
<!--&lt;!&ndash;============ Added with ES Features ===============&ndash;&gt;-->
<!--<file>-->
<!--<source>src/repository/conf/multitenancy/cloud-services-desc.xml</source>-->
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy/</outputDirectory>-->
<!--<filtered>true</filtered>-->
<!--</file>-->
<!--&lt;!&ndash;============ Added with ES Features ===============&ndash;&gt;-->
<!--<file>-->
<!--<source>-->
<!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity-mgt.properties-->
<!--</source>-->
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>-->
<!--<filtered>true</filtered>-->
<!--<fileMode>644</fileMode>-->
<!--</file>-->
<!--&lt;!&ndash;============ Added with ES Features ===============&ndash;&gt;-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/email/email-admin-config.xml
@ -938,14 +902,6 @@
<fileMode>644</fileMode>
</file>
<!--&lt;!&ndash;============ Added with ES Features ===============&ndash;&gt;-->
<!--<file>-->
<!--<source>src/repository/database/WSO2IDENTITY_DB.h2.db</source>-->
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
<!--<fileMode>644</fileMode>-->
<!--</file>-->
<!--============ Added with ES Features ===============-->
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/social.xml
</source>
@ -964,16 +920,6 @@
<fileMode>644</fileMode>
</file>
<!--============ Added with ES Features ===============-->
<!-- Removed with version 2.3.5-SNAPSHOT-->
<!--<file>-->
<!--<source>-->
<!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/association-config.xml-->
<!--</source>-->
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>-->
<!--<filtered>true</filtered>-->
<!--<fileMode>644</fileMode>-->
<!--</file>-->
<!--============ Added with ES Features ===============-->
<file>
@ -1087,18 +1033,23 @@
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/analytics.war
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
<!--commented since this tag causes issues in maven assembly plugin when copying zip formats-->
<!--filtered>true</filtered-->
<fileMode>644</fileMode>
</file>
<file>
<source>src/repository/conf/synapse.properties</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
<destName>synapse.properties</destName>
<filtered>true</filtered>
</file>
<!--copy idp config of es-->
<file>
<source>src/repository/conf/identity/sso-idp-config.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>

19
modules/distribution/src/repository/conf/sso-idp-config.xml → modules/distribution/src/repository/conf/identity/sso-idp-config.xml
Unescape View File

@ -20,33 +20,26 @@
<ServiceProviders>
<ServiceProvider>
<Issuer>store</Issuer>
<AssertionConsumerService>https://localhost:9443/store/acs</AssertionConsumerService>
<AssertionConsumerServiceURLs><AssertionConsumerServiceURL>https://localhost:9443/store/acs</AssertionConsumerServiceURL></AssertionConsumerServiceURLs>
<DefaultAssertionConsumerServiceURL>https://localhost:9443/store/acs</DefaultAssertionConsumerServiceURL>
<SignResponse>true</SignResponse>
<CustomLoginPage>/store/login.jag</CustomLoginPage>
</ServiceProvider>
<ServiceProvider>
<Issuer>social</Issuer>
<AssertionConsumerServiceURLs><AssertionConsumerServiceURL>https://localhost:9443/store/acs</AssertionConsumerServiceURL></AssertionConsumerServiceURLs>
<DefaultAssertionConsumerServiceURL>https://localhost:9443/social/acs</DefaultAssertionConsumerServiceURL>
<AssertionConsumerService>https://localhost:9443/social/acs</AssertionConsumerService>
<SignResponse>true</SignResponse>
<CustomLoginPage>/social/login</CustomLoginPage>
</ServiceProvider>
<ServiceProvider>
<Issuer>publisher</Issuer>
<AssertionConsumerServiceURLs><AssertionConsumerServiceURL>https://localhost:9443/store/acs</AssertionConsumerServiceURL></AssertionConsumerServiceURLs>
<DefaultAssertionConsumerServiceURL>https://localhost:9443/publisher/acs</DefaultAssertionConsumerServiceURL>
<AssertionConsumerService>https://localhost:9443/publisher/acs</AssertionConsumerService>
<SignResponse>true</SignResponse>
<CustomLoginPage>/publisher/controllers/login.jag</CustomLoginPage>
</ServiceProvider>
<ServiceProvider>
<Issuer>emm</Issuer>
<AssertionConsumerService>https://localhost:9443/emm/acs</AssertionConsumerService>
<SignResponse>true</SignResponse>
<CustomLoginPage>/emm/login</CustomLoginPage>
</ServiceProvider>
<ServiceProvider>
<Issuer>mam</Issuer>
<AssertionConsumerService>https://localhost:9443/mam/acs</AssertionConsumerService>
<SignResponse>true</SignResponse>
<CustomLoginPage>/mam/login</CustomLoginPage>
</ServiceProvider>
</ServiceProviders>
</SSOIdentityProviderConfig>

0
modules/distribution/src/repository/conf/security/sso-idp-config.xml
Unescape View File

BIN
modules/distribution/src/repository/database/WSO2IDENTITY_DB.h2.db
View File

Binary file not shown.

18
pom.xml
Unescape View File

@ -812,19 +812,19 @@
<!--Jaggery -->
<jaggery.version>0.12.0-M1</jaggery.version>
<jaggery.extensions.version>1.4.0</jaggery.extensions.version>
<jaggery.extensions.sso.version>1.4.0</jaggery.extensions.sso.version>
<jaggery.extensions.carbon.version>1.4.0</jaggery.extensions.carbon.version>
<jaggery.extensions.test.version>1.4.0</jaggery.extensions.test.version>
<jaggery.extensions.version>1.5.0-M1</jaggery.extensions.version>
<jaggery.extensions.sso.version>1.5.0-M1</jaggery.extensions.sso.version>
<jaggery.extensions.carbon.version>1.5.0-M1</jaggery.extensions.carbon.version>
<jaggery.extensions.test.version>1.5.0-M1</jaggery.extensions.test.version>
<!--Additional Jaggery Stuff-->
<caramel.feature.version>1.4.0</caramel.feature.version>
<handlebars.feature.version>1.4.0</handlebars.feature.version>
<markdown.feature.version>1.4.0</markdown.feature.version>
<caramel.feature.version>1.5.0-M1</caramel.feature.version>
<handlebars.feature.version>1.5.0-M1</handlebars.feature.version>
<markdown.feature.version>1.5.0-M1</markdown.feature.version>
<!-- Store Features -->
<carbon.store.version>2.3.8-SNAPSHOT</carbon.store.version>
<carbon.social.version>2.3.8-SNAPSHOT</carbon.social.version>
<carbon.store.version>2.3.9-SNAPSHOT</carbon.store.version>
<carbon.social.version>2.3.9-SNAPSHOT</carbon.social.version>
<!-- Additional Stuff from ES Features -->
<carbon.dashboards.version>1.0.0</carbon.dashboards.version>

Write Preview
Loading…
Cancel
Save