[java-identity-provider] branch master updated: Fix some typos.
Daniel Fisher
dfisher at vt.edu
Tue May 23 00:08:39 EDT 2017
This is an automated email from the git hooks/post-receive script.
dfisher pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=762f5fcb606079507e9052367360f46be4573596
The following commit(s) were added to refs/heads/master by this push:
new 762f5fc Fix some typos.
762f5fc is described below
commit 762f5fcb606079507e9052367360f46be4573596
Author: Daniel Fisher <dfisher at gmail.com>
AuthorDate: Tue May 23 00:06:29 2017 -0400
Fix some typos.
---
.../common/attribute/provider/V2SAMLProfileRequestContext.java | 4 ++--
.../idp/attribute/resolver/ad/impl/DelegatedWorkContext.java | 10 +++++-----
.../resolver/ad/impl/PrincipalNameAttributeDefinition.java | 2 +-
.../ad/impl/SubjectDerivedAttributeValuesFunction.java | 2 +-
.../resolver/ad/impl/TemplateAttributeDefinition.java | 2 +-
.../idp/attribute/resolver/impl/AttributeResolverImpl.java | 4 ++--
.../resolver/impl/ad/requestContextUnimplemented.script | 2 +-
.../resolver/spring/ad/BaseAttributeDefinitionParser.java | 2 +-
.../attribute/resolver/spring/dc/impl/CacheConfigParser.java | 2 +-
.../resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java | 9 +++++----
10 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/V2SAMLProfileRequestContext.java b/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/V2SAMLProfileRequestContext.java
index 1cb3e79..172844d 100644
--- a/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/V2SAMLProfileRequestContext.java
+++ b/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/V2SAMLProfileRequestContext.java
@@ -190,8 +190,8 @@ public class V2SAMLProfileRequestContext {
*
* @return null
*/
- public Object getOuboundSAMLMessageSigningCredential() {
- unsupportedMethod("getOuboundSAMLMessageSigningCredential");
+ public Object getOutboundSAMLMessageSigningCredential() {
+ unsupportedMethod("getOutboundSAMLMessageSigningCredential");
return null;
}
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/DelegatedWorkContext.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/DelegatedWorkContext.java
index abf96f9..42ba92b 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/DelegatedWorkContext.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/DelegatedWorkContext.java
@@ -73,7 +73,7 @@ import org.slf4j.LoggerFactory;
@Nonnull @NonnullElements @Unmodifiable public Map<String, ResolvedAttributeDefinition>
getResolvedIdPAttributeDefinitions() {
log.error("'{}' Use of workContext.getResolvedIdPAttributeDefinitions()"
- + " is deprecated and will cause instabilty", logPrefix);
+ + " is deprecated and will cause instability", logPrefix);
return delegate.getResolvedIdPAttributeDefinitions();
}
@@ -87,7 +87,7 @@ import org.slf4j.LoggerFactory;
public void recordAttributeDefinitionResolution(@Nonnull final AttributeDefinition definition,
@Nullable final IdPAttribute attribute) throws ResolutionException {
log.error("'{}' Use of workContext.getResolvedIdPAttributeDefinitions()"
- + " is deprecated and will cause instabilty", logPrefix);
+ + " is deprecated and will cause instability", logPrefix);
delegate.recordAttributeDefinitionResolution(definition, attribute);
}
@@ -97,7 +97,7 @@ import org.slf4j.LoggerFactory;
* @return what the delegate does.
*/
@Nonnull @NonnullElements @Unmodifiable public Map<String, ResolvedDataConnector> getResolvedDataConnectors() {
- log.error("'{}' Use of workContext.getResolvedDataConnectors() is deprecated and will cause instabilty",
+ log.error("'{}' Use of workContext.getResolvedDataConnectors() is deprecated and will cause instability",
logPrefix);
return delegate.getResolvedDataConnectors();
}
@@ -112,7 +112,7 @@ import org.slf4j.LoggerFactory;
public void recordDataConnectorResolution(@Nonnull final DataConnector connector,
@Nullable final Map<String, IdPAttribute> attributes) throws ResolutionException {
log.error(
- "'{}' Use of workContext.recordDataConnectorResolution() is deprecated and will cause instabilty",
+ "'{}' Use of workContext.recordDataConnectorResolution() is deprecated and will cause instability",
logPrefix);
delegate.recordDataConnectorResolution(connector, attributes);
}
@@ -126,7 +126,7 @@ import org.slf4j.LoggerFactory;
*/
public void recordFailoverResolution(@Nonnull final DataConnector failedConnector,
@Nonnull final DataConnector failoverConnector) throws ResolutionException {
- log.error("'{}' Use of workContext.recordFailoverResolution() is deprecated and will cause instabilty",
+ log.error("'{}' Use of workContext.recordFailoverResolution() is deprecated and will cause instability",
logPrefix);
delegate.recordFailoverResolution(failedConnector, failoverConnector);
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalNameAttributeDefinition.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalNameAttributeDefinition.java
index d155bbd..8f64409 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalNameAttributeDefinition.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalNameAttributeDefinition.java
@@ -41,7 +41,7 @@ public class PrincipalNameAttributeDefinition extends AbstractAttributeDefinitio
final String principalName = StringSupport.trimOrNull(resolutionContext.getPrincipal());
if (null == principalName) {
- throw new ResolutionException(getLogPrefix() + " provided prinicipal name was empty");
+ throw new ResolutionException(getLogPrefix() + " provided principal name was empty");
}
final IdPAttribute attribute = new IdPAttribute(getId());
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/SubjectDerivedAttributeValuesFunction.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/SubjectDerivedAttributeValuesFunction.java
index 6177947..af71ddf 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/SubjectDerivedAttributeValuesFunction.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/SubjectDerivedAttributeValuesFunction.java
@@ -104,7 +104,7 @@ public class SubjectDerivedAttributeValuesFunction extends AbstractIdentifiableI
}
}
if (results.isEmpty()) {
- log.info("{} generated no values, attrribute no resolved.", getLogPrefix());
+ log.info("{} generated no values, attribute no resolved.", getLogPrefix());
return null;
}
log.debug("{} Generated {} values.", getLogPrefix(), results.size());
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeDefinition.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeDefinition.java
index f55f10a..61a294d 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeDefinition.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeDefinition.java
@@ -210,7 +210,7 @@ public class TemplateAttributeDefinition extends AbstractAttributeDefinition {
final List<IdPAttributeValue<?>> valueList = new ArrayList<>(valueCount);
for (int i = 0; i < valueCount; i++) {
- log.debug("{} Determing value {}", getLogPrefix(), i + 1);
+ log.debug("{} Determining value {}", getLogPrefix(), i + 1);
final VelocityContext velocityContext = new VelocityContext();
// Build velocity context.
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
index 5f73fbb..2a54f23 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
@@ -424,7 +424,7 @@ public class AttributeResolverImpl extends AbstractServiceableComponent<Attribut
resolveDataConnector(pluginId, resolutionContext);
} else {
// This will not happen for as long as we test this in initialization
- throw new ResolutionException("Plugin '" + plugin.getId() + "' contains a depedency on plugin '"
+ throw new ResolutionException("Plugin '" + plugin.getId() + "' contains a dependency on plugin '"
+ pluginId + "' which does not exist.");
}
}
@@ -545,7 +545,7 @@ public class AttributeResolverImpl extends AbstractServiceableComponent<Attribut
if (circularCheckPluginId.equals(dependency.getDependencyPluginId())) {
throw new ComponentInitializationException(logPrefix + " Plugin '" + circularCheckPluginId
+ "' and plugin '" + dependency.getDependencyPluginId()
- + "' have a circular dependecy on each other.");
+ + "' have a circular dependency on each other.");
}
final String dependencyType;
if (dependency instanceof ResolverAttributeDefinitionDependency) {
diff --git a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/requestContextUnimplemented.script b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/requestContextUnimplemented.script
index 0f8768d..81dc413 100644
--- a/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/requestContextUnimplemented.script
+++ b/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/requestContextUnimplemented.script
@@ -7,7 +7,7 @@ requestContext.getLocalEntityMetadata();
requestContext.getLocalEntityRole();
requestContext.getLocalEntityRoleMetadata();
requestContext.getMetadataResolver();
-requestContext.getOuboundSAMLMessageSigningCredential();
+requestContext.getOutboundSAMLMessageSigningCredential();
requestContext.getOutboundMessageArtifactType();
requestContext.getOutboundSAMLMessage();
requestContext.getOutboundSAMLMessageId();
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java
index 17cc625..d20c951 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java
@@ -167,7 +167,7 @@ public abstract class BaseAttributeDefinitionParser extends BaseResolverPluginPa
* Ask the specific parser of it needs attributeSourceID. We used to use this to log several misconfiguration possibilities,
* These days the attribute is irrelevant if you avoid <Dependency> so this is here purely for backwards API compatibility.
*
- * @return Whether the attribute definition for this parser meeds attributeSourceID.
+ * @return Whether the attribute definition for this parser needs attributeSourceID.
*/
protected boolean needsAttributeSourceID() {
return false;
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java
index f957896..ace0f69 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java
@@ -122,7 +122,7 @@ public class CacheConfigParser {
final BeanDefinitionBuilder cache;
if (expireAfterWrite != null) {
if (null != expireAfterAccess || null != elementTimeToLive) {
- log.warn("ResultCache: Attribute 'expireAfterAccess' is mututally exclusive with 'expireAfterWrite'."
+ log.warn("ResultCache: Attribute 'expireAfterAccess' is mutually exclusive with 'expireAfterWrite'."
+ " Used 'expireAfterWrite'.");
}
cache = BeanDefinitionBuilder.rootBeanDefinition(CacheConfigParser.class, "buildCacheWrite");
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
index e9cc04d..115535a 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
@@ -377,7 +377,8 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
return result.getBeanDefinition();
}
- /** Get the textual content of the <FilterTemplate>.
+ /**
+ * Get the textual content of the <FilterTemplate>.
*
* We have to look in two places and warn appropriately.
* @return the filter or null.
@@ -391,7 +392,7 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
final String filter;
if (!filterElements.isEmpty()) {
if (filterElements.size() > 1) {
- log.warn("{} only one <FilterTemlate> can be specifed; only the first has been consulted",
+ log.warn("{} only one <FilterTemplate> can be specified; only the first has been consulted",
getLogPrefix());
}
filter = StringSupport.trimOrNull(filterElements.get(0).getTextContent().trim());
@@ -474,7 +475,7 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
if (!returnAttrsElements.isEmpty()) {
if (returnAttrsElements.size() > 1) {
- log.warn("{} Only one <ReturnAttibutes> element can be specified; "+
+ log.warn("{} Only one <ReturnAttributes> element can be specified; "+
"only the first has been consulted.", getLogPrefix());
}
final Element returnAttrsElement = returnAttrsElements.get(0);
@@ -509,7 +510,7 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
return null;
}
if (poolConfigElements.size() > 1) {
- log.warn("{} Only one <ConnectionPool> should be specied; only the first has been consulted.",
+ log.warn("{} Only one <ConnectionPool> should be specified; only the first has been consulted.",
getLogPrefix());
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list