Author: prabath Date: Mon Apr 20 10:35:39 2009 New Revision: 33784 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=33784
Log: pom changes as per orbit chages Modified: trunk/solutions/identity/modules/distribution/conf/claim-config.xml trunk/solutions/identity/modules/distribution/conf/identity.xml trunk/solutions/identity/modules/distribution/pom.xml trunk/solutions/identity/modules/distribution/src/assembly/dist.xml Modified: trunk/solutions/identity/modules/distribution/conf/claim-config.xml URL: http://wso2.org/svn/browse/wso2/trunk/solutions/identity/modules/distribution/conf/claim-config.xml?rev=33784&r1=33783&r2=33784&view=diff ============================================================================== --- trunk/solutions/identity/modules/distribution/conf/claim-config.xml (original) +++ trunk/solutions/identity/modules/distribution/conf/claim-config.xml Mon Apr 20 10:35:39 2009 @@ -51,9 +51,59 @@ <Claim> <ClaimURI>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier</ClaimURI> <AttributeID>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier</AttributeID> - <Description>PPID</Description> + <Description>PPID</Description> + <Required /> <SupportedByDefault /> </Claim> </Dialect> + <Dialect dialectURI="http://schema.openid.net/2007/05/claims";> + <Claim> + <ClaimURI>nickname</ClaimURI> + <DisplayName>Nick Name</DisplayName> + <AttributeID>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname</AttributeID> + <Description>Nick Name</Description> + <Required /> + <SupportedByDefault /> + </Claim> + <Claim> + <ClaimURI>fullname</ClaimURI> + <DisplayName>Full Name</DisplayName> + <AttributeID>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname</AttributeID> + <Description>Full Name</Description> + <Required /> + <SupportedByDefault /> + </Claim> + <Claim> + <ClaimURI>email</ClaimURI> + <DisplayName>Email</DisplayName> + <AttributeID>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress</AttributeID> + <Description>Email Address</Description> + <Required /> + <SupportedByDefault /> + </Claim> + <Claim> + <ClaimURI>country</ClaimURI> + <DisplayName>Country</DisplayName> + <AttributeID>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/country</AttributeID> + <Description>Country</Description> + <Required /> + <SupportedByDefault /> + </Claim> + <Claim> + <ClaimURI>timezone</ClaimURI> + <DisplayName>Time Zone</DisplayName> + <AttributeID>http://schema.openid.net/2007/05/claims/timezone</AttributeID> + <Description>Time Zone</Description> + <SupportedByDefault /> + </Claim> + <Claim> + <ClaimURI>postcode</ClaimURI> + <DisplayName>Postalcode</DisplayName> + <AttributeID>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/postalcode</AttributeID> + <Description>Postalcode</Description> + <Required /> + <SupportedByDefault /> + </Claim> + </Dialect> </Dialects> </ClaimConfig> \ No newline at end of file Modified: trunk/solutions/identity/modules/distribution/conf/identity.xml URL: http://wso2.org/svn/browse/wso2/trunk/solutions/identity/modules/distribution/conf/identity.xml?rev=33784&r1=33783&r2=33784&view=diff ============================================================================== --- trunk/solutions/identity/modules/distribution/conf/identity.xml (original) +++ trunk/solutions/identity/modules/distribution/conf/identity.xml Mon Apr 20 10:35:39 2009 @@ -2,7 +2,7 @@ <Server xmlns="http://wso2.org/projects/carbon/carbon.xml";> - <OpenIDServerUrl>https://localhost:9443/openidserver/</OpenIDServerUrl> + <OpenIDServerUrl>https://localhost:9443/openidserver</OpenIDServerUrl> <OpenIDUserPattern>https://localhost:9443/openid/</OpenIDUserPattern> Modified: trunk/solutions/identity/modules/distribution/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/solutions/identity/modules/distribution/pom.xml?rev=33784&r1=33783&r2=33784&view=diff ============================================================================== --- trunk/solutions/identity/modules/distribution/pom.xml (original) +++ trunk/solutions/identity/modules/distribution/pom.xml Mon Apr 20 10:35:39 2009 @@ -149,31 +149,12 @@ <version>${carbon.version}</version> </dependency> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.abdera</artifactId> - <version>0.4.0</version> - </dependency> - <!-- TODO all other Carbon --> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.authenticator</artifactId> - <version>0.7</version> - </dependency> - - - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.rm</artifactId> - <version>${carbon.version}</version> - </dependency> - - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.rm.ui</artifactId> - <version>${carbon.version}</version> + <groupId>org.wso2.commons.wso2</groupId> + <artifactId>authenticator</artifactId> + <version>0.7-wso2v1</version> </dependency> <dependency> @@ -239,12 +220,6 @@ <dependency> <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.throttle</artifactId> - <version>${carbon.version}</version> - </dependency> - - <dependency> - <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.service.mgt</artifactId> <version>${carbon.version}</version> </dependency> @@ -263,18 +238,6 @@ <dependency> <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.caching</artifactId> - <version>${carbon.version}</version> - </dependency> - - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.caching.ui</artifactId> - <version>${carbon.version}</version> - </dependency> - - <dependency> - <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.statistics</artifactId> <version>${carbon.version}</version> </dependency> @@ -305,67 +268,9 @@ <!-- Orbit dependency foe axis1service component --> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.axis</artifactId> - <version>1.4</version> - </dependency> - - <!--dependencies only needed for samples--> - - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.bcel</artifactId> - <version>5.2</version> - </dependency> - - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.asm</artifactId> - <version>1.5.3</version> - </dependency> - - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.cglib</artifactId> - <version>2.1_3</version> - </dependency> - - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.hibernate</artifactId> - <version>3.2.5.ga</version> - </dependency> - - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.geronimo.jta.1.1.spec</artifactId> - <version>1.1</version> - </dependency> - - <!--Orbit dependency for jibx component --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.axis2.jibx</artifactId> - <version>1.4.1-wso2</version> - </dependency> - - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.jibx</artifactId> - <version>1.1.5</version> - </dependency> - - <!--Orbit dependency for jaxbri component --> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.axis2.jaxbri</artifactId> - <version>1.4.1-wso2</version> - </dependency> - - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.jaxbri</artifactId> - <version>2.1.6</version> + <groupId>org.apache.axis.wso2</groupId> + <artifactId>axis</artifactId> + <version>1.4-wso2v1</version> </dependency> <!-- Module dependencies --> @@ -382,9 +287,9 @@ </dependency> <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.openid4java</artifactId> - <version>0.9.3.1</version> + <groupId>org.openid4java.wso2</groupId> + <artifactId>openid4java-nodeps</artifactId> + <version>0.9.3.1-wso2v1</version> </dependency> </dependencies> 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=33784&r1=33783&r2=33784&view=diff ============================================================================== --- trunk/solutions/identity/modules/distribution/src/assembly/dist.xml (original) +++ trunk/solutions/identity/modules/distribution/src/assembly/dist.xml Mon Apr 20 10:35:39 2009 @@ -39,14 +39,11 @@ <dependencySet> <outputDirectory>wso2is-${pom.version}/webapps/ROOT/WEB-INF/plugins/server</outputDirectory> <includes> - <include>org.wso2.carbon:org.wso2.carbon.rm:jar</include> <include>org.wso2.carbon:org.wso2.carbon.security.mgt:jar</include> <include>org.wso2.carbon:org.wso2.carbon.security.rahas:jar</include> <include>org.wso2.carbon:org.wso2.carbon.logging.service:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.throttle:jar</include> <include>org.wso2.carbon:org.wso2.carbon.xfer:jar</include> <include>org.wso2.carbon:org.wso2.carbon.mex:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.caching:jar</include> <include>org.wso2.carbon:org.wso2.carbon.service.mgt:jar</include> <include>org.wso2.carbon:org.wso2.carbon.server.admin:jar</include> <include>org.wso2.carbon:org.wso2.carbon.statistics:jar</include> @@ -70,20 +67,11 @@ <includes> <include>org.wso2.carbon:org.wso2.carbon.security.policy:jar</include> <include>org.wso2.carbon:org.wso2.carbon.security.rampart:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.spring.framework:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.axis:jar</include> + <include>org.springframework.ws.wso2:spring.framework:jar</include> + <include>org.apache.axis.wso2:axis:jar</include> <include>org.wso2.carbon:org.wso2.carbon.user.mgt:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.axis2.jibx:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.jibx:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.axis2.jaxbri:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.jaxbri:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.bcel:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.asm:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.cglib:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.hibernate:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.abdera:jar</include> <include>org.wso2.carbon:org.wso2.carbon.identity.base:jar</include> - <include>org.wso2.carbon:org.wso2.carbon.openid4java:jar</include> + <include>org.openid4java.wso2:openid4java-nodeps:jar</include> </includes> </dependencySet> </dependencySets> _______________________________________________ Identity-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/identity-dev
