Author: ruchith
Date: Mon Jan 28 01:12:19 2008
New Revision: 13039
Log:
Changed the wsas version to 2.2
Modified:
trunk/solutions/identity/modules/identity-provider/conf/axis2.xml
trunk/solutions/identity/modules/identity-provider/pom.xml
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/admin/STSConfigAdmin.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/mex/MexGetService.java
trunk/solutions/identity/pom.xml
Modified: trunk/solutions/identity/modules/identity-provider/conf/axis2.xml
==============================================================================
--- trunk/solutions/identity/modules/identity-provider/conf/axis2.xml
(original)
+++ trunk/solutions/identity/modules/identity-provider/conf/axis2.xml Mon Jan
28 01:12:19 2008
@@ -351,6 +351,7 @@
<phase name="OperationOutFaultPhase"/>
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
+ <phase name="Security"/>
</phaseOrder>
<!-- ================================================= -->
Modified: trunk/solutions/identity/modules/identity-provider/pom.xml
==============================================================================
--- trunk/solutions/identity/modules/identity-provider/pom.xml (original)
+++ trunk/solutions/identity/modules/identity-provider/pom.xml Mon Jan 28
01:12:19 2008
@@ -1,96 +1,96 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <parent>
- <artifactId>identity-solution-parent</artifactId>
- <groupId>org.wso2.solutions.identity</groupId>
- <version>SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>wso2is-identity-provider</artifactId>
- <name>Identity Solution : Identity Provider</name>
- <build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- </resource>
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <parent>
+ <artifactId>identity-solution-parent</artifactId>
+ <groupId>org.wso2.solutions.identity</groupId>
+ <version>SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>wso2is-identity-provider</artifactId>
+ <name>Identity Solution : Identity Provider</name>
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ </resource>
</resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
<target>1.5</target>
<excludes>
<exclude>org/wso2/solutions/identity/sts/saml/*</exclude>
</excludes>
</configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.wso2.commons.usermanager</groupId>
- <artifactId>user-verification</artifactId>
- <version>${usermanager.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.solutions.identity</groupId>
- <artifactId>wso2is-base</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.utils</groupId>
- <artifactId>wso2utils</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <artifactId>xmlsec</artifactId>
- <groupId>xml-security</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.wso2.wsas</groupId>
- <artifactId>wso2wsas-core</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <artifactId>xmlsec</artifactId>
- <groupId>xml-security</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.wso2.wsas</groupId>
- <artifactId>wso2wsas-admin</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>xmlsec</artifactId>
- <groupId>xml-security</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- <version>0.9.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.mex</groupId>
- <artifactId>wso2mex</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.xfer</groupId>
- <artifactId>wso2xfer</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.openid4java</groupId>
- <artifactId>openid4java-nodeps</artifactId>
- <version>0.9.5-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.wso2.commons.usermanager</groupId>
+ <artifactId>user-verification</artifactId>
+ <version>${usermanager.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.solutions.identity</groupId>
+ <artifactId>wso2is-base</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.utils</groupId>
+ <artifactId>wso2utils</artifactId>
+ <version>${wsas.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xmlsec</artifactId>
+ <groupId>xml-security</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.wsas</groupId>
+ <artifactId>wso2wsas-core</artifactId>
+ <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xmlsec</artifactId>
+ <groupId>xml-security</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.wsas</groupId>
+ <artifactId>wso2wsas-admin</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>xmlsec</artifactId>
+ <groupId>xml-security</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ <version>0.9.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.mex</groupId>
+ <artifactId>wso2mex</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.xfer</groupId>
+ <artifactId>wso2xfer</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java-nodeps</artifactId>
+ <version>0.9.5-SNAPSHOT</version>
+ </dependency>
+
+ </dependencies>
</project>
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/admin/STSConfigAdmin.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/admin/STSConfigAdmin.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/admin/STSConfigAdmin.java
Mon Jan 28 01:12:19 2008
@@ -49,10 +49,7 @@
SecurityScenarioConfigAdmin admin = new SecurityScenarioConfigAdmin();
ConfigurationContext configContext = ConfigurationContextHolder
.getConfigurationContext();
- admin.setConfigContext(configContext);
AxisConfiguration axisConfig = configContext.getAxisConfiguration();
- admin.setAxisConfig(axisConfig);
-
try {
if(initial) {
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/mex/MexGetService.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/mex/MexGetService.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/mex/MexGetService.java
Mon Jan 28 01:12:19 2008
@@ -68,9 +68,7 @@
MessageContext msgCtx = MessageContext.getCurrentMessageContext();
String service = msgCtx.getAxisService().getName();
- ConfigurationContext cfgContext = msgCtx.getConfigurationContext();
-
- ServiceAdmin admin = new ServiceAdmin(cfgContext);
+ ServiceAdmin admin = new ServiceAdmin();
String stsName = null;
if (service.equals(IdentityProviderConstants.SERVICE_NAME_MEX_UT)) {
stsName = IdentityProviderConstants.SERVICE_NAME_STS_UT;
Modified: trunk/solutions/identity/pom.xml
==============================================================================
--- trunk/solutions/identity/pom.xml (original)
+++ trunk/solutions/identity/pom.xml Mon Jan 28 01:12:19 2008
@@ -808,7 +808,7 @@
<rampart.version>SNAPSHOT</rampart.version>
<wss4j.version>SNAPSHOT</wss4j.version>
- <wsas.version>2.1</wsas.version>
+ <wsas.version>2.2</wsas.version>
<axis2.version>1.3</axis2.version>
<addressing.version>1.3</addressing.version>
<addressing.mar.version>1.3</addressing.mar.version>
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
