You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2007/02/10 12:35:13 UTC
svn commit: r505675 - in /myfaces/tobago/trunk: ./ example/
example/demo/src/main/webapp/ example/demo/src/main/webapp/overview/
example/test/src/main/webapp/WEB-INF/ tobago-tool/gendoc/
tobago-tool/gendoc/src/main/webapp/META-INF/
Author: bommel
Date: Sat Feb 10 03:35:11 2007
New Revision: 505675
URL: http://svn.apache.org/viewvc?view=rev&rev=505675
Log:
some cleanup
added staging profile
added myfaces-staging repository in a profile
added latest version of jetty-plugin
Modified:
myfaces/tobago/trunk/example/demo/src/main/webapp/menu.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.jsp
myfaces/tobago/trunk/example/pom.xml
myfaces/tobago/trunk/example/test/src/main/webapp/WEB-INF/tobago-config.xml
myfaces/tobago/trunk/example/test/src/main/webapp/WEB-INF/web.xml
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml
myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/META-INF/context.xml
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/menu.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/menu.jsp?view=diff&rev=505675&r1=505674&r2=505675
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/menu.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/menu.jsp Sat Feb 10 03:35:11 2007
@@ -48,7 +48,7 @@
label="#{overviewBundle.menu_about}" />
<tc:menuItem onclick="LOG.show();"
label="#{overviewBundle.menu_showLog}"
- rendered="#{clientConfigController.debugMode}"/>
+ rendered="#{!clientConfigController.debugMode}"/>
</tc:menu>
</tc:menuBar>
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.jsp?view=diff&rev=505675&r1=505674&r2=505675
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.jsp Sat Feb 10 03:35:11 2007
@@ -50,7 +50,7 @@
label="#{overviewBundle.toolbar_popupButtonAction}">
<f:facet name="popup">
- <tc:popup width="200" height="100" id="popup" >
+ <tc:popup width="200" height="100" id="popup" modal="false">
<f:facet name="layout">
<tc:gridLayout rows="35px;1*;fixed" />
Modified: myfaces/tobago/trunk/example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/pom.xml?view=diff&rev=505675&r1=505674&r2=505675
==============================================================================
--- myfaces/tobago/trunk/example/pom.xml (original)
+++ myfaces/tobago/trunk/example/pom.xml Sat Feb 10 03:35:11 2007
@@ -32,12 +32,14 @@
<url>http://svn.apache.org/viewcvs.cgi/myfaces/tobago/trunk/example</url>
</scm>
- <!--<build>
+ <build>
<plugins>
<plugin>
+ <!-- NOTE The demo run only with mvn jetty:run-exploded.
+ For the other examples mvn jetty:run should work.-->
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.0.1</version>
+ <version>6.1.1</version>
<configuration>
<systemProperties>
<systemProperty>
@@ -48,14 +50,7 @@
</configuration>
</plugin>
</plugins>
- </build>-->
-
- <repositories>
- <repository>
- <id>atanion</id>
- <url>http://www.atanion.com/maven2</url>
- </repository>
- </repositories>
+ </build>
<pluginRepositories>
<pluginRepository>
@@ -65,8 +60,8 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
- <id>atanion</id>
- <url>http://www.atanion.com/maven2</url>
+ <id>codehaus-snapshots</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
</pluginRepository>
</pluginRepositories>
Modified: myfaces/tobago/trunk/example/test/src/main/webapp/WEB-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/WEB-INF/tobago-config.xml?view=diff&rev=505675&r1=505674&r2=505675
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/WEB-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/WEB-INF/tobago-config.xml Sat Feb 10 03:35:11 2007
@@ -27,4 +27,5 @@
</theme-config>
<resource-dir>tobago-resource</resource-dir>
+ <ajax-enabled>true</ajax-enabled>
</tobago-config>
Modified: myfaces/tobago/trunk/example/test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/WEB-INF/web.xml?view=diff&rev=505675&r1=505674&r2=505675
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/WEB-INF/web.xml Sat Feb 10 03:35:11 2007
@@ -81,6 +81,13 @@
<url-pattern>/faces/SolarDetail</url-pattern>
</servlet-mapping>
<env-entry>
+ <description>
+ Set the size limit for uploaded files. Default value is 1 MB.
+ Format: 10 = 10 bytes
+ 10k = 10 KB
+ 10m = 10 MB
+ 1g = 1 GB
+ </description>
<env-entry-name>uploadMaxFileSize</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>1m</env-entry-value>
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?view=diff&rev=505675&r1=505674&r2=505675
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Sat Feb 10 03:35:11 2007
@@ -221,7 +221,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<configuration>
<aggregate>true</aggregate>
<links>
@@ -613,11 +613,11 @@
</modules>
<distributionManagement>
- <repository>
- <id>myfaces-staging</id>
- <name>Apache MyFaces Staging Repository</name>
- <url>scpexe://people.apache.org/www/people.apache.org/builds/myfaces/m2-staging-repository</url>
- </repository>
+ <repository>
+ <id>apache-maven</id>
+ <name>Apache Maven Repository</name>
+ <url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+ </repository>
<snapshotRepository>
<uniqueVersion>false</uniqueVersion>
<id>apache-maven-snapshots</id>
@@ -649,6 +649,25 @@
</modules>
</profile>
<profile>
+ <id>staging</id>
+ <build>
+ <plugins>
+ <!-- We want to deploy the artifact to a staging location for perusal
+ mvn -Pstaging -Ddeploy.altRepository=scpexe://minotaur.apache.org/www/people.apache.org/builds/myfaces/m2-staging-repository</url>
+ </repository>-->
+ <plugin>
+ <inherited>true</inherited>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
+ <updateReleaseInfo>true</updateReleaseInfo>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>release</id>
<!--
NOTE: To use you need to enable this profile and pass in the passphrase:
@@ -671,7 +690,7 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.0.2</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -683,7 +702,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -710,6 +729,18 @@
<module>contrib</module>
<module>example</module>
</modules>
+ </profile>
+ <profile>
+ <id>myfaces-staging-repository</id>
+ <repositories>
+ <repository>
+ <id>myfaces-staging-repository</id>
+ <url>http://people.apache.org/builds/myfaces/m2-staging-repository/</url>
+ </repository>
+ </repositories>
+ <properties>
+ <myfaces.version>1.1.5</myfaces.version>
+ </properties>
</profile>
</profiles>
Modified: myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml?view=diff&rev=505675&r1=505674&r2=505675
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml Sat Feb 10 03:35:11 2007
@@ -15,7 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
@@ -53,6 +55,11 @@
</plugins>
</build>
<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>
Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/META-INF/context.xml?view=diff&rev=505675&r1=505674&r2=505675
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/META-INF/context.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/META-INF/context.xml Sat Feb 10 03:35:11 2007
@@ -17,7 +17,6 @@
* limitations under the License.
-->
<!--
- Context configuration file for the Tomcat Manager Web App
antiResourceLocking is needed for proper redeploy under Windows.
-->