Merge remote-tracking branch 'upstream/master'

merge-requests/1/head
manoj 10 years ago
commit 40489f986d

@ -35,10 +35,10 @@
<description>WSO2 Mobile Device Manager (MDM) Distribution</description> <description>WSO2 Mobile Device Manager (MDM) Distribution</description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.h2database.wso2</groupId> <groupId>com.h2database.wso2</groupId>
<artifactId>h2-database-engine</artifactId> <artifactId>h2-database-engine</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@ -98,7 +98,7 @@
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<!--<version>${maven-antrun-plugin.version}</version>--> <!--<version>${maven-antrun-plugin.version}</version>-->
<executions> <executions>
<execution> <execution>
<!-- Creating Device Management schema --> <!-- Creating Device Management schema -->
<id>create-device-mgt-schema</id> <id>create-device-mgt-schema</id>
<phase>package</phase> <phase>package</phase>
@ -125,14 +125,15 @@
<classpath refid="maven.compile.classpath"/> <classpath refid="maven.compile.classpath"/>
<classpath refid="maven.runtime.classpath"/> <classpath refid="maven.runtime.classpath"/>
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/h2.sql"/> <fileset
file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/h2.sql"/>
</sql> </sql>
<echo <echo
message="##################### END ####################"/> message="##################### END ####################"/>
</tasks> </tasks>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<!-- Creating IDP Management schema --> <!-- Creating IDP Management schema -->
<id>create-idp-mgt-schema</id> <id>create-idp-mgt-schema</id>
<phase>package</phase> <phase>package</phase>
@ -159,14 +160,15 @@
<classpath refid="maven.compile.classpath"/> <classpath refid="maven.compile.classpath"/>
<classpath refid="maven.runtime.classpath"/> <classpath refid="maven.runtime.classpath"/>
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/application-mgt/h2.sql"/> <fileset
file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/application-mgt/h2.sql"/>
</sql> </sql>
<echo <echo
message="##################### END ####################"/> message="##################### END ####################"/>
</tasks> </tasks>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<!-- Creating API Management schema --> <!-- Creating API Management schema -->
<id>create-api-mgt-schema</id> <id>create-api-mgt-schema</id>
<phase>package</phase> <phase>package</phase>
@ -193,7 +195,8 @@
<classpath refid="maven.compile.classpath"/> <classpath refid="maven.compile.classpath"/>
<classpath refid="maven.runtime.classpath"/> <classpath refid="maven.runtime.classpath"/>
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt/h2.sql"/> <fileset
file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt/h2.sql"/>
</sql> </sql>
<echo <echo
message="##################### END ####################"/> message="##################### END ####################"/>

@ -214,25 +214,59 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.server.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.server.feature:${carbon.platform.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.um.ws.service.client.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.um.ws.service.client.feature:${carbon.platform.version}
</featureArtifactDef> </featureArtifactDef>
<!-- registry features --> <!-- registry features -->
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.platform.version}</featureArtifactDef> <featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.core.server.feature:${carbon.platform.version}</featureArtifactDef> org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.platform.version}
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.ui.menu.feature:${carbon.platform.version}</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.resource.properties.feature:${carbon.platform.version}</featureArtifactDef> <featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.associations.dependencies.feature:${carbon.platform.version}</featureArtifactDef> org.wso2.carbon:org.wso2.carbon.registry.core.server.feature:${carbon.platform.version}
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.community.features.feature:${carbon.platform.version}</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.community.features.server.feature:${carbon.platform.version}</featureArtifactDef> <featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.extensions.feature:${carbon.platform.version}</featureArtifactDef> org.wso2.carbon:org.wso2.carbon.registry.ui.menu.feature:${carbon.platform.version}
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.ws.feature:${carbon.platform.version}</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.ui.menu.governance.feature:${carbon.platform.version}</featureArtifactDef> <featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.contentsearch.feature:${carbon.platform.version}</featureArtifactDef> org.wso2.carbon:org.wso2.carbon.registry.resource.properties.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.associations.dependencies.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.community.features.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.community.features.server.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.extensions.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.ws.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.ui.menu.governance.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.contentsearch.feature:${carbon.platform.version}
</featureArtifactDef>
<!--Governance Feature--> <!--Governance Feature-->
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.governance.metadata.feature:${carbon.platform.version}</featureArtifactDef> <featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.platform.version}</featureArtifactDef> org.wso2.carbon:org.wso2.carbon.governance.metadata.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.self.registration.server.feature:${carbon.platform.version}
</featureArtifactDef>
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
</execution> </execution>
@ -369,7 +403,9 @@
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id> <id>
org.wso2.carbon.identity.application.authentication.framework.server.feature.group
</id>
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
@ -393,6 +429,12 @@
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.identity.self.registration.server.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<!-- registry features --> <!-- registry features -->
<feature> <feature>
@ -448,10 +490,10 @@
<id>org.wso2.carbon.governance.lifecycle.management.feature.group</id> <id>org.wso2.carbon.governance.lifecycle.management.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.um.ws.service.client.feature.group</id> <id>org.wso2.carbon.um.ws.service.client.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature> </feature>
</features> </features>
</configuration> </configuration>
</execution> </execution>

Loading…
Cancel
Save