[seam-commits] Seam SVN: r9250 - in trunk/seam-gen: build-scripts and 4 other directories.

Author: dan.j.allen Date: 2008-10-10 03:36:23 -0400 (Fri, 10 Oct 2008) New Revision: 9250 Modified: trunk/seam-gen/build-scripts/build-war.xml trunk/seam-gen/build-scripts/build.xml trunk/seam-gen/build.xml trunk/seam-gen/icefaces/build-scripts/build-war.xml trunk/seam-gen/icefaces/build-scripts/build.xml trunk/seam-gen/resources/WEB-INF/web.xml trunk/seam-gen/view/layout/template.xhtml trunk/seam-gen/view/stylesheet/theme.xcss Log: get SeamTest to run under Java 6 disable RichFaces "skinning control" because it adds too much overhead right now split theme stylesheet into two parts (one static, one dynamic) Modified: trunk/seam-gen/build-scripts/build-war.xml =================================================================== --- trunk/seam-gen/build-scripts/build-war.xml 2008-10-10 07:23:48 UTC (rev 9249) +++ trunk/seam-gen/build-scripts/build-war.xml 2008-10-10 07:36:23 UTC (rev 9250) @@ -14,6 +14,7 @@ <property name="src.action.dir" value="src/hot" /> <property name="src.test.dir" value="src/test" /> <property name="lib.dir" value="lib" /> + <property name="endorsed.dir" value="${lib.dir}/endorsed" /> <property name="war.dir" value="exploded-archives/${project.name}.war" /> <property name="classes.model.dir" value="${war.dir}/WEB-INF/classes" /> <property name="action.dir" value="WEB-INF/classes" /> @@ -363,6 +364,8 @@ <path refid="build.classpath" /> </path> <testng outputdir="${basedir}/test-report"> + <jvmarg line="-Djava.endorsed.dirs=${endorsed.dir}"/> + <jvmarg line="-Dsun.lang.ClassLoader.allowArraySyntax=true"/> <classpath refid="test.path" /> <xmlfileset dir="${test.dir}" includes="*Test.xml" /> </testng> Modified: trunk/seam-gen/build-scripts/build.xml =================================================================== --- trunk/seam-gen/build-scripts/build.xml 2008-10-10 07:23:48 UTC (rev 9249) +++ trunk/seam-gen/build-scripts/build.xml 2008-10-10 07:36:23 UTC (rev 9250) @@ -14,6 +14,7 @@ <property name="src.action.dir" value="src/hot" /> <property name="src.test.dir" value="src/test" /> <property name="lib.dir" value="lib" /> + <property name="endorsed.dir" value="${lib.dir}/endorsed" /> <property name="ear.dir" value="exploded-archives/${project.name}.ear" /> <property name="jar.dir" value="exploded-archives/${project.name}.jar" /> <property name="war.dir" value="exploded-archives/${project.name}.war" /> @@ -378,6 +379,8 @@ <path refid="build.classpath" /> </path> <testng outputdir="${basedir}/test-report"> + <jvmarg line="-Djava.endorsed.dirs=${endorsed.dir}"/> + <jvmarg line="-Dsun.lang.ClassLoader.allowArraySyntax=true"/> <classpath refid="test.path" /> <xmlfileset dir="${test.dir}" includes="*Test.xml" /> </testng> Modified: trunk/seam-gen/build.xml =================================================================== --- trunk/seam-gen/build.xml 2008-10-10 07:23:48 UTC (rev 9249) +++ trunk/seam-gen/build.xml 2008-10-10 07:36:23 UTC (rev 9250) @@ -606,6 +606,19 @@ <fileset file="${driver.jar}"/> </copy> + <!-- we must use an endorsed jars directory for running SeamTest under Java 6 --> + <artifact:dependencies filesetId="endorsed.fileset" versionsId="endorsed.versions"> + <dependency groupId="javax.xml.bind" artifactId="jaxb-api" version="2.1"> + <exclusion groupId="javax.xml.stream" artifactId="stax-api"/> + <exclusion groupId="javax.activation" artifactId="activation"/> + </dependency> + <remoteRepository refId="repository.jboss.org"/> + </artifact:dependencies> + <copy todir="${project.home}/lib/endorsed" overwrite="true"> + <fileset refid="endorsed.fileset"/> + <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${endorsed.versions}" to="flatten"/> + </copy> + <echo message="Copying JBoss Embedded configuration to the ${project.home}/bootstrap directory..."/> <copy todir="${project.home}/bootstrap" overwrite="true"> <fileset dir="${seam.dir}/bootstrap"/> @@ -986,6 +999,17 @@ <echo message="Type '${seam.cmd} restart' and go to http://localhost:8080/${project.name}/${page.name}.seam"/> </target> + <!-- FIXME: we ask the user for information that isn't needed for this target --> + <target name="new-test" depends="validate-project,action-input,setup-filters" description="Create a new test"> + <echo message="Creating a new SeamTest subclass for the specified Seam component"/> + <copy file="${templates.dir}/test/ActionTest.java" tofile="${test.file}"> + <filterset refid="filters"/> + </copy> + <copy file="${templates.dir}/test/testng.xml" tofile="${testng.file}"> + <filterset refid="filters"/> + </copy> + </target> + <target name="new-query" depends="validate-project,query-input,setup-filters"> <echo message="Creating a new query"/> <copy file="${templates.dir}/src/Query.java" tofile="${query.file}"> Modified: trunk/seam-gen/icefaces/build-scripts/build-war.xml =================================================================== --- trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-10-10 07:23:48 UTC (rev 9249) +++ trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-10-10 07:36:23 UTC (rev 9250) @@ -14,6 +14,7 @@ <property name="src.action.dir" value="src/hot" /> <property name="src.test.dir" value="src/test" /> <property name="lib.dir" value="lib" /> + <property name="endorsed.dir" value="${lib.dir}/endorsed" /> <property name="war.dir" value="exploded-archives/${project.name}.war" /> <property name="classes.model.dir" value="${war.dir}/WEB-INF/classes" /> <property name="action.dir" value="WEB-INF/classes" /> @@ -357,6 +358,8 @@ <path refid="build.classpath" /> </path> <testng outputdir="${basedir}/test-report"> + <jvmarg line="-Djava.endorsed.dirs=${endorsed.dir}"/> + <jvmarg line="-Dsun.lang.ClassLoader.allowArraySyntax=true"/> <classpath refid="test.path" /> <xmlfileset dir="${test.dir}" includes="*Test.xml" /> </testng> Modified: trunk/seam-gen/icefaces/build-scripts/build.xml =================================================================== --- trunk/seam-gen/icefaces/build-scripts/build.xml 2008-10-10 07:23:48 UTC (rev 9249) +++ trunk/seam-gen/icefaces/build-scripts/build.xml 2008-10-10 07:36:23 UTC (rev 9250) @@ -14,6 +14,7 @@ <property name="src.action.dir" value="src/hot" /> <property name="src.test.dir" value="src/test" /> <property name="lib.dir" value="lib" /> + <property name="endorsed.dir" value="${lib.dir}/endorsed" /> <property name="ear.dir" value="exploded-archives/${project.name}.ear" /> <property name="jar.dir" value="exploded-archives/${project.name}.jar" /> <property name="war.dir" value="exploded-archives/${project.name}.war" /> @@ -373,6 +374,8 @@ <path refid="build.classpath" /> </path> <testng outputdir="${basedir}/test-report"> + <jvmarg line="-Djava.endorsed.dirs=${endorsed.dir}"/> + <jvmarg line="-Dsun.lang.ClassLoader.allowArraySyntax=true"/> <classpath refid="test.path" /> <xmlfileset dir="${test.dir}" includes="*Test.xml" /> </testng> Modified: trunk/seam-gen/resources/WEB-INF/web.xml =================================================================== --- trunk/seam-gen/resources/WEB-INF/web.xml 2008-10-10 07:23:48 UTC (rev 9249) +++ trunk/seam-gen/resources/WEB-INF/web.xml 2008-10-10 07:36:23 UTC (rev 9250) @@ -1,51 +1,75 @@ <?xml version="1.0" ?> <web-app xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - version="2.5"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + version="2.5"> - <!-- Ajax4jsf --> - - <context-param> - <param-name>org.richfaces.SKIN</param-name> - <param-value>@skin@</param-value> - </context-param> + <!-- RichFaces --> + + <context-param> + <param-name>org.richfaces.SKIN</param-name> + <param-value>@skin@</param-value> + </context-param> + + <!-- Suppress spurious stylesheets --> + + <context-param> + <param-name>org.richfaces.CONTROL_SKINNING</param-name> + <param-value>disable</param-value> + </context-param> + + <context-param> + <param-name>org.richfaces.CONTROL_SKINNING_CLASSES</param-name> + <param-value>disable</param-value> + </context-param> + + <!-- Change the load strategies to ALL to create bundles --> + + <context-param> + <param-name>org.richfaces.LoadStyleStrategy</param-name> + <param-value>DEFAULT</param-value> + </context-param> + + <context-param> + <param-name>org.richfaces.LoadScriptStrategy</param-name> + <param-value>DEFAULT</param-value> + </context-param> <!-- Seam --> - + <listener> <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> </listener> - - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - </filter> + + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <servlet> <servlet-name>Seam Resource Servlet</servlet-name> <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> </servlet> - + <servlet-mapping> <servlet-name>Seam Resource Servlet</servlet-name> <url-pattern>/seam/resource/*</url-pattern> </servlet-mapping> - + <!-- Facelets development mode (disable in production) --> - + <context-param> <param-name>facelets.DEVELOPMENT</param-name> <param-value>true</param-value> </context-param> - + <!-- JSF --> - + <context-param> <param-name>javax.faces.DEFAULT_SUFFIX</param-name> <param-value>.xhtml</param-value> @@ -56,19 +80,19 @@ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> - + <servlet-mapping> <servlet-name>Faces Servlet</servlet-name> <url-pattern>*.seam</url-pattern> </servlet-mapping> - + <security-constraint> <display-name>Restrict raw XHTML Documents</display-name> <web-resource-collection> - <web-resource-name>XHTML</web-resource-name> - <url-pattern>*.xhtml</url-pattern> + <web-resource-name>XHTML</web-resource-name> + <url-pattern>*.xhtml</url-pattern> </web-resource-collection> <auth-constraint/> </security-constraint> - + </web-app> Modified: trunk/seam-gen/view/layout/template.xhtml =================================================================== --- trunk/seam-gen/view/layout/template.xhtml 2008-10-10 07:23:48 UTC (rev 9249) +++ trunk/seam-gen/view/layout/template.xhtml 2008-10-10 07:36:23 UTC (rev 9250) @@ -12,8 +12,8 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title>@projectName@</title> <link rel="shortcut icon" href="favicon.ico"/> - <ui:remove><!-- Change the stylesheet path to /stylesheet/theme.css to preview in the Visual Editor --></ui:remove> <a:loadStyle src="resource:///stylesheet/theme.xcss"/> + <a:loadStyle src="/stylesheet/theme.css"/> <ui:insert name="head"/> </head> Modified: trunk/seam-gen/view/stylesheet/theme.xcss =================================================================== --- trunk/seam-gen/view/stylesheet/theme.xcss 2008-10-10 07:23:48 UTC (rev 9249) +++ trunk/seam-gen/view/stylesheet/theme.xcss 2008-10-10 07:36:23 UTC (rev 9250) @@ -79,184 +79,7 @@ <u:selector name=".rich-table-subheadercell a:hover"> <u:style name="color" skin="calendarHolidaysTextColor"/> </u:selector> - + <!-- Define static styles in the CDATA block below (you can also move this block to the top) --> <f:verbatim><![CDATA[ -html { - overflow-y: scroll; -} - -body { - font-size: 12px; - margin: 0px; -} - -a img { - border: none; -} - -h1 { - font-size: 1.6em; - margin-top: 0; -} - -input[type=submit], input[type=button] { - font-size: 10px; - margin: 5px 5px 5px 0; - cursor: pointer; -} - -input[type=text], input[type=password], textarea { - font-size: 11px; - padding-left: 1px; -} - -.tableControl, .actionButtons { - width: 100%; -} - -.tableControl a { - padding-left: 10px; -} - -.tableControl { - text-align: right; -} - -.footer { - text-align: center; - font-size: 11px; - margin-bottom: 10px; -} - -.rich-table { - width: 100%; -} - -.body { - padding: 30px; -} - -.columnHeader:hover { - color: #FF6600; -} - -.message { - padding: 5px; - list-style: none; - border: 0; - background: none; - padding: 0; - color: #000000; - margin: 5px 0 8px 0; - font-size: 12px; -} - -.message li { - background: no-repeat left center; - padding-top: 1px; - padding-left: 20px; - margin-left: 3px; -} - -.message li.infomsg { - background-image: url(../../../../../img/msginfo.png); -} - -.message li.errormsg { - background-image: url(../../../../../img/msgerror.png); -} - -.message li.warnmsg { - background-image: url(../../../../../img/msgwarn.png); -} - -.name { - vertical-align: top; - font-weight: bold; - width: 115px; - float: left; - padding: 5px; - margin-top: 3px; - clear: left; -} - -.value { - float: left; - padding: 5px; -} - -.error { - float: left; - padding: 5px; -} - -.errors { - color: red; - vertical-align: middle; -} - -img.errors { - padding-right: 5px; -} - -.errors input, .errors textarea { - border: 1px solid red !important; -} - -.required { - color: red; - padding-left: 2px; -} - -.rich-stglpanel-body { - overflow: auto; -} - -/* the specificity here is necessary to override the defaults */ -.rich-panel .rich-panel-header, -.rich-stglpanel .rich-stglpanel-header { - padding: 2px 3px; -} - - -select { - font-size: 12px; -} - -.rich-panel input[type=submit], .rich-panel input[type=button], -.rich-tabpanel input[type=submit], .rich-tabpanel input[type=button] { - margin-bottom: 0; -} - -.tableControl input[type=submit], .tableControl input[type=button], .tableControl select { - margin: 5px 0 5px 5px; -} - -/* I don't know why this is necessary, but the select is off by a pixel on the top and is padding too much on the left */ -.tableControl select { - margin-left: 2px; - position: relative; - top: 1px; -} - -.actionButtons { - padding-left: 1px; -} - -.actionButtons select { - margin: 5px 5px 5px 0; - vertical-align: bottom; -} - -.rich-datalist { - list-style: square; - margin: 6px 0 1px 0; - padding-left: 18px; -} - -.rich-list-item { - padding-bottom: 4px; -} ]]></f:verbatim> - </f:template>