[jboss-svn-commits] JBL Code SVN: r26620 - in labs/jbossesb/trunk/product/rosetta: tests/src/org/jboss/soa/esb/services/security/auth/ws and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: beve
Date: 2009-05-19 10:47:45 -0400 (Tue, 19 May 2009)
New Revision: 26620

Removed:
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/smooks-config.xml
Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractorUnitTest.java
Log:
Work for https://jira.jboss.org/jira/browse/JBESB-2492 "Smooks transformer in WSSecurityInfoExtractor should probably use SAX filter"


Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml	2009-05-19 13:18:07 UTC (rev 26619)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml	2009-05-19 14:47:45 UTC (rev 26620)
@@ -1,5 +1,9 @@
 <?xml version="1.0"?>
 <smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+    
+    <resource-config selector="global-parameters">
+        <param name="stream.filter.type">SAX</param>
+    </resource-config>
 
     <resource-config selector="Envelope/Header/Security/UsernameToken">
         <resource>org.milyn.javabean.BeanPopulator</resource>

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractorUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractorUnitTest.java	2009-05-19 13:18:07 UTC (rev 26619)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/WSSecurityInfoExtractorUnitTest.java	2009-05-19 14:47:45 UTC (rev 26620)
@@ -118,7 +118,7 @@
 	@Before
 	public void createInstance()
 	{
-		extractor = new WSSecurityInfoExtractor("smooks-config.xml");
+		extractor = new WSSecurityInfoExtractor();
 	}
 
 	public static junit.framework.Test suite()

Deleted: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/smooks-config.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/smooks-config.xml	2009-05-19 13:18:07 UTC (rev 26619)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/services/security/auth/ws/smooks-config.xml	2009-05-19 14:47:45 UTC (rev 26620)
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
-
-    <resource-config selector="Envelope/Header/Security/UsernameToken">
-        <resource>org.milyn.javabean.BeanPopulator</resource>
-        <param name="beanId">userNameToken</param>
-        <param name="beanClass">org.jboss.soa.esb.services.security.auth.ws.UsernameToken</param>
-        <param name="bindings">
-            <binding property="userName" selector="Username" default="" />
-            <binding property="password" selector="Password" />
-        </param>
-    </resource-config>
-    
-    <resource-config selector="Envelope/Header/Security/BinarySecurityToken">
-        <resource>org.milyn.javabean.BeanPopulator</resource>
-        <param name="beanId">binarySecurityToken</param>
-        <param name="beanClass">org.jboss.soa.esb.services.security.auth.ws.BinarySecurityToken</param>
-        <param name="bindings">
-            <binding property="encodingType" selector="BinarySecurityToken @EncodingType" />
-            <binding property="valueType" selector="BinarySecurityToken @ValueType" />
-            <binding property="key" selector="BinarySecurityToken" />
-        </param>
-    </resource-config>
-
-</smooks-resource-list>