[seam-commits] Seam SVN: r11287 - in branches/community/Seam_2_2: examples and 3 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Mon Jul 13 17:06:19 EDT 2009
Author: norman.richards at jboss.com
Date: 2009-07-13 17:06:19 -0400 (Mon, 13 Jul 2009)
New Revision: 11287
Modified:
branches/community/Seam_2_2/build/root.pom.xml
branches/community/Seam_2_2/examples/blog/resources/WEB-INF/pages.xml
branches/community/Seam_2_2/examples/blog/view/menu.xhtml
branches/community/Seam_2_2/examples/build.xml
branches/community/Seam_2_2/examples/itext/resources/WEB-INF/components.xml
branches/community/Seam_2_2/examples/itext/resources/WEB-INF/pages.xml
Log:
revert mistaken commit
Modified: branches/community/Seam_2_2/build/root.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/root.pom.xml 2009-07-13 20:58:26 UTC (rev 11286)
+++ branches/community/Seam_2_2/build/root.pom.xml 2009-07-13 21:06:19 UTC (rev 11287)
@@ -350,11 +350,11 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-atom-provider</artifactId>
- <version>1.1-RC2</version>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-atom-provider</artifactId>
+ <version>1.1-RC2</version>
+ </dependency>
<dependency>
<groupId>org.hibernate</groupId>
@@ -852,7 +852,7 @@
<dependency>
<groupId>org.jboss.el</groupId>
<artifactId>jboss-el</artifactId>
- <version>1.0_02.CR5</version>
+ <version>1.0_02.CR4</version>
</dependency>
<dependency>
@@ -1236,14 +1236,14 @@
<artifactId>wicket-datetime</artifactId>
<version>${version.wicket}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.4.2</version>
- </dependency>
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.4.2</version>
Modified: branches/community/Seam_2_2/examples/blog/resources/WEB-INF/pages.xml
===================================================================
--- branches/community/Seam_2_2/examples/blog/resources/WEB-INF/pages.xml 2009-07-13 20:58:26 UTC (rev 11286)
+++ branches/community/Seam_2_2/examples/blog/resources/WEB-INF/pages.xml 2009-07-13 21:06:19 UTC (rev 11287)
@@ -11,7 +11,7 @@
<page view-id="/search.xhtml">
<rewrite pattern="/search/{searchPattern}"/>
- <!-- <rewrite pattern="/search"/> -->
+ <rewrite pattern="/search"/>
<param name="searchPattern"
value="#{searchService.searchPattern}"/>
Modified: branches/community/Seam_2_2/examples/blog/view/menu.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/blog/view/menu.xhtml 2009-07-13 20:58:26 UTC (rev 11286)
+++ branches/community/Seam_2_2/examples/blog/view/menu.xhtml 2009-07-13 21:06:19 UTC (rev 11287)
@@ -5,9 +5,7 @@
xmlns:f="http://java.sun.com/jsf/core">
<span class="menuItem">
- <h:inputText id="field" value="#{searchService.searchPattern}">
- <f:validateLength minimum="3" maximum="5"/>
- </h:inputText>
+ <h:inputText id="field" value="#{searchService.searchPattern}"/>
<h:commandButton id="submit" value="Search" action="/search.xhtml"/>
<s:conversationPropagation type="none"/>
</span>
Modified: branches/community/Seam_2_2/examples/build.xml
===================================================================
--- branches/community/Seam_2_2/examples/build.xml 2009-07-13 20:58:26 UTC (rev 11286)
+++ branches/community/Seam_2_2/examples/build.xml 2009-07-13 21:06:19 UTC (rev 11287)
@@ -1158,22 +1158,17 @@
<fail if="incompatible.jdk">You are using an incompatible JDK 6. Please use Sun JDK 6 Update 4 (1.6.0_04) or newer or use Open JDK 6.</fail>
<taskdef resource="testngtasks" classpathref="test.classpath" />
<testng outputdir="${test-report.dir}">
- <jvmarg line="-Xmx800M" />
- <jvmarg line="-Djava.awt.headless=true" />
- <jvmarg line="-Demma.coverage.out.file=${coverage.ec}" />
- <jvmarg line="-Djava.endorsed.dirs=${endorsed.dir}" />
-
- <jvmarg line="-Xdebug" />
- <jvmarg line="-Xnoagent" />
- <jvmarg line="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000" />
-
+ <jvmarg line="-Xmx800M" />
+ <jvmarg line="-Djava.awt.headless=true" />
+ <jvmarg line="-Demma.coverage.out.file=${coverage.ec}" />
+ <jvmarg line="-Djava.endorsed.dirs=${endorsed.dir}" />
<!--added for JDK6 compatibility with JBoss embedded-->
<jvmarg line="-Dsun.lang.ClassLoader.allowArraySyntax=true"/>
- <jvmarg line="${testng.jvmargs}" />
- <classpath>
- <path refid="test.classpath" />
- <path refid="runtime.emma.path" />
- </classpath>
+ <jvmarg line="${testng.jvmargs}" />
+ <classpath>
+ <path refid="test.classpath" />
+ <path refid="runtime.emma.path" />
+ </classpath>
<xmlfileset dir="${src.test.dir}" includes="**/testng.xml" />
</testng>
<echo>You can increase the logging by editing bootstrap/log4j.xml</echo>
Modified: branches/community/Seam_2_2/examples/itext/resources/WEB-INF/components.xml
===================================================================
--- branches/community/Seam_2_2/examples/itext/resources/WEB-INF/components.xml 2009-07-13 20:58:26 UTC (rev 11286)
+++ branches/community/Seam_2_2/examples/itext/resources/WEB-INF/components.xml 2009-07-13 21:06:19 UTC (rev 11287)
@@ -1,7 +1,6 @@
<components xmlns="http://jboss.com/products/seam/components"
xmlns:pdf="http://jboss.com/products/seam/pdf"
xmlns:core="http://jboss.com/products/seam/core"
- xmlns:navigation="http://jboss.com/products/seam/navigation"
xmlns:framework="http://jboss.com/products/seam/framework"
xmlns:web="http://jboss.com/products/seam/web"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -16,8 +15,6 @@
<property name="errorPage">/pdfMissing.seam</property>
</component>
- <navigation:pages https-port="8443" />
-
<pdf:key-store-config key-store="pdf.keystore"
key-store-password="storepass"
key-password="keypass"
Modified: branches/community/Seam_2_2/examples/itext/resources/WEB-INF/pages.xml
===================================================================
--- branches/community/Seam_2_2/examples/itext/resources/WEB-INF/pages.xml 2009-07-13 20:58:26 UTC (rev 11286)
+++ branches/community/Seam_2_2/examples/itext/resources/WEB-INF/pages.xml 2009-07-13 21:06:19 UTC (rev 11287)
@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<pages xmlns="http://jboss.com/products/seam/pages"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.2.xsd">
+<pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.2.xsd">
-<!--
- <page view-id="/index.xhtml" action="#{mtest.pingxzckjczxljkc}" />
- <page view-id="/foo.xhtml" action="#{mtdsfdsfest.ping}" />
--->
- <page view-id="/lists.xhtml" scheme="https" />
-
-
</pages>
More information about the seam-commits
mailing list