Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 95db1675d -> 54c08bda8
creating metadata feature Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2e512ebf Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2e512ebf Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2e512ebf Branch: refs/heads/4.0.0-grouping Commit: 2e512ebf2c6b23276c3add269d637a02459b520c Parents: eb37fa9 Author: Udara Liyanage <[email protected]> Authored: Wed Sep 24 17:51:56 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Wed Sep 24 20:39:07 2014 +0530 ---------------------------------------------------------------------- .../pom.xml | 102 +++++++++++++++++++ features/common/pom.xml | 37 +++++++ products/stratos/modules/p2-profile-gen/pom.xml | 29 +++++- 3 files changed, 164 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2e512ebf/features/common/org.apache.stratos.metadata.client.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/common/org.apache.stratos.metadata.client.feature/pom.xml b/features/common/org.apache.stratos.metadata.client.feature/pom.xml new file mode 100644 index 0000000..6a8402f --- /dev/null +++ b/features/common/org.apache.stratos.metadata.client.feature/pom.xml @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <parent> + <groupId>org.apache.stratos</groupId> + <artifactId>common.features</artifactId> + <version>4.1.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>org.apache.stratos.metadata.client.feature</artifactId> + <packaging>pom</packaging> + <name>Apache Stratos - Metadata client Feature</name> + <url>http://apache.org</url> + <description /> + + <dependencies> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>${gson2.version}</version> + </dependency> +<dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpasyncclient</artifactId> + <version>4.0-beta3</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient-osgi</artifactId> + <version>4.3.5</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore-osgi</artifactId> + <version>4.3.2</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore-nio</artifactId> + <version>4.2.4</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.wso2.maven</groupId> + <artifactId>carbon-p2-plugin</artifactId> + <version>${carbon.p2.plugin.version}</version> + <executions> + <execution> + <id>4-p2-feature-generation</id> + <phase>package</phase> + <goals> + <goal>p2-feature-gen</goal> + </goals> + <configuration> + <id>org.apache.stratos.metadata.client</id> + <propertiesFile>../../../etc/feature.properties</propertiesFile> + <adviceFile> + <properties> + <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef> + <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef> + </properties> + </adviceFile> + <bundles> + <bundleDef>org.apache.stratos:org.apache.stratos.metadata.client:${project.version}</bundleDef> + <bundleDef>com.google.code.gson:gson:${gson2.version}</bundleDef> + <bundleDef>org.apache.commons:commons-lang3:3.1</bundleDef> +<!-- + <bundleDef>org.apache.httpcomponents:httpclient-osgi:4.3.5</bundleDef> + <bundleDef>org.apache.httpcomponents:httpcore-osgi:4.3.2</bundleDef> +--> + </bundles> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/2e512ebf/features/common/pom.xml ---------------------------------------------------------------------- diff --git a/features/common/pom.xml b/features/common/pom.xml new file mode 100644 index 0000000..b2a4481 --- /dev/null +++ b/features/common/pom.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <parent> + <groupId>org.apache.stratos</groupId> + <artifactId>stratos-features-parent</artifactId> + <version>4.1.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>common.features</artifactId> + <packaging>pom</packaging> + <name>Apache Stratos - Metadata Client Module</name> + <url>http://apache.org</url> + + <modules> + <module>org.apache.stratos.metadata.client.feature</module> + </modules> +</project> + http://git-wip-us.apache.org/repos/asf/stratos/blob/2e512ebf/products/stratos/modules/p2-profile-gen/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml index 48161dc..91e9ed2 100644 --- a/products/stratos/modules/p2-profile-gen/pom.xml +++ b/products/stratos/modules/p2-profile-gen/pom.xml @@ -247,6 +247,8 @@ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.cassandra.mgt.feature:${carbon.platform.version}</featureArtifactDef> <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.cassandra.dataaccess.feature:${carbon.platform.version}</featureArtifactDef> <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.cassandra.common.feature:${carbon.platform.version}</featureArtifactDef> + <!-- Common features --> + <featureArtifactDef>org.apache.stratos:org.apache.stratos.metadata.client.feature:${project.version}</featureArtifactDef> </featureArtifacts> </configuration> </execution> @@ -313,6 +315,8 @@ </configuration> </execution> + + <execution> <id>p2 profile generation for sm</id> <phase>package</phase> @@ -449,6 +453,8 @@ </execution> + + <execution> <id>p2 profile generation for as</id> <phase>package</phase> @@ -500,14 +506,16 @@ <id>org.apache.stratos.metadataservice.feature.group</id> <version>${project.version}</version> </feature> - <feature> - <id>org.apache.stratos.metadataservice.feature.group</id> - <version>${project.version}</version> - </feature> + <feature> + <id>org.apache.stratos.metadata.client.feature.group</id> + <version>${project.version}</version> + </feature> </features> </configuration> </execution> + + <execution> <id>p2 profile generation for CC</id> <phase>package</phase> @@ -590,9 +598,16 @@ <id>org.apache.stratos.metadataservice.feature.group</id> <version>${project.version}</version> </feature> + <feature> + <id>org.apache.stratos.metadata.client.feature.group</id> + <version>${project.version}</version> + </feature> </features> </configuration> </execution> + + + <execution> <id>3-p2-profile-generation</id> <phase>package</phase> @@ -833,6 +848,12 @@ <id>org.apache.stratos.metadataservice.feature.group</id> <version>${project.version}</version> </feature> + <!-- Common features --> + <feature> + <id>org.apache.stratos.metadata.client.feature.group</id> + <version>${project.version}</version> + </feature> + </features> </configuration> </execution>
