You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2013/08/01 17:37:54 UTC
svn commit: r1509301 - in /webservices/wss4j/trunk: ./
policy/src/main/java/org/apache/wss4j/policy/
policy/src/main/java/org/apache/wss4j/policy/builders/
policy/src/main/java/org/apache/wss4j/policy/model/ ws-security-common/
ws-security-dom/ ws-secu...
Author: coheigea
Date: Thu Aug 1 15:37:54 2013
New Revision: 1509301
URL: http://svn.apache.org/r1509301
Log:
Updated some plugin versions
Modified:
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPUtils.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/AlgorithmSuiteBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Trust13.java
webservices/wss4j/trunk/pom.xml
webservices/wss4j/trunk/ws-security-common/pom.xml
webservices/wss4j/trunk/ws-security-dom/pom.xml
webservices/wss4j/trunk/ws-security-stax/pom.xml
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPUtils.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPUtils.java?rev=1509301&r1=1509300&r2=1509301&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPUtils.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPUtils.java Thu Aug 1 15:37:54 2013
@@ -18,12 +18,18 @@
*/
package org.apache.wss4j.policy;
-import org.w3c.dom.*;
-
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
+
public class SPUtils {
private SPUtils() {
@@ -69,13 +75,21 @@ public class SPUtils {
public static Element getFirstChildElement(Node parent, QName childNodeName) {
Node node = parent.getFirstChild();
while (node != null && (Node.ELEMENT_NODE != node.getNodeType()
- || !(((node.getNamespaceURI() == null && childNodeName.getNamespaceURI() == null)
- || (node.getNamespaceURI() != null && node.getNamespaceURI().equals(childNodeName.getNamespaceURI())))
- && node.getLocalName().equals(childNodeName.getLocalPart())))) {
+ || !isNodeEqualToQName(node, childNodeName))) {
node = node.getNextSibling();
}
return (Element) node;
}
+
+ private static boolean isNodeEqualToQName(Node node, QName nodeName) {
+ if ((node.getNamespaceURI() == null && nodeName.getNamespaceURI() == null
+ || node.getNamespaceURI() != null
+ && node.getNamespaceURI().equals(nodeName.getNamespaceURI()))
+ && node.getLocalName().equals(nodeName.getLocalPart())) {
+ return true;
+ }
+ return false;
+ }
public static String getFirstChildElementText(Node parent, QName childNodeName) {
Element element = getFirstChildElement(parent, childNodeName);
@@ -161,7 +175,7 @@ public class SPUtils {
public static void serialize(Node node, XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
if (node.getNodeType() == Node.DOCUMENT_NODE) {
- Document document = (org.w3c.dom.Document) node;
+ Document document = (Document) node;
serialize(document.getDocumentElement(), xmlStreamWriter);
}
if (node.getNodeType() == Node.ELEMENT_NODE) {
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/AlgorithmSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/AlgorithmSuiteBuilder.java?rev=1509301&r1=1509300&r2=1509301&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/AlgorithmSuiteBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/AlgorithmSuiteBuilder.java Thu Aug 1 15:37:54 2013
@@ -18,16 +18,19 @@
*/
package org.apache.wss4j.policy.builders;
+import javax.xml.namespace.QName;
+
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Policy;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.wss4j.policy.*;
+import org.apache.wss4j.policy.SP11Constants;
+import org.apache.wss4j.policy.SP13Constants;
+import org.apache.wss4j.policy.SPConstants;
+import org.apache.wss4j.policy.SPUtils;
import org.apache.wss4j.policy.model.AlgorithmSuite;
import org.w3c.dom.Element;
-import javax.xml.namespace.QName;
-
public class AlgorithmSuiteBuilder implements AssertionBuilder<Element> {
@Override
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Trust13.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Trust13.java?rev=1509301&r1=1509300&r2=1509301&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Trust13.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Trust13.java Thu Aug 1 15:37:54 2013
@@ -18,14 +18,15 @@
*/
package org.apache.wss4j.policy.model;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
import org.apache.wss4j.policy.SPConstants;
-import javax.xml.namespace.QName;
-import java.util.Iterator;
-import java.util.List;
-
public class Trust13 extends Trust10 {
private boolean requireRequestSecurityTokenCollection;
@@ -45,7 +46,7 @@ public class Trust13 extends Trust10 {
}
@Override
- protected AbstractSecurityAssertion cloneAssertion(org.apache.neethi.Policy nestedPolicy) {
+ protected AbstractSecurityAssertion cloneAssertion(Policy nestedPolicy) {
return new Trust13(getVersion(), nestedPolicy);
}
Modified: webservices/wss4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1509301&r1=1509300&r2=1509301&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Thu Aug 1 15:37:54 2013
@@ -120,6 +120,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>2.7.1</version>
+ <!--<version>3.0.1</version>-->
<configuration>
<sourceEncoding>UTF-8</sourceEncoding>
<failOnViolation>true</failOnViolation>
@@ -162,7 +163,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.2.1</version>
+ <version>2.3.2</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<preparationGoals>clean install</preparationGoals>
@@ -177,7 +178,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
+ <version>2.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -255,7 +256,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
+ <version>2.15</version>
<inherited>true</inherited>
<configuration>
<reportFormat>brief</reportFormat>
Modified: webservices/wss4j/trunk/ws-security-common/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/pom.xml?rev=1509301&r1=1509300&r2=1509301&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-common/pom.xml Thu Aug 1 15:37:54 2013
@@ -89,7 +89,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
<executions>
<execution>
<goals>
Modified: webservices/wss4j/trunk/ws-security-dom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/pom.xml?rev=1509301&r1=1509300&r2=1509301&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-dom/pom.xml Thu Aug 1 15:37:54 2013
@@ -86,7 +86,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
<executions>
<execution>
<goals>
@@ -264,7 +264,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.9.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: webservices/wss4j/trunk/ws-security-stax/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/pom.xml?rev=1509301&r1=1509300&r2=1509301&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-stax/pom.xml Thu Aug 1 15:37:54 2013
@@ -219,7 +219,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
<executions>
<execution>
<goals>