You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2008/10/14 05:53:36 UTC
svn commit: r704303 - in /cxf/branches/2.1.x-fixes: ./
rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/
rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/
rt/ws/security/src/main/java/org/apache/cxf/ws/security/poli...
Author: ningjiang
Date: Mon Oct 13 20:53:36 2008
New Revision: 704303
URL: http://svn.apache.org/viewvc?rev=704303&view=rev
Log:
Merged revisions 704300 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r704300 | gmazza | 2008-10-14 11:15:08 +0800 (Tue, 14 Oct 2008) | 2 lines
Misspellings fixed.
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapEncodingUtil.java
cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRef.java
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/Messages.properties
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SP11Constants.java
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SP12Constants.java
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SPConstants.java
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecureConversationTokenBuilder.java
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecurityContextTokenBuilder.java
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X509TokenBuilder.java
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/IssuedToken.java
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SecureConversationToken.java
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/X509Token.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapEncodingUtil.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapEncodingUtil.java?rev=704303&r1=704302&r2=704303&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapEncodingUtil.java (original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapEncodingUtil.java Mon Oct 13 20:53:36 2008
@@ -65,7 +65,7 @@
}
/**
- * Reads the SOAP 1.2 or SOAP 1.1 refernce attribute.
+ * Reads the SOAP 1.2 or SOAP 1.1 reference attribute.
*
* @param reader the stream to read; must not be null
* @return the reference id or null of neither attribute was present
Modified: cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRef.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRef.java?rev=704303&r1=704302&r2=704303&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRef.java (original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRef.java Mon Oct 13 20:53:36 2008
@@ -58,7 +58,7 @@
* Registers an action to invoke when the instance is set. If the instance, has already been set, the
* onSet method will immedately be invoked.
*
- * @return the action to invoke when this refernce is resolved; not null
+ * @return the action to invoke when this reference is resolved; not null
*/
public void setAction(Action action) {
if (action == null) {
Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/Messages.properties?rev=704303&r1=704302&r2=704303&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/Messages.properties (original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/Messages.properties Mon Oct 13 20:53:36 2008
@@ -20,7 +20,7 @@
#
LOAD_BUS_WITHOUT_APPLICATION_CONTEXT = Load the bus without application context
LOAD_BUS_WITH_APPLICATION_CONTEXT = Load the bus with application context
-REPLACED_HTTP_DESTIONFACTORY = Replaced the http destionFactory with servlet transport factory
+REPLACED_HTTP_DESTIONFACTORY = Replaced the http destination factory with servlet transport factory
BUILD_ENDPOINTS_FROM_CONFIG_LOCATION = Build endpoints from config-location: {0}
DESTIONFACTORY_ALREADY_REGISTERED = Servlet transport factory already registered
UNEXPECTED_RESPONSE_TYPE_MSG = Unexpected response type {0}
Modified: cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SP11Constants.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SP11Constants.java?rev=704303&r1=704302&r2=704303&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SP11Constants.java (original)
+++ cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SP11Constants.java Mon Oct 13 20:53:36 2008
@@ -40,10 +40,10 @@
+ SPConstants.INCLUDE_TOKEN_ONCE_SUFFIX;
public static final String INCLUDE_ALWAYS_TO_RECIPIENT = SP11Constants.SP_NS
- + SPConstants.INCLUDE_TOEKN_ALWAYS_TO_RECIPIENT_SUFFIX;
+ + SPConstants.INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT_SUFFIX;
public static final String INCLUDE_ALWAYS = SP11Constants.SP_NS
- + SPConstants.INCLUDE_TOEKN_ALWAYS_SUFFIX;
+ + SPConstants.INCLUDE_TOKEN_ALWAYS_SUFFIX;
// /////////////////////////////////////////////////////////////////////
@@ -185,8 +185,8 @@
public static final QName PROTECT_TOKENS = new QName(SP11Constants.SP_NS,
SPConstants.PROTECT_TOKENS, SP11Constants.SP_PREFIX);
- public static final QName REQUIRE_KEY_IDENTIFIRE_REFERENCE = new QName(
- SP11Constants.SP_NS, SPConstants.REQUIRE_KEY_IDENTIFIRE_REFERENCE ,
+ public static final QName REQUIRE_KEY_IDENTIFIER_REFERENCE = new QName(
+ SP11Constants.SP_NS, SPConstants.REQUIRE_KEY_IDENTIFIER_REFERENCE ,
SP11Constants.SP_PREFIX);
public static final QName REQUIRE_ISSUER_SERIAL_REFERENCE = new QName(
@@ -254,14 +254,14 @@
public static final QName REQUIRE_DERIVED_KEYS = new QName(SP11Constants.SP_NS,
SPConstants.REQUIRE_DERIVED_KEYS, SP11Constants.SP_PREFIX);
- public static final QName REQUIRE_EXTERNAL_URI_REFERNCE = new QName(
- SP11Constants.SP_NS, SPConstants.REQUIRE_EXTERNAL_URI_REFERNCE, SP11Constants.SP_PREFIX);
+ public static final QName REQUIRE_EXTERNAL_URI_REFERENCE = new QName(
+ SP11Constants.SP_NS, SPConstants.REQUIRE_EXTERNAL_URI_REFERENCE, SP11Constants.SP_PREFIX);
- public static final QName REQUIRE_EXTERNAL_REFERNCE = new QName(
- SP11Constants.SP_NS, SPConstants.REQUIRE_EXTERNAL_REFERNCE , SP11Constants.SP_PREFIX);
+ public static final QName REQUIRE_EXTERNAL_REFERENCE = new QName(
+ SP11Constants.SP_NS, SPConstants.REQUIRE_EXTERNAL_REFERENCE , SP11Constants.SP_PREFIX);
- public static final QName REQUIRE_INTERNAL_REFERNCE = new QName(
- SP11Constants.SP_NS, SPConstants.REQUIRE_INTERNAL_REFERNCE , SP11Constants.SP_PREFIX);
+ public static final QName REQUIRE_INTERNAL_REFERENCE = new QName(
+ SP11Constants.SP_NS, SPConstants.REQUIRE_INTERNAL_REFERENCE , SP11Constants.SP_PREFIX);
public static final QName REQUEST_SECURITY_TOKEN_TEMPLATE = new QName(
SP11Constants.SP_NS, SPConstants.REQUEST_SECURITY_TOKEN_TEMPLATE,
Modified: cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SP12Constants.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SP12Constants.java?rev=704303&r1=704302&r2=704303&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SP12Constants.java (original)
+++ cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SP12Constants.java Mon Oct 13 20:53:36 2008
@@ -40,13 +40,13 @@
+ SPConstants.INCLUDE_TOKEN_ONCE_SUFFIX;
public static final String INCLUDE_ALWAYS_TO_RECIPIENT = SP12Constants.SP_NS
- + SPConstants.INCLUDE_TOEKN_ALWAYS_TO_RECIPIENT_SUFFIX;
+ + SPConstants.INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT_SUFFIX;
public static final String INCLUDE_ALWAYS_TO_INITIATOR = SP12Constants.SP_NS
- + SPConstants.INCLUDE_TOEKN_ALWAYS_TO_INITIATOR_SUFFIX;
+ + SPConstants.INCLUDE_TOKEN_ALWAYS_TO_INITIATOR_SUFFIX;
public static final String INCLUDE_ALWAYS = SP12Constants.SP_NS
- + SPConstants.INCLUDE_TOEKN_ALWAYS_SUFFIX;
+ + SPConstants.INCLUDE_TOKEN_ALWAYS_SUFFIX;
public static final QName TRUST_13 = new QName(SP11Constants.SP_NS, SPConstants.TRUST_13,
SP11Constants.SP_PREFIX);
@@ -228,8 +228,8 @@
public static final QName PROTECT_TOKENS = new QName(SP12Constants.SP_NS,
SPConstants.PROTECT_TOKENS, SP12Constants.SP_PREFIX);
- public static final QName REQUIRE_KEY_IDENTIFIRE_REFERENCE = new QName(
- SP12Constants.SP_NS, SPConstants.REQUIRE_KEY_IDENTIFIRE_REFERENCE ,
+ public static final QName REQUIRE_KEY_IDENTIFIER_REFERENCE = new QName(
+ SP12Constants.SP_NS, SPConstants.REQUIRE_KEY_IDENTIFIER_REFERENCE ,
SP12Constants.SP_PREFIX);
public static final QName REQUIRE_ISSUER_SERIAL_REFERENCE = new QName(
@@ -306,14 +306,14 @@
public static final QName REQUIRE_EXPLICIT_DERIVED_KEYS = new QName(SP12Constants.SP_NS,
SPConstants.REQUIRE_EXPLICIT_DERIVED_KEYS, SP12Constants.SP_PREFIX);
- public static final QName REQUIRE_EXTERNAL_URI_REFERNCE = new QName(
- SP12Constants.SP_NS, SPConstants.REQUIRE_EXTERNAL_URI_REFERNCE, SP12Constants.SP_PREFIX);
+ public static final QName REQUIRE_EXTERNAL_URI_REFERENCE = new QName(
+ SP12Constants.SP_NS, SPConstants.REQUIRE_EXTERNAL_URI_REFERENCE, SP12Constants.SP_PREFIX);
- public static final QName REQUIRE_EXTERNAL_REFERNCE = new QName(
- SP12Constants.SP_NS, SPConstants.REQUIRE_EXTERNAL_REFERNCE , SP12Constants.SP_PREFIX);
+ public static final QName REQUIRE_EXTERNAL_REFERENCE = new QName(
+ SP12Constants.SP_NS, SPConstants.REQUIRE_EXTERNAL_REFERENCE , SP12Constants.SP_PREFIX);
- public static final QName REQUIRE_INTERNAL_REFERNCE = new QName(
- SP12Constants.SP_NS, SPConstants.REQUIRE_INTERNAL_REFERNCE , SP12Constants.SP_PREFIX);
+ public static final QName REQUIRE_INTERNAL_REFERENCE = new QName(
+ SP12Constants.SP_NS, SPConstants.REQUIRE_INTERNAL_REFERENCE , SP12Constants.SP_PREFIX);
public static final QName REQUEST_SECURITY_TOKEN_TEMPLATE = new QName(
SP12Constants.SP_NS, SPConstants.REQUEST_SECURITY_TOKEN_TEMPLATE,
Modified: cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SPConstants.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SPConstants.java?rev=704303&r1=704302&r2=704303&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SPConstants.java (original)
+++ cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SPConstants.java Mon Oct 13 20:53:36 2008
@@ -307,9 +307,9 @@
public static final String ATTR_INCLUDE_TOKEN = "IncludeToken";
public static final String INCLUDE_TOKEN_NEVER_SUFFIX = "/IncludeToken/Never";
public static final String INCLUDE_TOKEN_ONCE_SUFFIX = "/IncludeToken/Once";
- public static final String INCLUDE_TOEKN_ALWAYS_TO_RECIPIENT_SUFFIX = "/IncludeToken/AlwaysToRecipient";
- public static final String INCLUDE_TOEKN_ALWAYS_TO_INITIATOR_SUFFIX = "/IncludeToken/AlwaysToInitiator";
- public static final String INCLUDE_TOEKN_ALWAYS_SUFFIX = "/IncludeToken/Always";
+ public static final String INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT_SUFFIX = "/IncludeToken/AlwaysToRecipient";
+ public static final String INCLUDE_TOKEN_ALWAYS_TO_INITIATOR_SUFFIX = "/IncludeToken/AlwaysToInitiator";
+ public static final String INCLUDE_TOKEN_ALWAYS_SUFFIX = "/IncludeToken/Always";
public enum IncludeTokenType {
@@ -329,7 +329,7 @@
////////////////////////////////////////////////////////////////////////////////////////////////
- public static final String REQUIRE_KEY_IDENTIFIRE_REFERENCE = "RequireKeyIdentifireReference";
+ public static final String REQUIRE_KEY_IDENTIFIER_REFERENCE = "RequireKeyIdentifierReference";
public static final String REQUIRE_ISSUER_SERIAL_REFERENCE = "RequireIssuerSerialReference";
public static final String REQUIRE_EMBEDDED_TOKEN_REFERENCE = "RequireEmbeddedTokenReference";
public static final String REQUIRE_THUMBPRINT_REFERENCE = "RequireThumbprintReference";
@@ -384,11 +384,11 @@
public static final String REQUIRE_EXPLICIT_DERIVED_KEYS = "RequireExplicitDerivedKeys";
- public static final String REQUIRE_EXTERNAL_URI_REFERNCE = "RequireExternalUriReference";
+ public static final String REQUIRE_EXTERNAL_URI_REFERENCE = "RequireExternalUriReference";
- public static final String REQUIRE_EXTERNAL_REFERNCE = "RequireExternalReference";
+ public static final String REQUIRE_EXTERNAL_REFERENCE = "RequireExternalReference";
- public static final String REQUIRE_INTERNAL_REFERNCE = "RequireInternalReference";
+ public static final String REQUIRE_INTERNAL_REFERENCE = "RequireInternalReference";
public static final String REQUEST_SECURITY_TOKEN_TEMPLATE = "RequestSecurityTokenTemplate";
Modified: cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java?rev=704303&r1=704302&r2=704303&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java (original)
+++ cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/IssuedTokenBuilder.java Mon Oct 13 20:53:36 2008
@@ -139,9 +139,9 @@
if (SP11Constants.REQUIRE_DERIVED_KEYS.equals(name)) {
parent.setDerivedKeys(true);
- } else if (SP11Constants.REQUIRE_EXTERNAL_REFERNCE.equals(name)) {
+ } else if (SP11Constants.REQUIRE_EXTERNAL_REFERENCE.equals(name)) {
parent.setRequireExternalReference(true);
- } else if (SP11Constants.REQUIRE_INTERNAL_REFERNCE.equals(name)) {
+ } else if (SP11Constants.REQUIRE_INTERNAL_REFERENCE.equals(name)) {
parent.setRequireInternalReference(true);
}
}
Modified: cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecureConversationTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecureConversationTokenBuilder.java?rev=704303&r1=704302&r2=704303&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecureConversationTokenBuilder.java (original)
+++ cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecureConversationTokenBuilder.java Mon Oct 13 20:53:36 2008
@@ -89,7 +89,7 @@
if (DOMUtils.getFirstChildWithName(element,
consts.getNamespace(),
- SPConstants.REQUIRE_EXTERNAL_URI_REFERNCE) != null) {
+ SPConstants.REQUIRE_EXTERNAL_URI_REFERENCE) != null) {
conversationToken.setRequireExternalUriRef(true);
}
Modified: cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecurityContextTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecurityContextTokenBuilder.java?rev=704303&r1=704302&r2=704303&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecurityContextTokenBuilder.java (original)
+++ cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SecurityContextTokenBuilder.java Mon Oct 13 20:53:36 2008
@@ -68,7 +68,7 @@
if (DOMUtils.getFirstChildWithName(element,
consts.getNamespace(),
- SPConstants.REQUIRE_EXTERNAL_URI_REFERNCE) != null) {
+ SPConstants.REQUIRE_EXTERNAL_URI_REFERENCE) != null) {
contextToken.setRequireExternalUriRef(true);
}
Modified: cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X509TokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X509TokenBuilder.java?rev=704303&r1=704302&r2=704303&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X509TokenBuilder.java (original)
+++ cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/X509TokenBuilder.java Mon Oct 13 20:53:36 2008
@@ -105,7 +105,7 @@
continue;
}
- if (SPConstants.REQUIRE_KEY_IDENTIFIRE_REFERENCE.equals(name.getLocalPart())) {
+ if (SPConstants.REQUIRE_KEY_IDENTIFIER_REFERENCE.equals(name.getLocalPart())) {
parent.setRequireKeyIdentifierReference(true);
} else if (SPConstants.REQUIRE_ISSUER_SERIAL_REFERENCE.equals(name.getLocalPart())) {
Modified: cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/IssuedToken.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/IssuedToken.java?rev=704303&r1=704302&r2=704303&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/IssuedToken.java (original)
+++ cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/IssuedToken.java Mon Oct 13 20:53:36 2008
@@ -173,12 +173,12 @@
if (isRequireExternalReference()) {
// <sp:RequireExternalReference />
- writer.writeEmptyElement(prefix, SPConstants.REQUIRE_EXTERNAL_REFERNCE, namespaceURI);
+ writer.writeEmptyElement(prefix, SPConstants.REQUIRE_EXTERNAL_REFERENCE, namespaceURI);
}
if (isRequireInternalReference()) {
// <sp:RequireInternalReference />
- writer.writeEmptyElement(prefix, SPConstants.REQUIRE_INTERNAL_REFERNCE, namespaceURI);
+ writer.writeEmptyElement(prefix, SPConstants.REQUIRE_INTERNAL_REFERENCE, namespaceURI);
}
if (this.isDerivedKeys()) {
Modified: cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SecureConversationToken.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SecureConversationToken.java?rev=704303&r1=704302&r2=704303&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SecureConversationToken.java (original)
+++ cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SecureConversationToken.java Mon Oct 13 20:53:36 2008
@@ -135,7 +135,7 @@
if (isRequireExternalUriRef()) {
// <sp:RequireExternalUriReference />
- writer.writeEmptyElement(prefix, SPConstants.REQUIRE_EXTERNAL_URI_REFERNCE, namespaceURI);
+ writer.writeEmptyElement(prefix, SPConstants.REQUIRE_EXTERNAL_URI_REFERENCE, namespaceURI);
}
if (isSc10SecurityContextToken()) {
Modified: cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/X509Token.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/X509Token.java?rev=704303&r1=704302&r2=704303&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/X509Token.java (original)
+++ cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/X509Token.java Mon Oct 13 20:53:36 2008
@@ -154,7 +154,7 @@
if (isRequireKeyIdentifierReference()) {
// <sp:RequireKeyIdentifierReference />
- writer.writeStartElement(prefix, SPConstants.REQUIRE_KEY_IDENTIFIRE_REFERENCE, namespaceURI);
+ writer.writeStartElement(prefix, SPConstants.REQUIRE_KEY_IDENTIFIER_REFERENCE, namespaceURI);
writer.writeEndElement();
}