You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/10/29 10:38:02 UTC
svn commit: r1536623 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/context/
tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/
tobago-example/tobago-example-demo/src/m...
Author: lofwyr
Date: Tue Oct 29 09:38:02 2013
New Revision: 1536623
URL: http://svn.apache.org/r1536623
Log:
TOBAGO-1336: Remove WML detection
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml
myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/web.xml
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/ClientConfigController.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java?rev=1536623&r1=1536622&r2=1536623&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java Tue Oct 29 09:38:02 2013
@@ -73,17 +73,6 @@ public class ClientProperties implements
ExternalContext externalContext = facesContext.getExternalContext();
- // content type
- String accept = (String) externalContext.getRequestHeaderMap().get("Accept");
- if (accept != null) {
- if (accept.indexOf("text/vnd.wap.wml") > -1) {
- contentType = "wml";
- }
- }
- if (LOG.isDebugEnabled()) {
- LOG.debug("contentType='" + contentType + "' from header " + "Accept='" + accept + "'");
- }
-
// user agent
String requestUserAgent = (String) externalContext.getRequestHeaderMap().get("User-Agent");
this.userAgent = UserAgent.getInstance(requestUserAgent);
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java?rev=1536623&r1=1536622&r2=1536623&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java Tue Oct 29 09:38:02 2013
@@ -45,9 +45,6 @@ public class ClientConfigController {
private Locale locale;
- private String contentType;
- private SelectItem[] contentTypeItems;
-
public ClientConfigController() {
// theme
@@ -67,14 +64,6 @@ public class ClientConfigController {
locale = facesContext.getViewRoot().getLocale();
- // contentType
-
- contentTypeItems = new SelectItem[]{
- new SelectItem("html"),
- new SelectItem("wml", "wml (experimental)"),
- new SelectItem("fo", "fo (experimental)")
- };
-
// load
loadFromClientProperties();
@@ -208,19 +197,4 @@ public class ClientConfigController {
this.locale = locale;
}
- public String getContentType() {
- return contentType;
- }
-
- public void setContentType(String contentType) {
- this.contentType = contentType;
- }
-
- public SelectItem[] getContentTypeItems() {
- return contentTypeItems;
- }
-
- public void setContentTypeItems(SelectItem[] contentTypeItems) {
- this.contentTypeItems = contentTypeItems;
- }
}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml?rev=1536623&r1=1536622&r2=1536623&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml Tue Oct 29 09:38:02 2013
@@ -308,7 +308,7 @@
<li style="line-height: 130%;">Tobago reacts on the value delivered by the HTTP header 'User-Agent' to decide which controls have to be rendered.</li>
<li style="line-height: 130%;">Control defaulting: The implentation of themes can be both browser independant and based on other themes to prevent code redundancy.</li>
<li style="line-height: 130%;">More browsers can be supported easily.</li>
- <li style="line-height: 130%;">Additional clients are supported, too: HTML, Simple HTML, WML</li>
+ <li style="line-height: 130%;">Additional clients are supported, too: HTML, Simple HTML</li>
</ul>
</entry>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml?rev=1536623&r1=1536622&r2=1536623&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml Tue Oct 29 09:38:02 2013
@@ -192,7 +192,7 @@
<!-- browser -->
<entry key="browser_sampleTitle">Browser Beispiel</entry>
- <entry key="browser_text">Mit Tobago werden Webanwendungen unabhängig von Browsern entwickelt. Die Unterstützung verschiedener Browser findet im JSF Render Kit statt und hat keinen direkten Einfluss auf die Entwicklung der Businesslogik. <ul style="margin-top: 2px;"> <li style="line-height: 130%;">Tobago unterstützt gängige Browser: Internet Explorer, Mozilla und Netscape</li> <li style="line-height: 130%;">Tobago reagiert auf den HTTP Header 'User-Agent' und kann basierend auf den verwendeten Browser Spezialisierungen von Controls auswählen.</li> <li style="line-height: 130%;">Control Defaulting: Die Implementierung von Controls kann sich auf eine Browser-unabhängige Standardimplementierung oder auch auf ein anderes Theme abstützen.</li> <li style="line-height: 130%;">Die Browserunterstützung ist erweiterbar.</li> <li style="line-height: 130%;">Unterstützung unterschiedlicher Arten von Clients:
HTML, Simple HTML, WML</li> </ul></entry>
+ <entry key="browser_text">Mit Tobago werden Webanwendungen unabhängig von Browsern entwickelt. Die Unterstützung verschiedener Browser findet im JSF Render Kit statt und hat keinen direkten Einfluss auf die Entwicklung der Businesslogik. <ul style="margin-top: 2px;"> <li style="line-height: 130%;">Tobago unterstützt gängige Browser: Internet Explorer, Mozilla und Netscape</li> <li style="line-height: 130%;">Tobago reagiert auf den HTTP Header 'User-Agent' und kann basierend auf den verwendeten Browser Spezialisierungen von Controls auswählen.</li> <li style="line-height: 130%;">Control Defaulting: Die Implementierung von Controls kann sich auf eine Browser-unabhängige Standardimplementierung oder auch auf ein anderes Theme abstützen.</li> <li style="line-height: 130%;">Die Browserunterstützung ist erweiterbar.</li> <li style="line-height: 130%;">Unterstützung unterschiedlicher Arten von Clients:
HTML, Simple HTML</li> </ul></entry>
<!-- locale -->
<entry key="locale_title">Sprach- und länderspezifische Einstellungen</entry>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/web.xml?rev=1536623&r1=1536622&r2=1536623&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/web.xml Tue Oct 29 09:38:02 2013
@@ -113,16 +113,6 @@
<env-entry-value>Development</env-entry-value>
</env-entry>
- <!-- mime -->
- <mime-mapping>
- <extension>wml</extension>
- <mime-type>text/vnd.wap.wml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>wbmp</extension>
- <mime-type>image/vnd.wap.wbmp</mime-type>
- </mime-mapping>
-
<!-- The Usual Welcome File List -->
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/ClientConfigController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/ClientConfigController.java?rev=1536623&r1=1536622&r2=1536623&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/ClientConfigController.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/ClientConfigController.java Tue Oct 29 09:38:02 2013
@@ -41,9 +41,6 @@ public class ClientConfigController {
private Locale locale;
- private String contentType;
- private SelectItem[] contentTypeItems;
-
public ClientConfigController() {
// theme
@@ -63,14 +60,6 @@ public class ClientConfigController {
locale = facesContext.getViewRoot().getLocale();
- // contentType
-
- contentTypeItems = new SelectItem[]{
- new SelectItem("html"),
- new SelectItem("wml", "wml (experimental)"),
- new SelectItem("fo", "fo (experimental)")
- };
-
// load
loadFromClientProperties();
@@ -179,19 +168,4 @@ public class ClientConfigController {
this.locale = locale;
}
- public String getContentType() {
- return contentType;
- }
-
- public void setContentType(String contentType) {
- this.contentType = contentType;
- }
-
- public SelectItem[] getContentTypeItems() {
- return contentTypeItems;
- }
-
- public void setContentTypeItems(SelectItem[] contentTypeItems) {
- this.contentTypeItems = contentTypeItems;
- }
}