You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sv...@apache.org on 2007/09/11 17:28:41 UTC
svn commit: r574627 - in
/incubator/tuscany/java/sca/modules/policy-security/src:
main/java/org/apache/tuscany/sca/policy/security/ws/ test/java/org/
test/java/org/apache/ test/java/org/apache/tuscany/
test/java/org/apache/tuscany/sca/ test/java/org/ap...
Author: svkrish
Date: Tue Sep 11 08:28:39 2007
New Revision: 574627
URL: http://svn.apache.org/viewvc?rev=574627&view=rev
Log:
modified to process multiple axis2 config params inside a single policy, included testcase
Added:
incubator/tuscany/java/sca/modules/policy-security/src/test/java/org/
incubator/tuscany/java/sca/modules/policy-security/src/test/java/org/apache/
incubator/tuscany/java/sca/modules/policy-security/src/test/java/org/apache/tuscany/
incubator/tuscany/java/sca/modules/policy-security/src/test/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/
incubator/tuscany/java/sca/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/
incubator/tuscany/java/sca/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/ws/
incubator/tuscany/java/sca/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java
incubator/tuscany/java/sca/modules/policy-security/src/test/resources/
incubator/tuscany/java/sca/modules/policy-security/src/test/resources/org/
incubator/tuscany/java/sca/modules/policy-security/src/test/resources/org/apache/
incubator/tuscany/java/sca/modules/policy-security/src/test/resources/org/apache/tuscany/
incubator/tuscany/java/sca/modules/policy-security/src/test/resources/org/apache/tuscany/sca/
incubator/tuscany/java/sca/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/
incubator/tuscany/java/sca/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/
incubator/tuscany/java/sca/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/
incubator/tuscany/java/sca/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
Modified:
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
Modified: incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java?rev=574627&r1=574626&r2=574627&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java (original)
+++ incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java Tue Sep 11 08:28:39 2007
@@ -18,6 +18,11 @@
*/
package org.apache.tuscany.sca.policy.security.ws;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
import org.apache.axiom.om.OMElement;
/**
@@ -25,18 +30,9 @@
* into the axis2config.
*/
public class Axis2ConfigParamPolicy {
- private String paramName;
- private OMElement paramElement;
- public OMElement getParamElement() {
- return paramElement;
- }
- public void setParamElement(OMElement paramElement) {
- this.paramElement = paramElement;
- }
- public String getParamName() {
- return paramName;
- }
- public void setParamName(String paramName) {
- this.paramName = paramName;
+ private Map<String, OMElement> paramElements = new Hashtable<String, OMElement>();
+
+ public Map<String, OMElement> getParamElements() {
+ return paramElements;
}
}
Modified: incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java?rev=574627&r1=574626&r2=574627&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java Tue Sep 11 08:28:39 2007
@@ -56,16 +56,17 @@
Axis2ConfigParamPolicy policy = new Axis2ConfigParamPolicy();
int event = reader.getEventType();
QName name = null;
-
+ OMElement parameterElement = null;
+ String paramName = null;
while (reader.hasNext()) {
event = reader.getEventType();
switch (event) {
case START_ELEMENT : {
name = reader.getName();
if ( PARAMETER.equals(name.getLocalPart()) ) {
- policy.setParamName(reader.getAttributeValue(null, Constants.NAME));
- OMElement parameterElement = loadElement(reader);
- policy.setParamElement(parameterElement);
+ paramName = reader.getAttributeValue(null, Constants.NAME);
+ parameterElement = loadElement(reader);
+ policy.getParamElements().put(paramName, parameterElement);
}
break;
}
@@ -82,7 +83,7 @@
reader.next();
}
}
-
+
return policy;
}
Added: incubator/tuscany/java/sca/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java?rev=574627&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java (added)
+++ incubator/tuscany/java/sca/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java Tue Sep 11 08:28:39 2007
@@ -0,0 +1,40 @@
+package org.apache.tuscany.sca.policy.security.ws;
+
+
+import java.io.InputStream;
+import java.net.URL;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+
+import junit.framework.TestCase;
+
+/**
+ *
+ * Test the reading of ws config params policy.
+ */
+public class PolicyReadTestCase extends TestCase {
+
+ @Override
+ public void setUp() throws Exception {
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ }
+
+ public void testPolicyReading() throws Exception {
+ Axis2ConfigParamPolicyProcessor processor = new Axis2ConfigParamPolicyProcessor(null);
+
+ URL url = getClass().getResource("mock_policies.xml");
+ XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+
+ InputStream urlStream = url.openStream();
+ XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream);
+
+
+ Axis2ConfigParamPolicy policy = processor.read(reader);
+ assertEquals(policy.getParamElements().size(), 2);
+ }
+
+}
Added: incubator/tuscany/java/sca/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml?rev=574627&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml (added)
+++ incubator/tuscany/java/sca/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml Tue Sep 11 08:28:39 2007
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<tuscany:wsConfigParam xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
+ <parameter name="InflowSecurity">
+ <action>
+ <items>Timestamp Signature</items>
+ <signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/security.properties</signaturePropFile>
+ </action>
+ </parameter>
+ <parameter name="OutflowSecurity">
+ <action>
+ <items>Timestamp Signature</items>
+ <user>TuscanyWsUser</user>
+ <signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/security.properties</signaturePropFile>
+ <passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.IntegrityPWCBHandler</passwordCallbackClass>" +
+ <signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
+ </action>
+ </parameter>
+</tuscany:wsConfigParam>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org