[seam-commits] Seam SVN: r11285 - in branches/community/Seam_2_2: build and 4 other directories.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Mon Jul 13 16:57:01 EDT 2009 

Author: norman.richards at jboss.com
Date: 2009-07-13 16:57:01 -0400 (Mon, 13 Jul 2009)
New Revision: 11285

Modified:
   branches/community/Seam_2_2/build/root.pom.xml
   branches/community/Seam_2_2/changelog.txt
   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:
update changelog

Modified: branches/community/Seam_2_2/build/root.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/root.pom.xml	2009-07-13 20:49:44 UTC (rev 11284)
+++ branches/community/Seam_2_2/build/root.pom.xml	2009-07-13 20:57:01 UTC (rev 11285)
@@ -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.CR4</version>
+        <version>1.0_02.CR5</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/changelog.txt
===================================================================
--- branches/community/Seam_2_2/changelog.txt	2009-07-13 20:49:44 UTC (rev 11284)
+++ branches/community/Seam_2_2/changelog.txt	2009-07-13 20:57:01 UTC (rev 11285)
@@ -19,6 +19,7 @@
     * [JBSEAM-4276] - A JBDS generated WAR project with reverse-engineered entities doesn't work
     * [JBSEAM-4278] - @Create methods on @Startup components are called without a transaction
     * [JBSEAM-4289] - DBUnitSeamTest can't be executed in the same suite as SeamTest
+    * [JBSEAM-4299] - Seam RESTEasy integration does not allow root resources defined with @Path("/") .
 
 ** Feature Request
     * [JBSEAM-3119] - Multiple WAR in EAR verification, example, and document

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:49:44 UTC (rev 11284)
+++ branches/community/Seam_2_2/examples/blog/resources/WEB-INF/pages.xml	2009-07-13 20:57:01 UTC (rev 11285)
@@ -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:49:44 UTC (rev 11284)
+++ branches/community/Seam_2_2/examples/blog/view/menu.xhtml	2009-07-13 20:57:01 UTC (rev 11285)
@@ -5,7 +5,9 @@
         xmlns:f="http://java.sun.com/jsf/core">
     
     <span class="menuItem">
-        <h:inputText id="field" value="#{searchService.searchPattern}"/>
+        <h:inputText id="field" value="#{searchService.searchPattern}">
+            <f:validateLength minimum="3" maximum="5"/>
+        </h:inputText>
         <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:49:44 UTC (rev 11284)
+++ branches/community/Seam_2_2/examples/build.xml	2009-07-13 20:57:01 UTC (rev 11285)
@@ -1158,17 +1158,22 @@
         <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="-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" />
+
 		    <!--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:49:44 UTC (rev 11284)
+++ branches/community/Seam_2_2/examples/itext/resources/WEB-INF/components.xml	2009-07-13 20:57:01 UTC (rev 11285)
@@ -1,6 +1,7 @@
 <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"
@@ -15,6 +16,8 @@
         <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:49:44 UTC (rev 11284)
+++ branches/community/Seam_2_2/examples/itext/resources/WEB-INF/pages.xml	2009-07-13 20:57:01 UTC (rev 11285)
@@ -1,6 +1,14 @@
 <?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