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/26 11:50:21 UTC

git commit: Fixed references to org.apache.stratos.email.sender

Updated Branches:
  refs/heads/master d275c1247 -> b2eeb61e9


Fixed references to org.apache.stratos.email.sender


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b2eeb61e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b2eeb61e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b2eeb61e

Branch: refs/heads/master
Commit: b2eeb61e952eb0aa3fb550ec32b6311b45984888
Parents: d275c12
Author: Isuru Perera <is...@apache.org>
Authored: Fri Jul 26 15:20:00 2013 +0530
Committer: Isuru Perera <is...@apache.org>
Committed: Fri Jul 26 15:20:00 2013 +0530

----------------------------------------------------------------------
 .../pom.xml                                     |   2 +-
 .../2.1.0/pom.xml                               |  90 ---
 components/stratos/pom.xml                      | 605 -------------------
 .../org.apache.stratos.server.feature/pom.xml   |   8 +-
 4 files changed, 5 insertions(+), 700 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b2eeb61e/components/org.apache.stratos.tenant.mgt.email.sender/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt.email.sender/pom.xml b/components/org.apache.stratos.tenant.mgt.email.sender/pom.xml
index 109f4b3..29dc7a1 100644
--- a/components/org.apache.stratos.tenant.mgt.email.sender/pom.xml
+++ b/components/org.apache.stratos.tenant.mgt.email.sender/pom.xml
@@ -56,7 +56,7 @@
                         <Import-Package>
                             !javax.xml.namespace,
                             javax.xml.namespace; version=0.0.0,
-                            org.wso2.carbon.email.sender.api,
+                            org.apache.stratos.email.sender.api,
                             *;resolution:=optional
                         </Import-Package>
                     </instructions>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b2eeb61e/components/stratos/org.wso2.carbon.tenant.dispatcher/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/org.wso2.carbon.tenant.dispatcher/2.1.0/pom.xml b/components/stratos/org.wso2.carbon.tenant.dispatcher/2.1.0/pom.xml
