[Carbon-commits] [Carbon] svn commit r113765 - in branches/carbon/3.2.0/products/brs/1.2.2/modules: distribution/service/src/main/assembly p2-profile/service

[dimuthul at wso2.com]

Author: dimuthul
Date: Wed Oct 12 03:13:04 2011
New Revision: 113765
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=113765

Log:
Adding Google Apps feature to brs.



Modified:
   branches/carbon/3.2.0/products/brs/1.2.2/modules/distribution/service/src/main/assembly/bin.xml
   branches/carbon/3.2.0/products/brs/1.2.2/modules/p2-profile/service/pom.xml

Modified: branches/carbon/3.2.0/products/brs/1.2.2/modules/distribution/service/src/main/assembly/bin.xml
URL: http://wso2.org/svn/browse/wso2/branches/carbon/3.2.0/products/brs/1.2.2/modules/distribution/service/src/main/assembly/bin.xml?rev=113765&r1=113764&r2=113765&view=diff
==============================================================================
--- branches/carbon/3.2.0/products/brs/1.2.2/modules/distribution/service/src/main/assembly/bin.xml	(original)
+++ branches/carbon/3.2.0/products/brs/1.2.2/modules/distribution/service/src/main/assembly/bin.xml	Wed Oct 12 03:13:04 2011
@@ -115,7 +115,11 @@
             <source>../../p2-profile/service/target/wso2carbon-core-${carbon.platform.patch.version.322}/repository/conf/advanced/syslog-config.xml</source>
             <outputDirectory>wso2stratos-brs-${pom.version}/repository/conf/advanced</outputDirectory>
         </file>
-		<file>
+        <file>
+            <source>../../p2-profile/service/target/wso2carbon-core-${carbon.platform.patch.version.322}/repository/conf/multitenancy-packages.xml</source>
+            <outputDirectory>wso2stratos-brs-${pom.version}/repository/conf</outputDirectory>
+        </file>
+        <file>
             <source>../../p2-profile/service/target/wso2carbon-core-${carbon.platform.patch.version.322}/repository/conf/cloud-services-desc.xml</source>
             <outputDirectory>wso2stratos-brs-${pom.version}/repository/conf</outputDirectory>
         </file>

Modified: branches/carbon/3.2.0/products/brs/1.2.2/modules/p2-profile/service/pom.xml
URL: http://wso2.org/svn/browse/wso2/branches/carbon/3.2.0/products/brs/1.2.2/modules/p2-profile/service/pom.xml?rev=113765&r1=113764&r2=113765&view=diff
==============================================================================
--- branches/carbon/3.2.0/products/brs/1.2.2/modules/p2-profile/service/pom.xml	(original)
+++ branches/carbon/3.2.0/products/brs/1.2.2/modules/p2-profile/service/pom.xml	Wed Oct 12 03:13:04 2011
@@ -127,17 +127,12 @@
                                 <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.application.deployer.brs.feature:${carbon.version}</featureArtifactDef>
 
                                 <!-- GApp SSO features --> 
-                                <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.relying.party.server.feature:${carbon.version}
-                                 </featureArtifactDef>
-                                <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.relying.party.ui.feature:${carbon.version}
-                                 </featureArtifactDef>
-                                <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.core.server.feature:${carbon.version}
-                                 </featureArtifactDef>
-                                <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.core.ui.feature:${carbon.version}
+                                <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.stratos.gapp.feature:${stratos.patch.version.152}</featureArtifactDef>
+                                <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.relying.party.feature:${carbon.platform.patch.version.322}
+                                </featureArtifactDef>                            
+                                <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.core.feature:${carbon.version}
                                 </featureArtifactDef>
-                                <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.core.feature:${stratos.patch.version.151}
-                                </featureArtifactDef>
-                                <!-- End GApp SSO features --> 
+                                <!-- GApp SSO features --> 
 
                                 <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.load.balance.agent.server.feature:${stratos.version}</featureArtifactDef>
 									
@@ -304,26 +299,18 @@
 
                                 <!-- GApp SSO features --> 
                                 <feature>
-                                    <id>org.wso2.carbon.identity.core.server.feature.group</id>
-                                    <version>${carbon.version}</version>
-                                 </feature>
-                                 <feature>
-                                    <id>org.wso2.carbon.identity.core.ui.feature.group</id>
-                                    <version>${carbon.version}</version>
-                                 </feature>
-                                 <feature>
-                                    <id>org.wso2.carbon.identity.relying.party.server.feature.group</id>
-                                    <version>${carbon.version}</version>
-                                 </feature>
-                                 <feature>
-                                    <id>org.wso2.carbon.identity.relying.party.ui.feature.group</id>
+                                    <id>org.wso2.carbon.stratos.gapp.feature.group</id>
+                                    <version>${stratos.patch.version.152}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.core.feature.group</id>
                                     <version>${carbon.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.tenant.mgt.core.feature.group</id>
-                                    <version>${stratos.patch.version.151}</version>
+                                    <id>org.wso2.carbon.identity.relying.party.feature.group</id>
+                                    <version>${carbon.platform.patch.version.322}</version>
                                 </feature>
-                                <!-- End GApp SSO features -->
+                                <!-- GApp SSO features end -->
 
 								<feature>
 									<id>org.wso2.carbon.deployment.synchronizer.server.feature.group</id>