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/08/17 21:42:28 UTC
svn commit: r1515038 - in /myfaces/tobago/trunk: src/docbook/
tobago-core/src/main/java/org/apache/myfaces/tobago/context/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal...
Author: lofwyr
Date: Sat Aug 17 19:42:28 2013
New Revision: 1515038
URL: http://svn.apache.org/r1515038
Log:
TOBAGO-1297: Remove "deprecated-name" from theme definition
Modified:
myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ThemeParser.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeBuilder.java
myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-2.0.xsd
myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config.xml
myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config2.xml
myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config3.xml
myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config4.xml
myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
Modified: myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml?rev=1515038&r1=1515037&r2=1515038&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml (original)
+++ myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml Sat Aug 17 19:42:28 2013
@@ -883,9 +883,6 @@ tobago-resource/html/standard/standard/i
<programlisting role="XML"><tobago-theme>
<name>example</name>
- <deprecated-name>
- org.apache.myfaces.tobago.context.ExampleTheme
- </deprecated-name>
<resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
<emphasis role="bold"><fallback>speyside</fallback></emphasis>
<renderers>
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java?rev=1515038&r1=1515037&r2=1515038&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ThemeImpl.java Sat Aug 17 19:42:28 2013
@@ -40,8 +40,6 @@ public class ThemeImpl implements Theme,
private String displayName;
- private String deprecatedName;
-
private String resourcePath;
private ThemeImpl fallback;
@@ -84,14 +82,6 @@ public class ThemeImpl implements Theme,
this.displayName = displayName;
}
- public String getDeprecatedName() {
- return deprecatedName;
- }
-
- public void setDeprecatedName(String deprecatedName) {
- this.deprecatedName = deprecatedName;
- }
-
public String getResourcePath() {
return resourcePath;
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ThemeParser.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ThemeParser.java?rev=1515038&r1=1515037&r2=1515038&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ThemeParser.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ThemeParser.java Sat Aug 17 19:42:28 2013
@@ -54,7 +54,6 @@ public class ThemeParser {
// todo digester.setValidating(true);
digester.setValidating(false);
digester.addCallMethod("tobago-theme/name", "setName", 0);
- digester.addCallMethod("tobago-theme/deprecated-name", "setDeprecatedName", 0);
digester.addCallMethod("tobago-theme/display-name", "setDisplayName", 0);
digester.addCallMethod("tobago-theme/resource-path", "setResourcePath", 0);
digester.addCallMethod("tobago-theme/fallback", "setFallbackName", 0);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java?rev=1515038&r1=1515037&r2=1515038&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java Sat Aug 17 19:42:28 2013
@@ -136,7 +136,6 @@ public class TobagoConfigParser {
digester.addObjectCreate("tobago-config/theme-definitions/theme-definition", ThemeImpl.class);
digester.addSetNext("tobago-config/theme-definitions/theme-definition", "addThemeDefinition");
digester.addCallMethod("tobago-config/theme-definitions/theme-definition/name", "setName", 0);
- digester.addCallMethod("tobago-config/theme-definitions/theme-definition/deprecated-name", "setDeprecatedName", 0);
digester.addCallMethod("tobago-config/theme-definitions/theme-definition/display-name", "setDisplayName", 0);
digester.addCallMethod("tobago-config/theme-definitions/theme-definition/resource-path", "setResourcePath", 0);
digester.addCallMethod("tobago-config/theme-definitions/theme-definition/fallback", "setFallbackName", 0);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeBuilder.java?rev=1515038&r1=1515037&r2=1515038&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeBuilder.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeBuilder.java Sat Aug 17 19:42:28 2013
@@ -64,11 +64,6 @@ class ThemeBuilder {
result.put(theme.getName(), theme);
}
for (ThemeImpl theme : availableThemes) {
- if (theme.getDeprecatedName() != null) {
- result.put(theme.getDeprecatedName(), theme);
- }
- }
- for (ThemeImpl theme : availableThemes) {
theme.resolveResources();
}
for (ThemeImpl theme : availableThemes) {
Modified: myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-2.0.xsd
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-2.0.xsd?rev=1515038&r1=1515037&r2=1515038&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-2.0.xsd (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-2.0.xsd Sat Aug 17 19:42:28 2013
@@ -128,7 +128,6 @@
<xs:sequence>
<xs:element name="name" type="xs:string"/>
<xs:element name="display-name" type="xs:string" minOccurs="0"/>
- <xs:element name="deprecated-name" type="xs:string" minOccurs="0"/>
<xs:element name="resource-path" type="xs:string"/>
<xs:element name="fallback" type="xs:string" minOccurs="0"/>
<xs:element name="versioned" type="xs:boolean" minOccurs="0" default="false"/>
Modified: myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config.xml?rev=1515038&r1=1515037&r2=1515038&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config.xml (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config.xml Sat Aug 17 19:42:28 2013
@@ -20,7 +20,6 @@
<tobago-theme>
<name>test</name>
<display-name>Test</display-name>
- <deprecated-name>Test</deprecated-name>
<resource-path>Test</resource-path>
<resources production="true">
<script name="script/tobago.min.js"/>
Modified: myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config2.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config2.xml?rev=1515038&r1=1515037&r2=1515038&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config2.xml (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config2.xml Sat Aug 17 19:42:28 2013
@@ -20,7 +20,6 @@
<tobago-theme>
<name>test2</name>
<display-name>Test2</display-name>
- <deprecated-name>Test2</deprecated-name>
<resource-path>Test2</resource-path>
<fallback>test</fallback>
<resources production="false">
Modified: myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config3.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config3.xml?rev=1515038&r1=1515037&r2=1515038&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config3.xml (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config3.xml Sat Aug 17 19:42:28 2013
@@ -20,7 +20,6 @@
<tobago-theme>
<name>test3</name>
<display-name>Test3</display-name>
- <deprecated-name>Test3</deprecated-name>
<resource-path>Test3</resource-path>
<fallback>test2</fallback>
-</tobago-theme>
\ No newline at end of file
+</tobago-theme>
Modified: myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config4.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config4.xml?rev=1515038&r1=1515037&r2=1515038&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config4.xml (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/resources/theme-config4.xml Sat Aug 17 19:42:28 2013
@@ -20,7 +20,6 @@
<tobago-theme>
<name>test4</name>
<display-name>Test4</display-name>
- <deprecated-name>Test4</deprecated-name>
<resource-path>Test4</resource-path>
<fallback>test3</fallback>
-</tobago-theme>
\ No newline at end of file
+</tobago-theme>
Modified: myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-config.xml?rev=1515038&r1=1515037&r2=1515038&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-config.xml Sat Aug 17 19:42:28 2013
@@ -32,7 +32,6 @@
<theme-definition>
<name>example</name>
<display-name>Example Theme</display-name>
- <deprecated-name>org.apache.myfaces.tobago.context.ExampleTheme</deprecated-name>
<resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
<fallback>speyside</fallback>
<renderers>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml?rev=1515038&r1=1515037&r2=1515038&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/tobago-config.xml Sat Aug 17 19:42:28 2013
@@ -32,7 +32,6 @@
<theme-definition>
<name>sandbox</name>
<display-name>Sandbox Theme</display-name>
- <deprecated-name>org.apache.myfaces.tobago.context.SandboxTheme</deprecated-name>
<resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
<fallback>speyside</fallback>
</theme-definition>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml?rev=1515038&r1=1515037&r2=1515038&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml Sat Aug 17 19:42:28 2013
@@ -32,7 +32,6 @@
<theme-definition>
<name>charlotteville</name>
<display-name>Charlotteville</display-name>
- <deprecated-name>org.apache.myfaces.tobago.context.CharlottevilleTheme</deprecated-name>
<resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
<fallback>speyside</fallback>
<versioned>true</versioned>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml?rev=1515038&r1=1515037&r2=1515038&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml Sat Aug 17 19:42:28 2013
@@ -32,7 +32,6 @@
<theme-definition>
<name>richmond</name>
<display-name>Richmond</display-name>
- <deprecated-name>org.apache.myfaces.tobago.context.RichmondTheme</deprecated-name>
<resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
<fallback>speyside</fallback>
<versioned>true</versioned>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml?rev=1515038&r1=1515037&r2=1515038&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml Sat Aug 17 19:42:28 2013
@@ -32,7 +32,6 @@
<theme-definition>
<name>scarborough</name>
<display-name>Scarborough</display-name>
- <deprecated-name>org.apache.myfaces.tobago.context.ScarboroughTheme</deprecated-name>
<resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
<fallback>standard</fallback>
<versioned>true</versioned>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml?rev=1515038&r1=1515037&r2=1515038&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml Sat Aug 17 19:42:28 2013
@@ -33,7 +33,6 @@
<theme-definition>
<name>speyside</name>
<display-name>Speyside</display-name>
- <deprecated-name>org.apache.myfaces.tobago.context.SpeysideTheme</deprecated-name>
<resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
<fallback>scarborough</fallback>
<versioned>true</versioned>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml?rev=1515038&r1=1515037&r2=1515038&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml Sat Aug 17 19:42:28 2013
@@ -28,7 +28,6 @@
<theme-definition>
<name>standard</name>
<display-name>Standard Theme</display-name>
- <deprecated-name>org.apache.myfaces.tobago.context.StandardTheme</deprecated-name>
<resource-path>org/apache/myfaces/tobago/renderkit</resource-path>
<versioned>true</versioned>
<renderers>