You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2013/08/12 11:31:35 UTC
[1/2] git commit: Fixed poms, remove license, scm, issueManagement,
mailingLists, organization, repositories tags from child poms
Updated Branches:
refs/heads/master 3aa4cef4d -> 795a6ad9b
Fixed poms, remove license, scm, issueManagement, mailingLists, organization, repositories tags from child poms
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/abbd0afd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/abbd0afd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/abbd0afd
Branch: refs/heads/master
Commit: abbd0afd3b4f91f0492f3ebff71445c05d68a638
Parents: 15a9905
Author: Manula Thantriwatte <ma...@wso2.com>
Authored: Mon Aug 12 14:40:22 2013 +0530
Committer: Manula Thantriwatte <ma...@wso2.com>
Committed: Mon Aug 12 14:40:22 2013 +0530
----------------------------------------------------------------------
.../pom.xml | 192 +++++++++----------
components/pom.xml | 15 --
features/manager/pom.xml | 9 -
features/pom.xml | 21 --
products/cloud-controller/pom.xml | 53 -----
products/elb/pom.xml | 65 -------
products/stratos-agent/pom.xml | 65 -------
.../modules/features-dashboard/pom.xml | 6 -
.../stratos-controller/modules/features/pom.xml | 7 -
.../stratos-controller/modules/styles/pom.xml | 7 -
products/stratos-controller/pom.xml | 61 ------
.../resources/cloud-services-icons/pom.xml | 37 ++--
12 files changed, 102 insertions(+), 436 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/abbd0afd/components/org.apache.stratos.usage.summary.helper/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.usage.summary.helper/pom.xml b/components/org.apache.stratos.usage.summary.helper/pom.xml
index 82a5944..85dc202 100644
--- a/components/org.apache.stratos.usage.summary.helper/pom.xml
+++ b/components/org.apache.stratos.usage.summary.helper/pom.xml
@@ -20,120 +20,108 @@
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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.stratos</groupId>
- <version>3.0.0-SNAPSHOT</version>
- <artifactId>org.apache.stratos.usage.summary.helper</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Stratos - Usage Summary Generation Helper</name>
+<parent>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>stratos-components-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+</parent>
- <build>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.stratos.usage.summary.helper</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Stratos - Usage Summary Generation Helper</name>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <version>1.7.2</version>
- <executions>
- <execution>
- <id>generate-scr-scrdescriptor</id>
- <goals>
- <goal>scr</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ <version>1.7.2</version>
+ <executions>
+ <execution>
+ <id>generate-scr-scrdescriptor</id>
+ <goals>
+ <goal>scr</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Axis2Module>${project.artifactId}-${project.version}</Axis2Module>
+ <Bundle-Name>${project.artifactId}</Bundle-Name>
+ <Export-Package>
+ org.apache.stratos.usage.summary.*,
+ </Export-Package>
+ <Import-Package>
+ *;resolution:=optional
+ </Import-Package>
+ <DynamicImport-Package>*</DynamicImport-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Axis2Module>${project.artifactId}-${project.version}</Axis2Module>
- <Bundle-Name>${project.artifactId}</Bundle-Name>
- <Export-Package>
- org.apache.stratos.usage.summary.*,
- </Export-Package>
- <Import-Package>
- *;resolution:=optional
- </Import-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
+ <dependencies>
<dependency>
- <groupId>org.apache.hive.wso2</groupId>
- <artifactId>hive</artifactId>
- <version>0.8.1.wso2v3</version>
+ <groupId>org.apache.hive.wso2</groupId>
+ <artifactId>hive</artifactId>
+ <version>0.8.1.wso2v3</version>
<exclusions>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
- </exclusion>
<exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-shims</artifactId>
- </exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-exec</artifactId>
+ </exclusion>
<exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-builtins</artifactId>
- </exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-shims</artifactId>
+ </exclusion>
<exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-service</artifactId>
- </exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-builtins</artifactId>
+ </exclusion>
<exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-serde</artifactId>
- </exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-service</artifactId>
+ </exclusion>
<exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-metastore</artifactId>
- </exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-serde</artifactId>
+ </exclusion>
<exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-cassandra</artifactId>
- </exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-metastore</artifactId>
+ </exclusion>
<exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-jdbc</artifactId>
- </exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-cassandra</artifactId>
+ </exclusion>
<exclusion>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>hive-jdbc-handler</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.analytics.hive</artifactId>
- <version>4.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>0.20.2</version>
- </dependency>
- </dependencies>
-
- <repositories>
- <repository>
- <id>wso2-nexus</id>
- <name>WSO2 internal Repository</name>
- <url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </releases>
- </repository>
- </repositories>
-
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-jdbc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>hive-jdbc-handler</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.analytics.hive</artifactId>
+ <version>4.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>0.20.2</version>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/abbd0afd/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index 305fcc6..f2aae83 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -35,13 +35,6 @@
<name>Apache Stratos - Components - Parent Module</name>
<url>http://apache.org</url>
- <licenses>
- <license>
- <name>Apache License Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
-
<modules>
<!-- COMMON -->
<module>org.apache.stratos.common</module>
@@ -130,14 +123,6 @@
</plugin>
</plugins>
</build>
- <scm>
- <connection>
- scm:svn:https://wso2.org/repos/wso2/trunk/carbon/components
- </connection>
- <developerConnection>
- scm:svn:https://wso2.org/repos/wso2/trunk/carbon/components
- </developerConnection>
- </scm>
<dependencyManagement>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/abbd0afd/features/manager/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/pom.xml b/features/manager/pom.xml
index 7db150c..e12e632 100644
--- a/features/manager/pom.xml
+++ b/features/manager/pom.xml
@@ -62,15 +62,6 @@
</snapshotRepository>
</distributionManagement>
- <scm>
- <connection>
- scm:svn:https://wso2.org/repos/wso2/trunk/carbon/components
- </connection>
- <developerConnection>
- scm:svn:https://wso2.org/repos/wso2/trunk/carbon/components
- </developerConnection>
- </scm>
-
<properties>
<stratos.version>2.1.0</stratos.version>
<synapse.version>2.1.0-wso2v6</synapse.version>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/abbd0afd/features/pom.xml
----------------------------------------------------------------------
diff --git a/features/pom.xml b/features/pom.xml
index 38ec35a..2482ffc 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -35,18 +35,6 @@
<name>Apache Stratos - Features Aggregator Module</name>
<url>http://apache.org</url>
- <licenses>
- <license>
- <name>Apache License Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
-
- <organization>
- <name>Apache</name>
- <url>http://apache.org</url>
- </organization>
-
<modules>
<!-- LB -->
<module>load-balancer</module>
@@ -78,15 +66,6 @@
</plugins>
</build>
- <scm>
- <connection>
- scm:svn:https://wso2.org/repos/wso2/trunk/carbon/components
- </connection>
- <developerConnection>
- scm:svn:https://wso2.org/repos/wso2/trunk/carbon/components
- </developerConnection>
- </scm>
-
<properties>
<wso2carbon.version>4.1.0</wso2carbon.version>
<carbon.patch.version.4.1.1>4.1.1</carbon.patch.version.4.1.1>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/abbd0afd/products/cloud-controller/pom.xml
----------------------------------------------------------------------
diff --git a/products/cloud-controller/pom.xml b/products/cloud-controller/pom.xml
index e1a449f..88042e9 100644
--- a/products/cloud-controller/pom.xml
+++ b/products/cloud-controller/pom.xml
@@ -35,37 +35,11 @@
<url>http://wso2.org/projects/mb/java</url>
<description>Apache Stratos Cloud Controller</description>
- <licenses>
- <license>
- <name>Apache License Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
-
<modules>
<module>modules/p2-profile</module>
<module>modules/distribution</module>
</modules>
- <scm>
- <connection>scm:svn:http://wso2.org/repos/wso2/trunk/mb/java</connection>
- <developerConnection>scm:svn:https://wso2.org/repos/wso2/trunk/mb/java</developerConnection>
- <url>https://wso2.org/repos/wso2/trunk/mb/java/</url>
- </scm>
-
- <repositories>
- <repository>
- <id>wso2-nexus</id>
- <name>WSO2 internal Repository</name>
- <url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </releases>
- </repository>
- </repositories>
-
<pluginRepositories>
<pluginRepository>
<id>wso2-maven2-repository</id>
@@ -116,33 +90,6 @@
</profile>
</profiles>
- <organization>
- <name>Apache</name>
- <url>http://apache.org</url>
- </organization>
-
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/stratos</url>
- </issueManagement>
-
- <mailingLists>
- <mailingList>
- <name>WSO2 Users' list</name>
- <post>mailto:user@wso2.org</post>
- <archive>http://wso2.markmail.org/search/+list:org%2Ewso2%2Euser</archive>
- <subscribe>mailto:dev-request@wso2.org?subject=subscribe</subscribe>
- <unsubscribe>mailto:dev-request@wso2.org?subject=unsubscribe</unsubscribe>
- </mailingList>
- <mailingList>
- <name>WSO2 Developers' List</name>
- <post>mailto:dev@wso2.org</post>
- <archive>http://wso2.markmail.org/search/+list:org%2Ewso2%2Edev</archive>
- <subscribe>mailto:user-request@wso2.org?subject=subscribe</subscribe>
- <unsubscribe>mailto:user-request@wso2.org?subject=unsubscribe</unsubscribe>
- </mailingList>
- </mailingLists>
-
<properties>
<carbon.version>4.1.0</carbon.version>
<carbon.patch.version>4.1.1</carbon.patch.version>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/abbd0afd/products/elb/pom.xml
----------------------------------------------------------------------
diff --git a/products/elb/pom.xml b/products/elb/pom.xml
index 14c368e..0d61386 100755
--- a/products/elb/pom.xml
+++ b/products/elb/pom.xml
@@ -36,50 +36,12 @@
<url>http://apache.org</url>
<description>Apache Stratos Elastic Load Balancer (ELB)</description>
- <licenses>
- <license>
- <name>Apache License Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
-
<modules>
<module>modules/p2-profile</module>
<module>modules/distribution</module>
<!--<module>modules/integration</module>-->
</modules>
- <scm>
- <connection>scm:svn:http://wso2.org/repos/wso2/trunk/carbon/products/lb</connection>
- <developerConnection>scm:svn:https://wso2.org/repos/wso2/trunk/carbon/products/lb</developerConnection>
- <url>https://wso2.org/repos/wso2/trunk/carbon/products/lb</url>
- </scm>
-
- <repositories>
- <repository>
- <id>wso2-nexus</id>
- <name>WSO2 internal Repository</name>
- <url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </releases>
- </repository>
- <!--moved to nexus
-
- <repository>
- <id>wso2-maven2-repository-snapshot</id>
- <url>http://dist.wso2.org/snapshots/maven2</url>
- </repository>
- <repository>
- <id>wso2-maven2-repository</id>
- <url>http://dist.wso2.org/maven2</url>
- </repository>
-
- -->
- </repositories>
-
<pluginRepositories>
<pluginRepository>
<id>wso2-maven2-repository</id>
@@ -129,33 +91,6 @@
</profile>
</profiles>
- <organization>
- <name>Apache</name>
- <url>http://apache.org</url>
- </organization>
-
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/stratos</url>
- </issueManagement>
-
- <mailingLists>
- <mailingList>
- <name>Apache Stratos Developer Mailing List</name>
- <post>mailto://dev@stratos.incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-stratos-dev/</archive>
- <subscribe>mailto:dev-subscribe@stratos.incubator.apache.org?subject=subscribe</subscribe>
- <unsubscribe>mailto:dev-unsubscribe@stratos.incubator.apache.org?subject=unsubscribe</unsubscribe>
- </mailingList>
- <mailingList>
- <name>Apache Stratos Commit Mailing List</name>
- <post></post>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-stratos-commits/</archive>
- <subscribe>mailto:commits-subscribe@stratos.incubator.apache.org?subject=subscribe</subscribe>
- <unsubscribe>mailto:commits-unsubscribe@stratos.incubator.apache.org?subject=unsubscribe</unsubscribe>
- </mailingList>
- </mailingLists>
-
<dependencyManagement>
<dependencies>
<!-- Dependencies for dashboard ui -->
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/abbd0afd/products/stratos-agent/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-agent/pom.xml b/products/stratos-agent/pom.xml
index bf40e5c..9a215c9 100755
--- a/products/stratos-agent/pom.xml
+++ b/products/stratos-agent/pom.xml
@@ -37,50 +37,12 @@
<url>http://apache.org</url>
<description>Apache Stratos Agent (S2agent)</description>
- <licenses>
- <license>
- <name>Apache License Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
-
<modules>
<module>modules/p2-profile</module>
<module>modules/distribution</module>
<!--<module>modules/integration</module>-->
</modules>
- <scm>
- <connection>scm:svn:http://wso2.org/repos/wso2/trunk/carbon/products/lb</connection>
- <developerConnection>scm:svn:https://wso2.org/repos/wso2/trunk/carbon/products/lb</developerConnection>
- <url>https://wso2.org/repos/wso2/trunk/carbon/products/lb</url>
- </scm>
-
- <repositories>
- <repository>
- <id>wso2-nexus</id>
- <name>WSO2 internal Repository</name>
- <url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </releases>
- </repository>
- <!--moved to nexus
-
- <repository>
- <id>wso2-maven2-repository-snapshot</id>
- <url>http://dist.wso2.org/snapshots/maven2</url>
- </repository>
- <repository>
- <id>wso2-maven2-repository</id>
- <url>http://dist.wso2.org/maven2</url>
- </repository>
-
- -->
- </repositories>
-
<pluginRepositories>
<pluginRepository>
<id>wso2-maven2-repository</id>
@@ -130,33 +92,6 @@
</profile>
</profiles>
- <organization>
- <name>WSO2 Inc</name>
- <url>http://wso2.com</url>
- </organization>
-
- <issueManagement>
- <system>JIRA</system>
- <url>http://wso2.org/jira/browse/LB</url>
- </issueManagement>
-
- <mailingLists>
- <mailingList>
- <name>WSO2 LB Users' list</name>
- <post>mailto:lb-user@wso2.org</post>
- <archive>http://wso2.org/mailarchive/lb-user/</archive>
- <subscribe>mailto:lb-user-request@wso2.org?subject=subscribe</subscribe>
- <unsubscribe>mailto:lb-user-request@wso2.org?subject=unsubscribe</unsubscribe>
- </mailingList>
- <mailingList>
- <name>WSO2 LB/Carbon Developers' List</name>
- <post>mailto:dev@wso2.org</post>
- <archive>http://wso2.org/mailarchive/dev/</archive>
- <subscribe>mailto:dev-request@wso2.org?subject=subscribe</subscribe>
- <unsubscribe>mailto:dev-request@wso2.org?subject=unsubscribe</unsubscribe>
- </mailingList>
- </mailingLists>
-
<dependencyManagement>
<dependencies>
<!-- Dependencies for dashboard ui -->
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/abbd0afd/products/stratos-controller/modules/features-dashboard/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/features-dashboard/pom.xml b/products/stratos-controller/modules/features-dashboard/pom.xml
index 9b2fa7b..90fed37 100755
--- a/products/stratos-controller/modules/features-dashboard/pom.xml
+++ b/products/stratos-controller/modules/features-dashboard/pom.xml
@@ -40,12 +40,6 @@
<properties>
<CApp.type>web/application</CApp.type>
</properties>
- <repositories>
- <repository>
- <id>wso2-maven2-repository-1</id>
- <url>http://dist.wso2.org/maven2</url>
- </repository>
- </repositories>
<pluginRepositories>
<pluginRepository>
<id>wso2-maven2-repository-1</id>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/abbd0afd/products/stratos-controller/modules/features/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/features/pom.xml b/products/stratos-controller/modules/features/pom.xml
index d344cac..5e9fa1c 100755
--- a/products/stratos-controller/modules/features/pom.xml
+++ b/products/stratos-controller/modules/features/pom.xml
@@ -33,13 +33,6 @@
<url>http://wso2.org/projects/wsas/java</url>
<description>Apache Stratos Features Parent</description>
- <licenses>
- <license>
- <name>Apache License Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
-
<modules>
<module>service</module>
</modules>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/abbd0afd/products/stratos-controller/modules/styles/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/styles/pom.xml b/products/stratos-controller/modules/styles/pom.xml
index 57e7cf5..90b186b 100644
--- a/products/stratos-controller/modules/styles/pom.xml
+++ b/products/stratos-controller/modules/styles/pom.xml
@@ -33,13 +33,6 @@
<url>http://apache.org</url>
<description>Apache Manager Styles Parent</description>
- <licenses>
- <license>
- <name>Apache License Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
-
<modules>
<module>product</module>
<module>service</module>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/abbd0afd/products/stratos-controller/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/pom.xml b/products/stratos-controller/pom.xml
index acecd81..097b122 100755
--- a/products/stratos-controller/pom.xml
+++ b/products/stratos-controller/pom.xml
@@ -33,13 +33,6 @@
<url>http://apache.org</url>
<description>Apache Stratos Controller Parent</description>
- <licenses>
- <license>
- <name>Apache License Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
-
<modules>
<module>modules/styles</module>
<module>modules/cloud-service-mgt</module>
@@ -281,55 +274,6 @@
</plugin>
</plugins>
</build>
- <scm>
- <connection>scm:svn:https://wso2.org/repos/wso2/trunk/wsas/java</connection>
- <developerConnection>scm:svn:https://wso2.org/repos/wso2/trunk/wsas/java
- </developerConnection>
- </scm>
-
- <repositories>
- <repository>
- <id>wso2-nexus</id>
- <name>WSO2 internal Repository</name>
- <url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </releases>
- </repository>
- <!--moved to nexus
-
- <repository>
- <id>wso2-maven2-repository-snapshot</id>
- <url>http://dist.wso2.org/snapshots/maven2</url>
- </repository>
- <repository>
- <id>m2-snapshot-repository</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>wso2-maven2-repository</id>
- <url>http://dist.wso2.org/maven2</url>
- </repository>
- <repository>
- <id>tomcat-repository</id>
- <url>http://tomcat.apache.org/dev/dist/m2-repository</url>
- </repository>
- <repository>
- <id>ws-zones-repository</id>
- <url>http://ws.zones.apache.org/repository2</url>
- </repository>
- <!–– Others are available from http://repo1.maven.org/maven2 ––>
-
- -->
- </repositories>
<distributionManagement>
<repository>
@@ -380,11 +324,6 @@
</profile>
</profiles>
- <organization>
- <name>WSO2 Inc</name>
- <url>http://wso2.com</url>
- </organization>
-
<properties>
<rampart.mar.version>1.6.1-wso2v8</rampart.mar.version>
<features-dashboard.war.version>1.0.0</features-dashboard.war.version>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/abbd0afd/products/stratos-controller/resources/cloud-services-icons/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/resources/cloud-services-icons/pom.xml b/products/stratos-controller/resources/cloud-services-icons/pom.xml
index 662ea95..68d1b5d 100755
--- a/products/stratos-controller/resources/cloud-services-icons/pom.xml
+++ b/products/stratos-controller/resources/cloud-services-icons/pom.xml
@@ -28,13 +28,6 @@
<name>Apache Stratos - Manager Cloud Services Icons</name>
<description>Apache Stratos - Manager Cloud Services Icons</description>
- <licenses>
- <license>
- <name>Apache License Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
-
<build>
<plugins>
<plugin>
@@ -43,30 +36,24 @@
<version>2.1.1</version>
<executions>
<execution>
- <id>war</id>
- <phase>package</phase>
- <goals>
- <goal>war</goal>
- </goals>
+ <id>war</id>
+ <phase>package</phase>
+ <goals>
+ <goal>war</goal>
+ </goals>
</execution>
</executions>
<configuration>
- <warName>cloud-services-icons</warName>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- <webResources>
- <resource>
- <directory>.</directory>
- </resource>
- </webResources>
+ <warName>cloud-services-icons</warName>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ <webResources>
+ <resource>
+ <directory>.</directory>
+ </resource>
+ </webResources>
</configuration>
</plugin>
</plugins>
</build>
- <organization>
- <name>WSO2 Inc</name>
- <url>http://wso2.com</url>
- </organization>
-
-
</project>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ma...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Fix conflicts :
Conflicts file is :
products/stratos-controller/modules/styles/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/795a6ad9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/795a6ad9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/795a6ad9
Branch: refs/heads/master
Commit: 795a6ad9b8a71f89802da3886af65a1943b7d8f1
Parents: abbd0af 3aa4cef
Author: Manula Thantriwatte <ma...@wso2.com>
Authored: Mon Aug 12 14:48:27 2013 +0530
Committer: Manula Thantriwatte <ma...@wso2.com>
Committed: Mon Aug 12 14:48:27 2013 +0530
----------------------------------------------------------------------
.../stratos-controller/modules/styles/pom.xml | 179 ++++++++++----
.../modules/styles/product/pom.xml | 85 -------
.../src/main/resources/META-INF/product.xml | 28 ---
.../src/main/resources/web/product/about.html | 132 ----------
.../src/main/resources/web/styles/css/main.css | 155 ------------
.../main/resources/web/styles/images/1px.gif | Bin 43 -> 0 bytes
.../styles/images/esb-server-menu-header.gif | Bin 176 -> 0 bytes
.../web/styles/images/leftRightSlider-dark.png | Bin 1103 -> 0 bytes
.../resources/web/styles/images/menu_header.png | Bin 227 -> 0 bytes
.../web/styles/images/right-links-bg.gif | Bin 1070 -> 0 bytes
.../web/styles/images/right-logo-bg.gif | Bin 3445 -> 0 bytes
.../resources/web/styles/images/sc-back.png | Bin 16781 -> 0 bytes
.../web/styles/images/sc-header-repeat.png | Bin 178 -> 0 bytes
.../main/resources/web/styles/images/sclogo.png | Bin 5136 -> 0 bytes
.../modules/styles/service/pom.xml | 143 -----------
.../src/main/resources/META-INF/product.xml | 27 ---
.../service/src/main/resources/web/favicon.ico | Bin 17542 -> 0 bytes
.../src/main/resources/web/styles/css/main.css | 240 -------------------
.../resources/web/styles/images/def-body-bg.gif | Bin 419 -> 0 bytes
.../web/styles/images/def-header-bg.gif | Bin 17875 -> 0 bytes
.../web/styles/images/def-header-region-bg.gif | Bin 22784 -> 0 bytes
.../main/resources/web/styles/images/logo.gif | Bin 3476 -> 0 bytes
.../resources/web/styles/images/powered.gif | Bin 1773 -> 0 bytes
.../resources/web/styles/images/right-logo.gif | Bin 6102 -> 0 bytes
.../web/styles/images/t-right-logo.gif | Bin 3629 -> 0 bytes
.../src/main/resources/META-INF/product.xml | 27 +++
.../styles/src/main/resources/web/favicon.ico | Bin 0 -> 17542 bytes
.../src/main/resources/web/styles/css/main.css | 240 +++++++++++++++++++
.../resources/web/styles/images/def-body-bg.gif | Bin 0 -> 419 bytes
.../web/styles/images/def-header-bg.gif | Bin 0 -> 17875 bytes
.../web/styles/images/def-header-region-bg.gif | Bin 0 -> 22784 bytes
.../main/resources/web/styles/images/logo.gif | Bin 0 -> 3476 bytes
.../resources/web/styles/images/powered.gif | Bin 0 -> 1773 bytes
.../resources/web/styles/images/right-logo.gif | Bin 0 -> 6102 bytes
.../web/styles/images/t-right-logo.gif | Bin 0 -> 3629 bytes
35 files changed, 405 insertions(+), 851 deletions(-)
----------------------------------------------------------------------