Author: lindner
Date: Mon Mar 30 21:21:10 2009
New Revision: 760179
URL: http://svn.apache.org/viewvc?rev=760179&view=rev
Log:
SHINDIG-999 | fix spelling of preferred
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java?rev=760179&r1=760178&r2=760179&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java
(original)
+++
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java
Mon Mar 30 21:21:10 2009
@@ -456,8 +456,8 @@
protected String politicalViews;
@Basic
- @Column(name = "prefferedUsername", length = 255)
- protected String prefferedUsername;
+ @Column(name = "preferredUsername", length = 255)
+ protected String preferredUsername;
/**
*
@@ -926,12 +926,12 @@
this.politicalViews = politicalViews;
}
- public String getPrefferedUsername() {
- return prefferedUsername;
+ public String getPreferredUsername() {
+ return preferredUsername;
}
- public void setPrefferedUsername(String prefferedUsername) {
- this.prefferedUsername = prefferedUsername;
+ public void setPreferredUsername(String preferredUsername) {
+ this.preferredUsername = preferredUsername;
}
public Url getProfileSong() {
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java?rev=760179&r1=760178&r2=760179&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/PersonImpl.java
Mon Mar 30 21:21:10 2009
@@ -79,7 +79,7 @@
private List<ListField> phoneNumbers;
private List<ListField> photos;
private String politicalViews;
- private String prefferedUsername;
+ private String preferredUsername;
private Url profileSong;
private Url profileVideo;
private List<String> quotes;
@@ -452,12 +452,12 @@
this.politicalViews = politicalViews;
}
- public String getPrefferedUsername() {
- return prefferedUsername;
+ public String getPreferredUsername() {
+ return preferredUsername;
}
- public void setPrefferedUsername(String prefferedUsername) {
- this.prefferedUsername = prefferedUsername;
+ public void setPreferredUsername(String preferredUsername) {
+ this.preferredUsername = preferredUsername;
}
public Url getProfileSong() {
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java?rev=760179&r1=760178&r2=760179&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
Mon Mar 30 21:21:10 2009
@@ -163,7 +163,7 @@
/** the json field for politicalViews. */
POLITICAL_VIEWS("politicalViews"),
/** the json field for preferredUsername */
- PREFFERED_USERNAME("preferredUsername"),
+ PREFERRED_USERNAME("preferredUsername"),
/** the json field for profileSong. */
PROFILE_SONG("profileSong"),
/** the json field for profileUrl. */
@@ -877,18 +877,18 @@
void setPoliticalViews(String politicalViews);
/**
- * Get the Person's preffered username, specified as a string. Container
support for this field is OPTIONAL
+ * Get the Person's preferred username, specified as a string. Container
support for this field is OPTIONAL
*
- * @return the Person's preffered username
+ * @return the Person's preferred username
*/
- String getPrefferedUsername();
+ String getPreferredUsername();
/**
- * Set the Person's preffered username, specified as a string. Container
support for this field is OPTIONAL
+ * Set the Person's preferred username, specified as a string. Container
support for this field is OPTIONAL
*
- * @param prefferedString the Person's preffered username
+ * @param preferredString the Person's preferred username
*/
- void setPrefferedUsername(String prefferedString);
+ void setPreferredUsername(String preferredString);
/**
* Get the Person's profile song, specified as an {...@link Url}. Container
support for this field
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java?rev=760179&r1=760178&r2=760179&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java
Mon Mar 30 21:21:10 2009
@@ -253,7 +253,12 @@
HttpServletResponse response, boolean sendBody)
throws IOException, ServletException {
String realm = (request.isSecure()) ? "https://"; : "http://";;
- realm += request.getLocalName();
+
+ if (request.getHeader("Host") != null) {
+ realm += request.getHeader("Host");
+ } else {
+ realm += request.getLocalName();
+ }
OAuthServlet.handleException(response, e, realm, sendBody);
}
