missed a few applicationName references, fixed API JSON rendering

openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java

@@ -822,7 +822,7 @@ public class ClientDetailsEntity implements ClientDetails {
 						+ additionalInformation + ", " : "")
 				+ (applicationType != null ? "applicationType="
 						+ applicationType + ", " : "")
-				+ (clientName != null ? "applicationName="
+				+ (clientName != null ? "clientName="
 						+ clientName + ", " : "")
 				+ (tokenEndpointAuthType != null ? "tokenEndpointAuthType="
 						+ tokenEndpointAuthType + ", " : "")

openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientRegistrationView.java

@@ -51,7 +51,7 @@ public class ClientRegistrationView extends AbstractView {
 			if (client.isSecretRequired()) {
 				obj.addProperty("client_secret", client.getClientSecret());
 			}
-			
+
 			if (fullClient) {
 				// TODO: display the rest of the client fields, for now just this to mark changes
 				obj.addProperty("client_name", client.getClientName());
@@ -66,11 +66,7 @@ public class ClientRegistrationView extends AbstractView {
 			
 			if (token != null) {
 				obj.addProperty("registration_access_token", token.getValue());
-				if (token.getExpiration() != null) {
-					obj.addProperty("expires_at", token.getExpiration().getTime()); // TODO: make sure this makes sense?
-				} else {
-					obj.addProperty("expires_at", 0); // TODO: configure expiring client secrets. For now, they don't expire
-				}
+				obj.addProperty("expires_at", 0); // TODO: configure expiring client secrets. For now, they don't expire
 			}
 			
 			Writer out = response.getWriter();

openid-connect-server/src/main/java/org/mitre/openid/connect/view/JsonEntityView.java

@@ -49,6 +49,7 @@ public class JsonEntityView extends AbstractView {
                     }
 
                 })
+                .serializeNulls()
                 .setDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
                 .create();
 

openid-connect-server/src/main/webapp/WEB-INF/views/oauth/approve.jsp

@@ -41,14 +41,14 @@
             	</c:choose>
                 Do you authorize
                     "<c:choose>
-                        <c:when test="${empty client.applicationName}">
+                        <c:when test="${empty client.clientName}">
                             <c:out value="${client.clientId}"/>
                         </c:when>
                         <c:otherwise>
-                            <c:out value="${client.applicationName}"/>
+                            <c:out value="${client.clientName}"/>
                         </c:otherwise>
-                    </c:choose>" to sign you into their site
-                    using your identity?
+                    </c:choose>" 
+                to sign you into their site using your identity?
                     <div>
                     	<a class="small" href="#" onclick="$('#description').toggle('fast'); return false;">more information</a>
 					</div>