You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/07/15 18:38:23 UTC
git commit: committing stratos manager throttling features
Updated Branches:
refs/heads/master 77eb0844f -> 7b6e51cbf
committing stratos manager throttling features
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7b6e51cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7b6e51cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7b6e51cb
Branch: refs/heads/master
Commit: 7b6e51cbf533679872838732cebe83cc69774063
Parents: 77eb084
Author: Isuru <is...@wso2.com>
Authored: Mon Jul 15 22:07:50 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Mon Jul 15 22:07:50 2013 +0530
----------------------------------------------------------------------
features/manager/pom.xml | 44 +++++-----
.../pom.xml | 79 +++++++++++++++++
.../pom.xml | 91 ++++++++++++++++++++
.../2.1.0/pom.xml | 78 -----------------
.../2.1.0/pom.xml | 91 --------------------
features/manager/throttling/pom.xml | 40 +++++----
6 files changed, 214 insertions(+), 209 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7b6e51cb/features/manager/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/pom.xml b/features/manager/pom.xml
index 73de878..df0ad22 100644
--- a/features/manager/pom.xml
+++ b/features/manager/pom.xml
@@ -1,18 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (c) 2009-2011, 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.
+ 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"
@@ -20,19 +23,18 @@
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>carbon-features</artifactId>
- <version>4.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>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>stratos-features</artifactId>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>stratos-manager-features</artifactId>
<packaging>pom</packaging>
- <version>2.1.0</version>
- <name>WSO2 Stratos - Features</name>
+ <name>Apache Stratos - Manager Features Aggregator Module</name>
<description>features</description>
- <url>http://wso2.com</url>
+ <url>http://apache.org</url>
<modules>
<module>common</module>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7b6e51cb/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml b/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml
new file mode 100644
index 0000000..dc63784
--- /dev/null
+++ b/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml
@@ -0,0 +1,79 @@
+<?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>throttling-feature</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.stratos.throttling.agent.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>WSO2 Stratos - Throttling Agent Feature</name>
+ <url>http://apache.org</url>
+ <description>This feature contains the bundles required for throttle resource usage</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.throttling.agent</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>p2-feature-generation</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-feature-gen</goal>
+ </goals>
+ <configuration>
+ <id>org.wso2.carbon.stratos.throttling.agent</id>
+ <propertiesFile>../../../../etc/feature.properties</propertiesFile>
+ <adviceFile>
+ <properties>
+ <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef>
+ <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
+ </properties>
+ </adviceFile>
+ <bundles>
+ <bundleDef>org.apache.stratos:org.apache.stratos.throttling.agent:${apache.stratos.version}</bundleDef>
+ <bundleDef>org.apache.stratos:org.apache.stratos.throttling.agent.stub:${apache.stratos.version}</bundleDef>
+ </bundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7b6e51cb/features/manager/throttling/org.apache.stratos.throttling.manager.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/throttling/org.apache.stratos.throttling.manager.feature/pom.xml b/features/manager/throttling/org.apache.stratos.throttling.manager.feature/pom.xml
new file mode 100644
index 0000000..2c87ca1
--- /dev/null
+++ b/features/manager/throttling/org.apache.stratos.throttling.manager.feature/pom.xml
@@ -0,0 +1,91 @@
+<?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>throttling-feature</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.wso2.carbon.stratos.throttling.manager.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Stratos - Throttling Manager Feature</name>
+ <url>http://apache.org</url>
+ <description>This feature contains the bundles required for throttling rule excecution, update and controll throttling process</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.registry.common</artifactId>
+ <version>${wso2carbon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.throttling.manager</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.throttling.ui</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>p2-feature-generation</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-feature-gen</goal>
+ </goals>
+ <configuration>
+ <id>org.wso2.carbon.stratos.throttling.manager</id>
+ <propertiesFile>../../../../etc/feature.properties</propertiesFile>
+ <adviceFile>
+ <properties>
+ <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef>
+ <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
+ </properties>
+ </adviceFile>
+ <bundles>
+ <bundleDef>org.apache.stratos:org.apache.stratos.throttling.manager:${apache.stratos.version}</bundleDef>
+ <bundleDef>org.apache.stratos:org.apache.stratos.throttling.ui:${apache.stratos.version}</bundleDef> <bundleDef>org.apache.stratos:org.apache.stratos.throttling.stub:${apache.stratos.version}</bundleDef>
+ </bundles>
+ <!--importFeatures>
+ <importFeatureDef>org.wso2.carbon.stratos.common:${wso2carbon.version}</importFeatureDef>
+ </importFeatures-->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7b6e51cb/features/manager/throttling/org.wso2.carbon.stratos.throttling.agent.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/throttling/org.wso2.carbon.stratos.throttling.agent.feature/2.1.0/pom.xml b/features/manager/throttling/org.wso2.carbon.stratos.throttling.agent.feature/2.1.0/pom.xml
deleted file mode 100644
index 79bc582..0000000
--- a/features/manager/throttling/org.wso2.carbon.stratos.throttling.agent.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,78 +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>throttling-feature</artifactId>
- <version>2.1.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.stratos.throttling.agent.feature</artifactId>
- <version>2.1.0</version>
- <packaging>pom</packaging>
- <name>WSO2 Stratos - Throttling Agent Feature</name>
- <url>http://wso2.org</url>
- <description>This feature contains the bundles required for throttle resource usage</description>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.throttling.agent</artifactId>
- <version>2.1.0</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>p2-feature-generation</id>
- <phase>package</phase>
- <goals>
- <goal>p2-feature-gen</goal>
- </goals>
- <configuration>
- <id>org.wso2.carbon.stratos.throttling.agent</id>
- <propertiesFile>../../../../etc/feature.properties</propertiesFile>
- <adviceFile>
- <properties>
- <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef>
- <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
- </properties>
- </adviceFile>
- <bundles>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.throttling.agent</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.throttling.agent.stub</bundleDef>
- </bundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7b6e51cb/features/manager/throttling/org.wso2.carbon.stratos.throttling.manager.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/throttling/org.wso2.carbon.stratos.throttling.manager.feature/2.1.0/pom.xml b/features/manager/throttling/org.wso2.carbon.stratos.throttling.manager.feature/2.1.0/pom.xml
deleted file mode 100644
index 1b78930..0000000
--- a/features/manager/throttling/org.wso2.carbon.stratos.throttling.manager.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,91 +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>throttling-feature</artifactId>
- <version>2.1.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.stratos.throttling.manager.feature</artifactId>
- <version>2.1.0</version>
- <packaging>pom</packaging>
- <name>WSO2 Stratos - Throttling Manager Feature</name>
- <url>http://wso2.org</url>
- <description>This feature contains the bundles required for throttling rule excecution, update and controll throttling process</description>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.common</artifactId>
- <version>${carbon.platform.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.throttling.manager</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.throttling.ui</artifactId>
- <version>${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>p2-feature-generation</id>
- <phase>package</phase>
- <goals>
- <goal>p2-feature-gen</goal>
- </goals>
- <configuration>
- <id>org.wso2.carbon.stratos.throttling.manager</id>
- <propertiesFile>../../../../etc/feature.properties</propertiesFile>
- <adviceFile>
- <properties>
- <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef>
- <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
- </properties>
- </adviceFile>
- <bundles>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.throttling.manager</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.throttling.ui:${stratos.version}</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.throttling.stub:${carbon.platform.version}</bundleDef>
- </bundles>
- <!--importFeatures>
- <importFeatureDef>org.wso2.carbon.stratos.common:${wso2carbon.version}</importFeatureDef>
- </importFeatures-->
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7b6e51cb/features/manager/throttling/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/throttling/pom.xml b/features/manager/throttling/pom.xml
index fcf1100..f8ec919 100644
--- a/features/manager/throttling/pom.xml
+++ b/features/manager/throttling/pom.xml
@@ -1,27 +1,29 @@
<?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.
+ 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.wso2.carbon</groupId>
- <artifactId>stratos-features</artifactId>
- <version>2.1.0</version>
- <relativePath>../pom.xml</relativePath>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>stratos-manager-features</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>throttling-feature</artifactId>
@@ -29,8 +31,8 @@
<name>WSO2 Stratos - Throttling Feature Aggregator Module</name>
<url>http://wso2.org</url>
<modules>
- <module>org.wso2.carbon.stratos.throttling.manager.feature/2.1.0</module>
- <module>org.wso2.carbon.stratos.throttling.agent.feature/2.1.0</module>
+ <module>org.apache.stratos.throttling.manager.feature</module>
+ <module>org.apache.stratos.throttling.agent.feature</module>
</modules>
</project>