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 2015/07/15 16:17:23 UTC
svn commit: r1691225 - in /myfaces/tobago/branches/tobago-3.0.x: tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/ tobago-example/tobago-example-addressbook/ tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/ tobag...

Author: lofwyr
Date: Wed Jul 15 14:17:23 2015
New Revision: 1691225

URL: http://svn.apache.org/r1691225
Log:
TOBAGO-1368: Create a new theme which uses Bootstrap
 - there is no need for an own theme, the "standard" theme uses Bootstrap (now).

Removed:
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-bootstrap/
Modified:
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISegmentLayout.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/tobago-config.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/pom.xml

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISegmentLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISegmentLayout.java?rev=1691225&r1=1691224&r2=1691225&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISegmentLayout.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISegmentLayout.java Wed Jul 15 14:17:23 2015
@@ -29,7 +29,7 @@ import org.apache.myfaces.tobago.layout.
  */
 public abstract class AbstractUISegmentLayout extends AbstractUILayoutBase implements LayoutManager, SupportsMarkup {
 
-  public static final String COMPONENT_FAMILY = "org.apache.myfaces.tobago.BootstrapLayout";
+  public static final String COMPONENT_FAMILY = "org.apache.myfaces.tobago.SegmentLayout";
 
 /*
   public void init() {

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml?rev=1691225&r1=1691224&r2=1691225&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml Wed Jul 15 14:17:23 2015
@@ -264,11 +264,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
-      <artifactId>tobago-theme-bootstrap</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.myfaces.tobago</groupId>
       <artifactId>tobago-core</artifactId>
       <version>${project.version}</version>
       <exclusions>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/tobago-config.xml?rev=1691225&r1=1691224&r2=1691225&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/tobago-config.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/tobago-config.xml Wed Jul 15 14:17:23 2015
@@ -28,7 +28,6 @@
     <supported-theme>scarborough</supported-theme>
     <supported-theme>richmond</supported-theme>
     <supported-theme>charlotteville</supported-theme>
-    <supported-theme>bootstrap</supported-theme>
   </theme-config>
 
   <resource-dir>addressbook-resource</resource-dir>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml?rev=1691225&r1=1691224&r2=1691225&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml Wed Jul 15 14:17:23 2015
@@ -87,11 +87,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
-      <artifactId>tobago-theme-bootstrap</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.myfaces.tobago</groupId>
       <artifactId>tobago-theme-scarborough</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml?rev=1691225&r1=1691224&r2=1691225&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml Wed Jul 15 14:17:23 2015
@@ -32,13 +32,11 @@
   </ordering>
 
   <theme-config>
-    <default-theme>bootstrap</default-theme>
+    <default-theme>standard</default-theme>
     <supported-theme>scarborough</supported-theme>
     <supported-theme>richmond</supported-theme>
     <supported-theme>charlotteville</supported-theme>
     <supported-theme>speyside</supported-theme>
-    <!-- for development -->
-    <supported-theme>standard</supported-theme>
   </theme-config>
 
   <resource-dir>tobago-resource</resource-dir>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml?rev=1691225&r1=1691224&r2=1691225&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml Wed Jul 15 14:17:23 2015
@@ -85,11 +85,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
-      <artifactId>tobago-theme-bootstrap</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.myfaces.tobago</groupId>
       <artifactId>tobago-theme-scarborough</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml?rev=1691225&r1=1691224&r2=1691225&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml Wed Jul 15 14:17:23 2015
@@ -22,13 +22,10 @@
    version="2.0">
 
   <theme-config>
-    <default-theme>bootstrap</default-theme>
+    <default-theme>standard</default-theme>
     <supported-theme>scarborough</supported-theme>
     <supported-theme>richmond</supported-theme>
     <supported-theme>charlotteville</supported-theme>
-    <!--<supported-theme>bootstrap</supported-theme>-->
-    <!-- for development -->
-    <supported-theme>standard</supported-theme>
   </theme-config>
   <resource-dir>tobago-resource</resource-dir>
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/pom.xml?rev=1691225&r1=1691224&r2=1691225&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/pom.xml Wed Jul 15 14:17:23 2015
@@ -62,7 +62,6 @@
     <module>tobago-theme-speyside</module>
     <module>tobago-theme-richmond</module>
     <module>tobago-theme-charlotteville</module>
-    <module>tobago-theme-bootstrap</module> <!-- temporary, todo: remove -->
     <!--    <module>tobago-theme-boccoo</module>-->
   </modules>