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 2016/12/11 16:50:34 UTC
svn commit: r1773588 - in /myfaces/tobago/trunk: tobago-example/pom.xml
tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
tobago-extension/tobago-sandbox/pom.xml tobago-theme/pom.xml
Author: lofwyr
Date: Sun Dec 11 16:50:34 2016
New Revision: 1773588
URL: http://svn.apache.org/viewvc?rev=1773588&view=rev
Log:
TOBAGO-1665: Leave out some themes and examples from the release
Modified:
myfaces/tobago/trunk/tobago-example/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml
myfaces/tobago/trunk/tobago-theme/pom.xml
Modified: myfaces/tobago/trunk/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/pom.xml?rev=1773588&r1=1773587&r2=1773588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/pom.xml Sun Dec 11 16:50:34 2016
@@ -27,12 +27,12 @@
<artifactId>tobago-example</artifactId>
<modules>
- <module>tobago-example-addressbook</module>
+ <!--<module>tobago-example-addressbook</module>-->
<module>tobago-example-blank</module>
<module>tobago-example-data</module>
<module>tobago-example-demo</module>
<module>tobago-example-portlet</module>
- <module>tobago-example-test</module>
+ <!--<module>tobago-example-test</module>-->
<module>tobago-example-assembly</module>
</modules>
@@ -131,26 +131,11 @@
<dependencies>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-charlotteville</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-scarborough</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-speyside</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-richmond</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-standard</artifactId>
<version>${project.version}</version>
</dependency>
@@ -174,6 +159,32 @@
<profiles>
<profile>
+ <id>all-modules</id>
+ <modules>
+ <module>tobago-example-addressbook</module>
+ <module>tobago-example-test</module>
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-theme-charlotteville</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-theme-scarborough</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-theme-richmond</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
<id>jsf-provided</id>
<activation>
<property>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml?rev=1773588&r1=1773587&r2=1773588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml Sun Dec 11 16:50:34 2016
@@ -31,12 +31,14 @@
</after>
</ordering>
+<!-- using all available themes, if this is not set -->
<theme-config>
<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>
+ <!-- TODO: Can be removed after closing TOBAGO-1664 -->
+ <!--<supported-theme>scarborough</supported-theme>-->
+ <!--<supported-theme>richmond</supported-theme>-->
+ <!--<supported-theme>charlotteville</supported-theme>-->
</theme-config>
<resource-dir>tobago-resource</resource-dir>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml?rev=1773588&r1=1773587&r2=1773588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml Sun Dec 11 16:50:34 2016
@@ -219,12 +219,7 @@
</dependency>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-standard</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-scarborough</artifactId>
+ <artifactId>tobago-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: myfaces/tobago/trunk/tobago-theme/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/pom.xml?rev=1773588&r1=1773587&r2=1773588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/pom.xml Sun Dec 11 16:50:34 2016
@@ -49,10 +49,10 @@
<modules>
<module>tobago-theme-standard</module>
- <module>tobago-theme-scarborough</module>
+ <!--<module>tobago-theme-scarborough</module>-->
<module>tobago-theme-speyside</module>
- <module>tobago-theme-richmond</module>
- <module>tobago-theme-charlotteville</module>
+ <!--<module>tobago-theme-richmond</module>-->
+ <!--<module>tobago-theme-charlotteville</module>-->
</modules>
<dependencies>
@@ -64,6 +64,16 @@
</dependencies>
<profiles>
+
+ <profile>
+ <id>all-modules</id>
+ <modules>
+ <module>tobago-theme-scarborough</module>
+ <module>tobago-theme-richmond</module>
+ <module>tobago-theme-charlotteville</module>
+ </modules>
+ </profile>
+
<profile>
<id>rebuild-theme</id>
<build>