deleted file mode 100644
index 9dcf10d..0000000
--- a/components/stratos/org.wso2.carbon.tenant.dispatcher/2.1.0/pom.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<!--
-# Copyright (c) 2008, 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>stratos-components</artifactId>
-        <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.tenant.dispatcher</artifactId>
-    <packaging>bundle</packaging>
-    <name>WSO2 Stratos - Tenant Dispatcher</name>
-
-    <build>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Private-Package>
-                            org.wso2.carbon.tenant.dispatcher.*,
-                        </Private-Package>
-                        <Export-Package>
-                            !org.wso2.carbon.tenant.dispatcher.internal.*,
-                            org.wso2.carbon.tenant.dispatcher.*
-                        </Export-Package>
-                        <Import-Package>
-                            !javax.xml.namespace,
-                            javax.xml.namespace; version=0.0.0,
-                            javax.servlet;version="${imp.pkg.version.javax.servlet}",
-                            javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
-                            *;resolution:=optional
-                        </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.axis2.wso2</groupId>
-            <artifactId>axis2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-    </dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b2eeb61e/components/stratos/pom.xml
----------------------------------------------------------------------
diff --git a/components/stratos/pom.xml b/components/stratos/pom.xml
deleted file mode 100644
index bbd070e..0000000
--- a/components/stratos/pom.xml
+++ /dev/null
@@ -1,605 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2009-2010, 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>stratos-components-parent</artifactId>
-        <version>2.0.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.stratos</groupId>
-    <artifactId>stratos-components</artifactId>
-    <packaging>pom</packaging>
-    <version>2.1.0</version>
-    <name>WSO2 Carbon Stratos Components</name>
-    <description>Carbon Components specifically used in Stratos</description>
-    <url>http://wso2.com</url>
-
-    <licenses>
-        <license>
-            <name>Apache License Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-        </license>
-    </licenses>
-
-    <organization>
-        <name>WSO2 Inc</name>
-        <url>http://wso2.com</url>
-    </organization>
-
-    <modules>
-        <module>org.wso2.carbon.gapp.registration.ui/2.1.0</module>
-        <module>billing</module>
-        <module>account-mgt</module>
-        <module>org.wso2.carbon.email.sender/2.1.0</module>
-        <module>org.wso2.carbon.stratos.common/2.1.0</module>
-        <module>redirector</module>
-        <module>org.wso2.carbon.tenant.dispatcher/2.1.0</module>
-        <module>tenant-mgt</module>
-        <module>theme-mgt</module>
-        <module>usage</module>
-        <module>org.wso2.carbon.activation/2.1.0</module>
-        <module>throttling</module>
-        <module>domain-validator</module>
-        <module>org.wso2.carbon.keystore.mgt/2.1.0</module>
-        <module>org.wso2.carbon.ui.menu.stratos/2.1.0</module>
-        <module>sample-installer</module>
-        <module>payment</module>
-        <module>org.wso2.carbon.load.balance.agent/2.1.0</module>
-        <module>org.wso2.carbon.google.analytics.ui/2.1.0</module>
-	<module>tenant-activity</module>
-	<module>status-monitor</module>
-	<module>org.wso2.carbon.stratos.deployment/2.1.0</module>
-	<module>org.wso2.carbon.stratos.landing.page.deployer/2.1.0</module>
-        <module>sso-mgt</module>
-    </modules>
-
-    <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>fail</checksumPolicy>
-            </releases>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>wso2-maven2-repository</id>
-            <url>http://dist.wso2.org/maven2</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>${commons-logging.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>commons-codec.wso2</groupId>
-                <artifactId>commons-codec</artifactId>
-                <version>${version.commons.codec}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.eclipse.equinox</groupId>
-                <artifactId>javax.servlet</artifactId>
-                <version>${version.javax.servlet}</version>
-            </dependency>
-	    	<dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <scope>test</scope>
-                <version>3.8.2</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.axis2.wso2</groupId>
-                <artifactId>axis2</artifactId>
-                <version>${orbit.version.axis2}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-transport-base</artifactId>
-                <version>${version.axis2.transport}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-transport-jms</artifactId>
-                <version>${version.axis2.transport}</version>
-            </dependency>
-             <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.core</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.context</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.utils</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.ui</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-            	<groupId>org.wso2.carbon</groupId>
-            	<artifactId>org.wso2.carbon.identity.core</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-            	<groupId>org.wso2.carbon</groupId>
-            	<artifactId>org.wso2.carbon.identity.sso.saml</artifactId>
-             	<version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-            	<groupId>org.wso2.carbon</groupId>
-            	<artifactId>org.wso2.carbon.identity.sso.saml.ui</artifactId>
-             	<version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-	        <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.registry.core</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.registry.resource</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.registry.extensions</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-  	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.registry.common</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.registry.resource.ui</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.registry.common.ui</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.user.core</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.user.mgt</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.security.mgt</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.identity.authenticator.saml2.sso.ui</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.authenticator.proxy</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.billing.core</artifactId>
-		<version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.email.verification</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.feature.mgt.services</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.application.upload</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-	        <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.logging</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.um.ws.api</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.admin.mgt</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.captcha.mgt</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <!--<dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.rule.core</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-            	<groupId>org.wso2.carbon</groupId>
-            	<artifactId>org.wso2.carbon.rule.server</artifactId>
-            	<version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-            	<groupId>org.wso2.carbon</groupId>
-            	<artifactId>org.wso2.carbon.rule.engine.drools</artifactId>
-            	<version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-            	<groupId>org.wso2.carbon</groupId>
-            	<artifactId>org.wso2.carbon.rule.engine.jsr94</artifactId>
-            	<version>${wso2carbon.version}</version>
-            </dependency>-->
-            <dependency>
-            	<groupId>org.wso2.carbon</groupId>
-            	<artifactId>org.wso2.carbon.rule.kernel</artifactId>
-            	<version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-            	<groupId>org.wso2.carbon</groupId>
-            	<artifactId>org.wso2.carbon.rule.common</artifactId>
-            	<version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-            	<groupId>org.wso2.carbon</groupId>
-            	<artifactId>org.wso2.carbon.rule.backend</artifactId>
-            	<version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.statistics</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.event.core</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.agent</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-   	    <dependency>
-            	<groupId>org.wso2.carbon</groupId>
-            	<artifactId>org.wso2.carbon.bam.core</artifactId>
-            	<version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-            	<groupId>org.wso2.carbon</groupId>
-            	<artifactId>org.wso2.carbon.bam.common</artifactId>
-            	<version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-            	<groupId>org.wso2.carbon</groupId>
-            	<artifactId>org.wso2.carbon.bam.util</artifactId>
-            	<version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.stratos.common</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.tenant.mgt</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.tenant.mgt.email.sender</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.tenant.mgt.core</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.status.monitor.core</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.email.sender</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.billing.mgt</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-	    <dependency>
-                 <groupId>org.wso2.carbon</groupId>
-                 <artifactId>org.wso2.carbon.usage.agent</artifactId>
-                 <version>${stratos.version}</version>
-            </dependency>
-	    <dependency>
-                 <groupId>org.wso2.carbon</groupId>
-                 <artifactId>org.wso2.carbon.usage</artifactId>
-                 <version>${stratos.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.throttling.agent</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-	    <dependency>
-                 <groupId>org.wso2.carbon</groupId>
-                 <artifactId>org.wso2.carbon.activation</artifactId>
-                 <version>${stratos.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.keystore.mgt</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.theme.mgt</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-            	<groupId>org.wso2.carbon</groupId>
-            	<artifactId>org.wso2.carbon.load.balance.agent</artifactId>
-            	<version>${stratos.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.13</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>addressing</artifactId>
-                <version>${addressing.version}</version>
-                <type>mar</type>
-            </dependency>
-            <dependency>
-                <groupId>commons-lang.wso2</groupId>
-                <artifactId>commons-lang</artifactId>
-                <version>${commons.lang.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.synapse</groupId>
-                <artifactId>synapse-commons</artifactId>
-                <version>${synapse.version}</version>
-            </dependency>
-	    <dependency>
-            	<groupId>org.apache.synapse</groupId>
-            	<artifactId>synapse-tasks</artifactId>
-            	<version>${synapse.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.ws.commons.axiom.wso2</groupId>
-                <artifactId>axiom</artifactId>
-                <version>${orbit.version.axiom}</version>
-            </dependency>
-            <dependency>
-                <groupId>opensaml.wso2</groupId>
-                <artifactId>opensaml2</artifactId>
-                <version>2.4.1.wso2v1</version>
-            </dependency>
-	    <dependency>
-	        <groupId>bouncycastle</groupId>
-                <artifactId>bcprov-jdk15</artifactId>
-                <version>132</version>
-            </dependency>
-	    <dependency>
-                <groupId>kaptcha.wso2</groupId>
-                <artifactId>kaptcha</artifactId>
-                <version>${kaptcha.wso2.version}</version>
-			<exclusions>
-                	 <exclusion>
-                    		<groupId>com.google.code</groupId>
-                    		<artifactId>kaptcha</artifactId>
-                	</exclusion>
-		       </exclusions>
-            </dependency>
-	    <dependency>
-                <groupId>org.apache.batik.wso2</groupId>
-                <artifactId>batik</artifactId>
-                <version>${batik.wso2.version}</version>
-            </dependency>
-            
-            <!--service-stubs-->
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.account.mgt.stub</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.validate.domain.stub</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-            	<groupId>org.wso2.carbon</groupId>
-            	<artifactId>org.wso2.carbon.redirector.servlet.stub</artifactId>
-		<version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.throttling.agent.stub</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.throttling.stub</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency> 
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.theme.mgt.stub</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.usage.stub</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.sample.installer.stub</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.tenant.mgt.stub</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.status.monitor.stub</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.tenant.register.stub</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.announcement.stub</artifactId>
-                <version>${wso2carbon.version}</version>
-        	</dependency>
-            <dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.billing.mgt.stub</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-	        <dependency>
-            	<groupId>org.apache.stratos</groupId>
-            	<artifactId>org.apache.stratos.usage.meteringqueryds.stub</artifactId>
-	    	<version>${project.version}</version>
-            </dependency>
-      	    <dependency>
-            	<groupId>org.apache.stratos</groupId>
-            	<artifactId>org.apache.stratos.usage.meteringsummarygenerationds.stub</artifactId>
-	    	    <version>${project.version}</version>
-            </dependency>
-            <dependency>
-            	<groupId>org.wso2.carbon</groupId>
-            	<artifactId>org.wso2.carbon.stratos.common.stub</artifactId>
-	    	<version>${wso2carbon.version}</version>
-            </dependency>
-	        <dependency>
-                 <groupId>org.wso2.carbon</groupId>
-                 <artifactId>org.wso2.carbon.tenant.activity</artifactId>
-                 <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
-            <version>${wso2carbon.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.ndatasource.rdbms</artifactId>
-            <version>${wso2carbon.version}</version>
-        </dependency>
-        </dependencies>
-    </dependencyManagement>    
-    <build>
-        <pluginManagement>
-           <plugins>
-          </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <distributionManagement>
-        <repository>
-            <id>wso2-maven2-repository</id>
-            <name>WSO2 Maven2 Repository</name>
-            <url>scp://dist.wso2.org/home/httpd/dist.wso2.org/maven2/</url>
-        </repository>
-        <snapshotRepository>
-            <id>wso2-maven2-snapshot-repository</id>
-            <name>WSO2 Maven2 Snapshot Repository</name>
-            <url>scp://dist.wso2.org/home/httpd/dist.wso2.org/snapshots/maven2/</url>
-        </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>
-        <carbon.platform.version>4.1.0</carbon.platform.version>
-    </properties>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b2eeb61e/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml b/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml
index a01c058..4ff39cc 100755
--- a/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml
+++ b/products/stratos_controller/modules/features/service/org.apache.stratos.server.feature/pom.xml
@@ -47,9 +47,9 @@
             <artifactId>org.wso2.carbon.stratos.common</artifactId>
         </dependency>-->
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.email.sender</artifactId>
-	        <version>${stratos.component.version}</version>
+            <groupId>org.apache.stratos</groupId>
+            <artifactId>org.apache.stratos.email.sender</artifactId>
+	        <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
@@ -209,7 +209,7 @@
 				<bundleDef>org.wso2.carbon:org.wso2.carbon.business.messaging.paypal.integration.core:${carbon.version}</bundleDef>
 				
                                 <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.stratos.common</bundleDef>-->
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.email.sender:${stratos.component.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.email.sender:${project.version}</bundleDef>
 				<bundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt.email.sender:${project.version}</bundleDef>
                                 <bundleDef>org.apache.stratos:org.apache.stratos.account.mgt:${project.version}</bundleDef>
                                 <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt</bundleDef>-->