[Carbon-commits] svn commit r47813 - in trunk/solutions/identity/modules/distribution: . src/assembly

[thilinab at wso2.com]

Author: thilinab
Date: Thu Oct 22 12:49:09 2009
New Revision: 47813
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=47813

Log:
Adding XKMS orbit bundle into IS distribution

Modified:
   trunk/solutions/identity/modules/distribution/pom.xml
   trunk/solutions/identity/modules/distribution/src/assembly/dist.xml

Modified: trunk/solutions/identity/modules/distribution/pom.xml
URL: http://wso2.org/svn/browse/wso2/trunk/solutions/identity/modules/distribution/pom.xml?rev=47813&r1=47812&r2=47813&view=diff
==============================================================================
--- trunk/solutions/identity/modules/distribution/pom.xml	(original)
+++ trunk/solutions/identity/modules/distribution/pom.xml	Thu Oct 22 12:49:09 2009
@@ -136,19 +136,21 @@
             <artifactId>org.wso2.carbon.identity.entitlement</artifactId>
             <version>${carbon.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.identity.entitlement.ui</artifactId>
             <version>${carbon.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.xkms</artifactId>
+            <version>${carbon.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.xkms.mgt</artifactId>
             <version>${carbon.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.xkms.mgt.ui</artifactId>
@@ -243,15 +245,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.xkms</artifactId>
-            <version>${carbon.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>axis2</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.wso2.xkms.wso2</groupId>
+            <artifactId>xkms</artifactId>
+            <version>2.4.0.wso2v1</version>
         </dependency>
 
         <dependency>

Modified: trunk/solutions/identity/modules/distribution/src/assembly/dist.xml
URL: http://wso2.org/svn/browse/wso2/trunk/solutions/identity/modules/distribution/src/assembly/dist.xml?rev=47813&r1=47812&r2=47813&view=diff
==============================================================================
--- trunk/solutions/identity/modules/distribution/src/assembly/dist.xml	(original)
+++ trunk/solutions/identity/modules/distribution/src/assembly/dist.xml	Thu Oct 22 12:49:09 2009
@@ -49,8 +49,8 @@
                 <include>org.wso2.carbon:org.wso2.carbon.xkms.mgt:jar</include>
                 <include>org.wso2.carbon:org.wso2.carbon.registry.app:jar</include>
                 <include>org.wso2.carbon:org.wso2.carbon.registry.resource:jar</include>
-                <include>org.wso2.carbon:org.wso2.carbon.registry.search:jar</include>
-
+                <include>org.wso2.carbon:org.wso2.carbon.registry.search:jar</include>
+
                 <include>org.wso2.carbon:org.wso2.carbon.eventing.impl:jar</include>             
 
                 <include>org.wso2.carbon:org.wso2.carbon.identity.user.registration:jar</include>
@@ -84,9 +84,10 @@
                 <include>org.wso2.carbon:org.wso2.carbon.registry.common:jar</include>
                 <include>org.wso2.carbon:org.wso2.carbon.identity.base:jar</include>                
                 <include>org.springframework.ws.wso2:spring.framework:jar</include>
-                <include>org.openid4java.wso2:openid4java-nodeps:jar</include>
-                <include>org.apache.poi.wso2:poi:jar</include>
+                <include>org.openid4java.wso2:openid4java-nodeps:jar</include>
+                <include>org.apache.poi.wso2:poi:jar</include>
                 <include>org.apache.poi.wso2:poi-scratchpad:jar</include>
+                <include>org.wso2.xkms.wso2:xkms:jar</include>
             </includes>
         </dependencySet>