You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2013/07/16 08:55:28 UTC
git commit: Stratos manager gapp feature refactor
Updated Branches:
refs/heads/master a5b15f102 -> b61806980
Stratos manager gapp feature refactor
Signed-off-by: Lakmal Warusawithana <la...@wso2.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b6180698
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b6180698
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b6180698
Branch: refs/heads/master
Commit: b61806980ee6cc7c48f5ee7dbd3fe30657ce0984
Parents: a5b15f1
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Jul 16 12:03:18 2013 +0530
Committer: Lakmal Warusawithana <la...@wso2.com>
Committed: Tue Jul 16 12:25:05 2013 +0530
----------------------------------------------------------------------
.../org.apache.stratos.gapp.feature/pom.xml | 62 ++++++++++++++
.../pom.xml | 63 ++++++++++++++
.../org.apache.stratos.gapp.ui.feature/pom.xml | 88 ++++++++++++++++++++
.../2.1.0/pom.xml | 63 --------------
.../2.1.0/pom.xml | 63 --------------
.../2.1.0/pom.xml | 86 -------------------
features/manager/gapp/pom.xml | 16 ++--
7 files changed, 221 insertions(+), 220 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b6180698/features/manager/gapp/org.apache.stratos.gapp.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/gapp/org.apache.stratos.gapp.feature/pom.xml b/features/manager/gapp/org.apache.stratos.gapp.feature/pom.xml
new file mode 100644
index 0000000..f976dba
--- /dev/null
+++ b/features/manager/gapp/org.apache.stratos.gapp.feature/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ Licensed 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>gapp-feature</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.stratos.gapp.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Stratos - GApp Composite Feature</name>
+ <url>http://wso2.org</url>
+
+ <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.gapp</id>
+ <propertiesFile>../../../../etc/feature.properties</propertiesFile>
+ <includedFeatures>
+ <includedFeatureDef>org.apache.stratos:org.apache.stratos.gapp.server.feature:${apache.stratos.version}</includedFeatureDef>
+ <includedFeatureDef>org.apache.stratos:org.apache.stratos.gapp.ui.feature:${apache.stratos.version}</includedFeatureDef>
+ </includedFeatures>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b6180698/features/manager/gapp/org.apache.stratos.gapp.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/gapp/org.apache.stratos.gapp.server.feature/pom.xml b/features/manager/gapp/org.apache.stratos.gapp.server.feature/pom.xml
new file mode 100644
index 0000000..7282323
--- /dev/null
+++ b/features/manager/gapp/org.apache.stratos.gapp.server.feature/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ Licensed 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>gapp-feature</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.stratos.stratos.gapp.server.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Stratos - GApp Server Feature</name>
+ <url>http://apache.org</url>
+
+ <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.stratos.gapp.server</id>
+ <propertiesFile>../../../../etc/feature.properties</propertiesFile>
+ <importFeatures>
+ <importFeatureDef>org.wso2.carbon.identity.core.server:${carbon.version}</importFeatureDef>
+ <importFeatureDef>org.wso2.carbon.identity.relying.party.server:${carbon.version}</importFeatureDef>
+ </importFeatures>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b6180698/features/manager/gapp/org.apache.stratos.gapp.ui.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/gapp/org.apache.stratos.gapp.ui.feature/pom.xml b/features/manager/gapp/org.apache.stratos.gapp.ui.feature/pom.xml
new file mode 100644
index 0000000..08527ff
--- /dev/null
+++ b/features/manager/gapp/org.apache.stratos.gapp.ui.feature/pom.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ Licensed 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>gapp-feature</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.stratos.gapp.ui.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Stratos - GApp UI Feature</name>
+ <url>http://apache.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.gapp.registration.ui</artifactId>
+ <version>${stratos.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.common.stub</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.tenant.register.gapp.stub</artifactId>
+ <version>${apache.stratos.version}</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.gapp.ui</id>
+ <propertiesFile>../../../../etc/feature.properties</propertiesFile>
+ <bundles>
+ <bundleDef>org.wso2.carbon:org.wso2.carbon.gapp.registration.ui</bundleDef>
+ <bundleDef>org.apache.stratos:org.apache.stratos.common.stub</bundleDef>
+ <bundleDef>org.apache.stratos:org.apache.stratos.tenant.register.gapp.stub</bundleDef>
+ </bundles>
+ <importFeatures>
+ <importFeatureDef>org.wso2.carbon.identity.relying.party.ui:${carbon.version}</importFeatureDef>
+ <importFeatureDef>org.wso2.carbon.identity.core.ui:${carbon.version}</importFeatureDef>
+ </importFeatures>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <stratos.version>2.1.0</stratos.version>
+ </properties>
+</project>
+
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b6180698/features/manager/gapp/org.wso2.carbon.stratos.gapp.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/gapp/org.wso2.carbon.stratos.gapp.feature/2.1.0/pom.xml b/features/manager/gapp/org.wso2.carbon.stratos.gapp.feature/2.1.0/pom.xml
deleted file mode 100644
index 18f918d..0000000
--- a/features/manager/gapp/org.wso2.carbon.stratos.gapp.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed 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.wso2.carbon</groupId>
- <artifactId>gapp-feature</artifactId>
- <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.stratos.gapp.feature</artifactId>
- <packaging>pom</packaging>
- <name>WSO2 Stratos - GApp Composite Feature</name>
- <url>http://wso2.org</url>
-
- <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.wso2.carbon.stratos.gapp</id>
- <propertiesFile>../../../../etc/feature.properties</propertiesFile>
- <includedFeatures>
- <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.stratos.gapp.server.feature:${stratos.version}</includedFeatureDef>
- <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.stratos.gapp.ui.feature:${stratos.version}</includedFeatureDef>
- </includedFeatures>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b6180698/features/manager/gapp/org.wso2.carbon.stratos.gapp.server.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/gapp/org.wso2.carbon.stratos.gapp.server.feature/2.1.0/pom.xml b/features/manager/gapp/org.wso2.carbon.stratos.gapp.server.feature/2.1.0/pom.xml
deleted file mode 100644
index 4c59b2f..0000000
--- a/features/manager/gapp/org.wso2.carbon.stratos.gapp.server.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed 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.wso2.carbon</groupId>
- <artifactId>gapp-feature</artifactId>
- <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.stratos.gapp.server.feature</artifactId>
- <packaging>pom</packaging>
- <name>WSO2 Stratos - GApp Server Feature</name>
- <url>http://wso2.org</url>
-
- <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.wso2.carbon.stratos.gapp.server</id>
- <propertiesFile>../../../../etc/feature.properties</propertiesFile>
- <importFeatures>
- <importFeatureDef>org.wso2.carbon.identity.core.server:${carbon.version}</importFeatureDef>
- <importFeatureDef>org.wso2.carbon.identity.relying.party.server:${carbon.version}</importFeatureDef>
- </importFeatures>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b6180698/features/manager/gapp/org.wso2.carbon.stratos.gapp.ui.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/gapp/org.wso2.carbon.stratos.gapp.ui.feature/2.1.0/pom.xml b/features/manager/gapp/org.wso2.carbon.stratos.gapp.ui.feature/2.1.0/pom.xml
deleted file mode 100644
index 3bb4102..0000000
--- a/features/manager/gapp/org.wso2.carbon.stratos.gapp.ui.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed 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.wso2.carbon</groupId>
- <artifactId>gapp-feature</artifactId>
- <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.stratos.gapp.ui.feature</artifactId>
- <packaging>pom</packaging>
- <name>WSO2 Stratos - GApp UI Feature</name>
- <url>http://wso2.org</url>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.gapp.registration.ui</artifactId>
- <version>${stratos.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.stratos.common.stub</artifactId>
- <version>${carbon.platform.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.tenant.register.gapp.stub</artifactId>
- <version>${carbon.platform.version}</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.wso2.carbon.stratos.gapp.ui</id>
- <propertiesFile>../../../../etc/feature.properties</propertiesFile>
- <bundles>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.gapp.registration.ui</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.stratos.common.stub</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.register.gapp.stub</bundleDef>
- </bundles>
- <importFeatures>
- <importFeatureDef>org.wso2.carbon.identity.relying.party.ui:${carbon.version}</importFeatureDef>
- <importFeatureDef>org.wso2.carbon.identity.core.ui:${carbon.version}</importFeatureDef>
- </importFeatures>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b6180698/features/manager/gapp/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/gapp/pom.xml b/features/manager/gapp/pom.xml
index 377c2a3..7a6ffc3 100644
--- a/features/manager/gapp/pom.xml
+++ b/features/manager/gapp/pom.xml
@@ -20,21 +20,21 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>stratos-features</artifactId>
- <version>2.1.0</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>stratos-features-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>gapp-feature</artifactId>
<packaging>pom</packaging>
- <name>WSO2 Stratos - GApp Feature Aggregator Module</name>
- <url>http://wso2.org</url>
+ <name>Apache Stratos - GApp Feature Aggregator Module</name>
+ <url>http://apache.org</url>
<modules>
- <module>org.wso2.carbon.stratos.gapp.server.feature/2.1.0</module>
- <module>org.wso2.carbon.stratos.gapp.ui.feature/2.1.0</module>
- <module>org.wso2.carbon.stratos.gapp.feature/2.1.0</module>
+ <module>org.apache.stratos.gapp.server.feature</module>
+ <module>org.apache.stratos.gapp.ui.feature</module>
+ <module>org.apache.stratos.gapp.feature</module>
</modules>
</project>