Seam SVN: r7570 - branches/Seam_2_0/doc/Seam_Reference_Guide/en-US.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-03-13 14:49:41 -0400 (Thu, 13 Mar 2008)
New Revision: 7570
Modified:
branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Components.xml
branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Gettingstarted.xml
Log:
Be clear that debug mode and any kind of loading do not go together.
Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Components.xml
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Components.xml 2008-03-13 18:31:40 UTC (rev 7569)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Components.xml 2008-03-13 18:49:41 UTC (rev 7570)
@@ -1019,7 +1019,8 @@
<listitem>
<para>
<literal>org.jboss.seam.core.init.debug</literal> — enable Seam
- debug mode
+ debug mode. This should be set to false when in production. You may see
+ errors if the system is placed under any load and debug is enabled.
</para>
</listitem>
<listitem>
Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Gettingstarted.xml
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Gettingstarted.xml 2008-03-13 18:31:40 UTC (rev 7569)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Gettingstarted.xml 2008-03-13 18:49:41 UTC (rev 7570)
@@ -394,6 +394,11 @@
<listitem>
<para>You must have the Seam filter installed in web.xml</para>
</listitem>
+
+ <listitem>
+ <para>You may see errors if the system is placed under any load and debug is enabled.</para>
+ </listitem>
+
</itemizedlist>
<para>If you create a WAR project using seam-gen, incremental hot deployment is available out of the box for
18 years, 1 month
Seam SVN: r7569 - trunk/doc/reference/en/modules.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-03-13 14:31:40 -0400 (Thu, 13 Mar 2008)
New Revision: 7569
Modified:
trunk/doc/reference/en/modules/components.xml
trunk/doc/reference/en/modules/events.xml
trunk/doc/reference/en/modules/gettingstarted.xml
Log:
Be clear that debug mode and any kind of loading do not go together.
Modified: trunk/doc/reference/en/modules/components.xml
===================================================================
--- trunk/doc/reference/en/modules/components.xml 2008-03-13 17:32:49 UTC (rev 7568)
+++ trunk/doc/reference/en/modules/components.xml 2008-03-13 18:31:40 UTC (rev 7569)
@@ -1016,7 +1016,8 @@
<listitem>
<para>
<literal>org.jboss.seam.core.init.debug</literal> — enable Seam
- debug mode
+ debug mode. This should be set to false when in production. You may see
+ errors if the system is placed under any load and debug is enabled.
</para>
</listitem>
<listitem>
Modified: trunk/doc/reference/en/modules/events.xml
===================================================================
--- trunk/doc/reference/en/modules/events.xml 2008-03-13 17:32:49 UTC (rev 7568)
+++ trunk/doc/reference/en/modules/events.xml 2008-03-13 18:31:40 UTC (rev 7569)
@@ -871,7 +871,7 @@
</filter-mapping>]]></programlisting>
<para>
- You may also need to disable Facelets development mode in <literal>web.xml</literal> and
+ You need to disable Facelets development mode in <literal>web.xml</literal> and
Seam debug mode in <literal>components.xml</literal> if you want your exception handlers
to fire.
</para>
Modified: trunk/doc/reference/en/modules/gettingstarted.xml
===================================================================
--- trunk/doc/reference/en/modules/gettingstarted.xml 2008-03-13 17:32:49 UTC (rev 7568)
+++ trunk/doc/reference/en/modules/gettingstarted.xml 2008-03-13 18:31:40 UTC (rev 7569)
@@ -392,6 +392,10 @@
<listitem>
<para>You must have the Seam filter installed in web.xml</para>
</listitem>
+
+ <listitem>
+ <para>You may see errors if the system is placed under any load and debug is enabled.</para>
+ </listitem>
</itemizedlist>
<para>If you create a WAR project using seam-gen, incremental hot deployment is available out of the box for
18 years, 1 month
Seam SVN: r7568 - branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/renderkit.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-03-13 13:32:49 -0400 (Thu, 13 Mar 2008)
New Revision: 7568
Modified:
branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java
Log:
backport r7567, JBSEAM-2588
Modified: branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java
===================================================================
--- branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java 2008-03-13 17:32:13 UTC (rev 7567)
+++ branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java 2008-03-13 17:32:49 UTC (rev 7568)
@@ -33,7 +33,6 @@
throws IOException
{
UIComponent actionComponent = component.getParent();
- String actionComponentId = actionComponent.getClientId(context);
UIComponent form = getUtils().getForm(actionComponent);
UIParameter parameter = (UIParameter) component;
if (getUtils().isCommandButton(actionComponent))
@@ -46,6 +45,8 @@
{
getLog().warn("Must set an id for the command buttons with s:conversationPropagation");
}
+
+
String functionBody =
"{" +
"if (document.getElementById)" +
@@ -68,10 +69,31 @@
"return true;" +
"}" +
"}";
+
+ String functionName = "cp_" + actionComponent.getId();
+
String functionCode =
- "document.getElementById('" + actionComponentId + "').onclick = " +
- "new Function(\"event\", \"" + functionBody + "\");";
+ "var " + functionName + " = " +
+ "new Function(\"event\", \"" + functionBody + "\");";
+
writer.write(functionCode);
+
+ // We are either written before the HTML element (e.g. a:commandButton)
+ // In this case we can simply prepend to the existing onClick
+
+ String existingOnClick = (String) actionComponent.getAttributes().get("onclick");
+
+ actionComponent.getAttributes().put("onclick", functionName + "();" + existingOnClick);
+
+ // But we also might be written after (e.g. JSF RI h:commandButton
+ // In this case we can use event capture
+
+ String functionRegister =
+ "if (document.getElementById('" + actionComponent.getClientId(context) + "'))" +
+ "{" +
+ "document.getElementById('" + actionComponent.getClientId(context) + "').onclick = new Function(\"event\", \"" + functionBody + "\");" +
+ "}";
+ writer.write(functionRegister);
writer.endElement("script");
}
}
18 years, 1 month
Seam SVN: r7567 - trunk/ui/src/main/java/org/jboss/seam/ui/renderkit.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-03-13 13:32:13 -0400 (Thu, 13 Mar 2008)
New Revision: 7567
Modified:
trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java
Log:
JBSEAM-2588
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java 2008-03-13 14:02:16 UTC (rev 7566)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java 2008-03-13 17:32:13 UTC (rev 7567)
@@ -33,7 +33,6 @@
throws IOException
{
UIComponent actionComponent = component.getParent();
- String actionComponentId = actionComponent.getClientId(context);
UIComponent form = getUtils().getForm(actionComponent);
UIParameter parameter = (UIParameter) component;
if (getUtils().isCommandButton(actionComponent))
@@ -46,6 +45,8 @@
{
getLog().warn("Must set an id for the command buttons with s:conversationPropagation");
}
+
+
String functionBody =
"{" +
"if (document.getElementById)" +
@@ -68,10 +69,31 @@
"return true;" +
"}" +
"}";
+
+ String functionName = "cp_" + actionComponent.getId();
+
String functionCode =
- "document.getElementById('" + actionComponentId + "').onclick = " +
- "new Function(\"event\", \"" + functionBody + "\");";
+ "var " + functionName + " = " +
+ "new Function(\"event\", \"" + functionBody + "\");";
+
writer.write(functionCode);
+
+ // We are either written before the HTML element (e.g. a:commandButton)
+ // In this case we can simply prepend to the existing onClick
+
+ String existingOnClick = (String) actionComponent.getAttributes().get("onclick");
+
+ actionComponent.getAttributes().put("onclick", functionName + "();" + existingOnClick);
+
+ // But we also might be written after (e.g. JSF RI h:commandButton
+ // In this case we can use event capture
+
+ String functionRegister =
+ "if (document.getElementById('" + actionComponent.getClientId(context) + "'))" +
+ "{" +
+ "document.getElementById('" + actionComponent.getClientId(context) + "').onclick = new Function(\"event\", \"" + functionBody + "\");" +
+ "}";
+ writer.write(functionRegister);
writer.endElement("script");
}
}
18 years, 1 month
Seam SVN: r7566 - in trunk: ui/src/main/java/org/jboss/seam/ui/facelet and 1 other directory.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-03-13 10:02:16 -0400 (Thu, 13 Mar 2008)
New Revision: 7566
Modified:
trunk/build/jul.pom.xml
trunk/build/ui.pom.xml
trunk/ui/src/main/java/org/jboss/seam/ui/facelet/FaceletsJBossLogging.java
Log:
JBSEAM-2676
Modified: trunk/build/jul.pom.xml
===================================================================
--- trunk/build/jul.pom.xml 2008-03-13 13:51:57 UTC (rev 7565)
+++ trunk/build/jul.pom.xml 2008-03-13 14:02:16 UTC (rev 7566)
@@ -19,6 +19,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: trunk/build/ui.pom.xml
===================================================================
--- trunk/build/ui.pom.xml 2008-03-13 13:51:57 UTC (rev 7565)
+++ trunk/build/ui.pom.xml 2008-03-13 14:02:16 UTC (rev 7566)
@@ -184,11 +184,6 @@
<scope>test</scope>
<classifier>jdk15</classifier>
</dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/facelet/FaceletsJBossLogging.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/facelet/FaceletsJBossLogging.java 2008-03-13 13:51:57 UTC (rev 7565)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/facelet/FaceletsJBossLogging.java 2008-03-13 14:02:16 UTC (rev 7566)
@@ -7,7 +7,6 @@
import java.util.logging.Filter;
import java.util.logging.Logger;
-import org.apache.log4j.Level;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Name;
18 years, 1 month
Seam SVN: r7565 - branches/Seam_2_0/doc/Seam_Reference_Guide/en-US.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-03-13 09:51:57 -0400 (Thu, 13 Mar 2008)
New Revision: 7565
Modified:
branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Testing.xml
Log:
JBSEAM-2234
Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Testing.xml
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Testing.xml 2008-03-13 13:43:58 UTC (rev 7564)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Testing.xml 2008-03-13 13:51:57 UTC (rev 7565)
@@ -456,6 +456,14 @@
must put a <literal>seam.properties</literal> in each resource.
</para>
+ <para>
+ By default, a generated project will use the
+ <literal>java:/DefaultDS</literal> (a built in HSQL datasource in
+ Embedded JBoss) for testing. If you want to use another datasource
+ place the <literal>foo-ds.xml</literal> into
+ <literal>bootstrap/deploy</literal> directory.
+ </para>
+
</section>
<section>
@@ -570,6 +578,13 @@
<programlisting>
<![CDATA[<parameter name="datasourceJndiName" value="java:/seamdiscsDatasource"/>]]>
</programlisting>
+
+ <para>
+ DBUnitSeamTest only works out of the box with HSQL as a datasource.
+ If you want to use another database, then you'll need to implement
+ some extra methods. Read the javadoc on
+ <literal>DBUnitSeamTest</literal> for more.
+ </para>
</section>
18 years, 1 month
Seam SVN: r7564 - trunk/ui/src/main/java/org/jboss/seam/ui/facelet.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-03-13 09:43:58 -0400 (Thu, 13 Mar 2008)
New Revision: 7564
Modified:
trunk/ui/src/main/java/org/jboss/seam/ui/facelet/FaceletsJBossLogging.java
Log:
JBSEAM-2676
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/facelet/FaceletsJBossLogging.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/facelet/FaceletsJBossLogging.java 2008-03-13 12:36:39 UTC (rev 7563)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/facelet/FaceletsJBossLogging.java 2008-03-13 13:43:58 UTC (rev 7564)
@@ -34,35 +34,6 @@
{
private LogProvider log = Logging.getLogProvider(FaceletsJBossLogging.class);
-
- public static void setLevel(java.util.logging.Logger julLogger)
- {
- org.apache.log4j.Logger log4jLogger =
- org.apache.log4j.Logger.getLogger(julLogger.getName());
-
- julLogger.setLevel(java.util.logging.Level.OFF);
-
- if (log4jLogger.isEnabledFor(Level.FATAL))
- julLogger.setLevel(java.util.logging.Level.SEVERE);
-
- if (log4jLogger.isEnabledFor(Level.ERROR))
- julLogger.setLevel(java.util.logging.Level.SEVERE);
-
- if (log4jLogger.isEnabledFor(Level.WARN))
- julLogger.setLevel(java.util.logging.Level.WARNING);
-
- if (log4jLogger.isEnabledFor(Level.INFO))
- julLogger.setLevel(java.util.logging.Level.INFO);
-
- if (log4jLogger.isEnabledFor(Level.DEBUG))
- julLogger.setLevel(java.util.logging.Level.FINE);
-
- if (log4jLogger.isEnabledFor(Level.DEBUG))
- julLogger.setLevel(java.util.logging.Level.FINEST);
-
- if (log4jLogger.isEnabledFor(Level.ALL))
- julLogger.setLevel(java.util.logging.Level.ALL);
- }
@SuppressWarnings("deprecation")
@Create
@@ -89,45 +60,35 @@
// And some aren't static, so this really is best effort
julLogger = getPrivateStaticLogger(TagLibraryConfig.class, "log");
- setLevel(julLogger);
julLogger.setFilter(conversionFilter);
julLogger = getPrivateStaticLogger(com.sun.facelets.compiler.Compiler.class, "log");
- setLevel(julLogger);
julLogger.setFilter(conversionFilter);
julLogger = getPrivateStaticLogger(DefaultFaceletFactory.class, "log");
- setLevel(julLogger);
julLogger.setFilter(conversionFilter);
julLogger = getPrivateStaticLogger(TagLibraryConfig.class, "log");
- setLevel(julLogger);
julLogger.setFilter(conversionFilter);
julLogger = getPrivateStaticLogger(ComponentHandler.class, "log");
- setLevel(julLogger);
julLogger.setFilter(conversionFilter);
julLogger = getPrivateStaticLogger(Resource.class, "log");
- setLevel(julLogger);
julLogger.setFilter(conversionFilter);
julLogger = getPrivateStaticLogger(FaceletViewHandler.class, "log");
- setLevel(julLogger);
julLogger.setFilter(conversionFilter);
// These ones are in a package-scoped class
julLogger = getPrivateStaticLogger("com.sun.facelets.compiler.CompilationManager", "log");
- setLevel(julLogger);
julLogger.setFilter(conversionFilter);
julLogger = getPrivateStaticLogger("com.sun.facelets.tag.jsf.ComponentRule", "log");
- setLevel(julLogger);
julLogger.setFilter(conversionFilter);
julLogger = getPrivateStaticLogger("com.sun.facelets.tag.MetaRulesetImpl", "log");
- setLevel(julLogger);
julLogger.setFilter(conversionFilter);
}
18 years, 1 month
Seam SVN: r7563 - in trunk/examples/wiki/view: includes and 1 other directory.
by seam-commits@lists.jboss.org
Author: christian.bauer(a)jboss.com
Date: 2008-03-13 08:36:39 -0400 (Thu, 13 Mar 2008)
New Revision: 7563
Modified:
trunk/examples/wiki/view/includes/userControl.xhtml
trunk/examples/wiki/view/userRegister_d.xhtml
Log:
Larger password fields so users see it has a length limit...
Modified: trunk/examples/wiki/view/includes/userControl.xhtml
===================================================================
--- trunk/examples/wiki/view/includes/userControl.xhtml 2008-03-13 11:47:02 UTC (rev 7562)
+++ trunk/examples/wiki/view/includes/userControl.xhtml 2008-03-13 12:36:39 UTC (rev 7563)
@@ -77,10 +77,10 @@
<h:form styleClass="resetPasswordForm" rendered="#{not empty resetPasswordOfUser}">
<h:outputText styleClass="label" value="#{messages['lacewiki.label.resetPassword.ResetPasswordOf']} '#{resetPasswordOfUser.username}':"/>
- <h:inputSecret styleClass="input" value="#{userPasswordReset.password}" size="8" tabindex="50"/>
+ <h:inputSecret styleClass="input" value="#{userPasswordReset.password}" size="18" maxlength="15" tabindex="50"/>
<h:outputText styleClass="label" value="#{messages['lacewiki.label.resetPassword.Repeat']}:"/>
- <h:inputSecret styleClass="input" value="#{userPasswordReset.passwordControl}" size="8" tabindex="50"/>
+ <h:inputSecret styleClass="input" value="#{userPasswordReset.passwordControl}" size="18" maxlength="15" tabindex="50"/>
<h:commandLink styleClass="button" action="#{userPasswordReset.reset}" tabindex="50">
<h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.resetPassword.Reset']}"/>
Modified: trunk/examples/wiki/view/userRegister_d.xhtml
===================================================================
--- trunk/examples/wiki/view/userRegister_d.xhtml 2008-03-13 11:47:02 UTC (rev 7562)
+++ trunk/examples/wiki/view/userRegister_d.xhtml 2008-03-13 12:36:39 UTC (rev 7563)
@@ -58,13 +58,13 @@
<s:decorate id="passwordDecorate" template="includes/formFieldDecorate.xhtml">
<ui:define name="label">#{messages['lacewiki.label.userRegister.Password']}</ui:define>
- <h:inputSecret id="password" tabindex="1" size="15" maxlength="15" required="true"
+ <h:inputSecret id="password" tabindex="1" size="18" maxlength="15" required="true"
redisplay="true" value="#{userHome.password}"/>
</s:decorate>
<s:decorate id="passwordControlDecorate" template="includes/formFieldDecorate.xhtml">
<ui:define name="label">#{messages['lacewiki.label.userRegister.RepeatPassword']}</ui:define>
- <h:inputSecret id="passwordControl" tabindex="1" size="15" maxlength="15" required="true"
+ <h:inputSecret id="passwordControl" tabindex="1" size="18" maxlength="15" required="true"
redisplay="true" value="#{userHome.passwordControl}"/>
</s:decorate>
18 years, 1 month
Seam SVN: r7562 - branches/Seam_2_0/doc/Seam_Reference_Guide.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-03-13 07:47:02 -0400 (Thu, 13 Mar 2008)
New Revision: 7562
Modified:
branches/Seam_2_0/doc/Seam_Reference_Guide/
Log:
update ignores
Property changes on: branches/Seam_2_0/doc/Seam_Reference_Guide
___________________________________________________________________
Name: svn:ignore
- target
+ target
docs.pom
18 years, 1 month
Seam SVN: r7561 - in branches/Seam_2_0: build and 1 other directories.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-03-13 07:43:58 -0400 (Thu, 13 Mar 2008)
New Revision: 7561
Added:
branches/Seam_2_0/build/docs.pom.xml
branches/Seam_2_0/doc/Seam_Reference_Guide/pom.xml
Removed:
branches/Seam_2_0/doc/Seam_Reference_Guide/build.xml
branches/Seam_2_0/doc/Seam_Reference_Guide/pom.xml
Modified:
branches/Seam_2_0/build.xml
Log:
Move docs pom, JBSEAM 2735
Copied: branches/Seam_2_0/build/docs.pom.xml (from rev 7547, branches/Seam_2_0/build/docs.pom.xml)
===================================================================
--- branches/Seam_2_0/build/docs.pom.xml (rev 0)
+++ branches/Seam_2_0/build/docs.pom.xml 2008-03-13 11:43:58 UTC (rev 7561)
@@ -0,0 +1,98 @@
+<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/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.jboss.seam.reference-guide</groupId>
+ <artifactId>seam-reference-guide-${translation}</artifactId>
+ <version>@seam.version@</version>
+ <packaging>jdocbook</packaging>
+ <name>Seam Reference Guide (${translation})</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.0.0</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-docbook-xslt</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.0.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <minmemory>1024m</minmemory>
+ <maxmemory>1024m</maxmemory>
+ <sourceDocumentName>resolved.xml</sourceDocumentName>
+ <sourceDirectory>en-US</sourceDirectory>
+ <imageResource>
+ <directory>en-US</directory>
+ <includes>
+ <include>images/*</include>
+ </includes>
+ </imageResource>
+ <!--<cssResource>
+ <directory>src/main/css</directory>
+ </cssResource>-->
+ <formats>
+
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/main-html.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/nochunk-html.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/main-pdf.xsl</stylesheetResource>
+ <finalName>Seam_Reference_Guide.pdf</finalName>
+ </format >
+ <!--<format>
+ <formatName>eclipse</formatName>
+ <stylesheetResource>classpath:/xslt/main-eclipse.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>-->
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
+ <!-- could also locate the docbook dependency and inspect its version... -->
+ <docbookVersion>1.72.0</docbookVersion>
+ <transformerParameters>
+ <property>
+ <name>javax.xml.parsers.DocumentBuilderFactory</name>
+ <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
+ </property>
+ <property>
+ <name>javax.xml.parsers.SAXParserFactory</name>
+ <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
+ </property>
+ <!--<javax.xml.parsers.DocumentBuilderFactory>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</javax.xml.parsers.DocumentBuilderFactory>
+ <javax.xml.parsers.SAXParserFactory>org.apache.xerces.jaxp.SAXParserFactoryImpl</javax.xml.parsers.SAXParserFactory>
+ <javax.xml.validation.SchemaFactory:http\://www.w3.org/2001/XMLSchema>org.apache.xerces.jaxp.validation.XMLSchemaFactory</javax.xml.validation.SchemaFactory:http\://www.w3.org/2001/XMLSchema>-->
+ </transformerParameters>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <translation>en-US</translation>
+ </properties>
+</project>
Property changes on: branches/Seam_2_0/build/docs.pom.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/Seam_2_0/build.xml
===================================================================
--- branches/Seam_2_0/build.xml 2008-03-13 11:43:03 UTC (rev 7560)
+++ branches/Seam_2_0/build.xml 2008-03-13 11:43:58 UTC (rev 7561)
@@ -593,7 +593,8 @@
</target>
- <target name="refdoc" description="Generate and copy reference documentation">
+ <target name="refdoc" description="Generate and copy reference documentation" depends="initpoms">
+ <copy file="${docs.pom}" tofile="${doc.ref.dir}/pom.xml" overwrite="true"/>
<maven target="compile" basedir="${doc.ref.dir}">
<jvmarg line="-Xms128m -Xmx512m" />
</maven>
Deleted: branches/Seam_2_0/doc/Seam_Reference_Guide/build.xml
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/build.xml 2008-03-13 11:43:03 UTC (rev 7560)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/build.xml 2008-03-13 11:43:58 UTC (rev 7561)
@@ -1,198 +0,0 @@
-<!--
- To build the reference docs for a particular language only, use "ant -Dlang=en", for
- example, and call either lang.all, lang.docpdf, lang.dochtml, or lang.dochtmlsingle
- for the target of your choice.
-
- You can also call lang.section-check to track down missing identifiers in a particular
- language, or you can call lang.revdiff to get a difference report for a particular
- language, compared with the English reference.
--->
-<project name="ReferenceDocumentation" default="all.doc" basedir=".">
- <!-- Allow this to be overriden by others importing this project. -->
- <dirname property="imported.basedir" file="${ant.file.ReferenceDocumentation}"/>
-
- <!-- Set build directories for all formats. -->
- <property name="build.dir" value="${basedir}/build"/>
-
- <!-- Support files for build process. -->
- <property name="support.dir" value="${imported.basedir}/support"/>
-
- <!-- Base name for documentation artifacts. -->
- <property name="docname" value="seam_reference"/>
-
- <!-- Set DocBook stylesheets. -->
- <property name="db.style.fopdf" value="fopdf.xsl"/>
- <property name="db.style.html" value="html_chunk.xsl"/>
- <property name="db.style.htmlsingle" value="html.xsl"/>
-
- <!-- Classpath for the build tools. -->
- <path id="lib.classpath">
- <fileset dir="${support.dir}/lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <!-- ################################################################## -->
-
- <target name="all.doc"
- depends="clean"
- description="Compile documentation for all languages and all formats.">
-
- <!-- TRANSLATOR: Duplicate this line for your language -->
- <antcall target="lang.all"><param name="lang" value="en-US"/></antcall>
-
- </target>
-
- <target name="all.revdiff"
- description="Generates a diff report for all translated versions.">
-
- <!-- TRANSLATOR: Duplicate this line for your language -->
- <antcall target="lang.revdiff"><param name="lang" value="de"/></antcall>
-
- </target>
-
- <!-- ################################################################## -->
-
- <target name="clean">
-
- <!-- Delete build directory. -->
- <delete dir="${build.dir}"/>
-
- </target>
-
- <target name="lang.all">
- <!-- Compile the documentation for a single language in all formats. -->
- <antcall target="lang.docpdf"/>
- <antcall target="lang.dochtml"/>
- <antcall target="lang.dochtmlsingle"/>
- <antcall target="lang.htmlmisc"/>
- </target>
-
-
- <target name="lang.docpdf.prepare">
-
- <!-- Copy all the images to the output location, will be removed later. -->
- <copy todir="${build.dir}/${lang}/pdf/images">
- <fileset dir="${basedir}/${lang}/images">
- <include name="**/*.png"/>
- <include name="**/*.svg"/>
- <include name="**/*.gif"/>
- </fileset>
- </copy>
-
- <!-- Create the XSL/FO temporary file. -->
- <java classname="com.icl.saxon.StyleSheet" fork="true" dir="${basedir}" maxmemory="192m" >
- <classpath refid="lib.classpath"/>
- <arg value="-o"/>
- <arg value="${build.dir}/${lang}/pdf/docbook_fop.tmp"/>
- <arg value="${basedir}/${lang}/master.xml"/>
- <arg value="${basedir}/${lang}/styles/${db.style.fopdf}"/>
- </java>
-
- <available property="custom.fop.userconfig.present" file="userconfig.xml" filepath="${basedir}/${lang}/fop"/>
- </target>
-
- <target name="lang.docpdf.customized" depends="lang.docpdf.prepare" if="custom.fop.userconfig.present">
-
- <copy todir="${build.dir}/${lang}/pdf">
- <fileset dir="${basedir}/${lang}/fop">
- <include name="*"/>
- </fileset>
- </copy>
-
- <!-- Create a PDF from the XSL/FO, using customized fop userconfig.xml -->
- <java classname="org.apache.fop.apps.Fop" fork="true" dir="${basedir}" maxmemory="192m" >
- <classpath refid="lib.classpath"/>
- <arg value="-c"/>
- <arg value="${basedir}/${lang}/fop/userconfig.xml"/>
- <arg value="${build.dir}/${lang}/pdf/docbook_fop.tmp"/>
- <arg value="${build.dir}/${lang}/pdf/${docname}.pdf"/>
- </java>
- </target>
-
- <target name="lang.docpdf.normal" depends="lang.docpdf.prepare" unless="custom.fop.userconfig.present">
- <!-- Create a PDF from the XSL/FO. -->
- <java classname="org.apache.fop.apps.Fop" fork="true" dir="${basedir}" maxmemory="192m">
- <classpath refid="lib.classpath"/>
- <arg value="${build.dir}/${lang}/pdf/docbook_fop.tmp"/>
- <arg value="${build.dir}/${lang}/pdf/${docname}.pdf"/>
- </java>
- </target>
-
- <target name="lang.docpdf" depends="lang.docpdf.normal,lang.docpdf.customized"
- description="Generates the PDF documentation only for a language (set lang)">
- <!-- House keeping,delete temporary files. -->
- <delete>
- <fileset dir="${build.dir}/${lang}/pdf" excludes="**/*.pdf"/>
- </delete>
- <delete dir="${build.dir}/${lang}/pdf/images"/>
- </target>
-
- <target name="lang.dochtml"
- description="Generates the HTML documentation only for a language (set lang)">
-
- <mkdir dir="${build.dir}/${lang}/html/"/>
-
- <java classname="com.icl.saxon.StyleSheet" fork="true" dir="${build.dir}/${lang}/html" maxmemory="192m">
- <classpath refid="lib.classpath"/>
- <arg value="${basedir}/${lang}/master.xml"/>
- <arg value="${basedir}/${lang}/styles/${db.style.html}"/>
- </java>
- </target>
-
- <target name="lang.dochtmlsingle"
- description="Generates the single-page HTML documentation only for a language (set lang)">
-
- <mkdir dir="${build.dir}/${lang}/html_single/"/>
-
- <java classname="com.icl.saxon.StyleSheet" fork="true" dir="${basedir}" maxmemory="192m">
- <classpath refid="lib.classpath"/>
- <arg value="-o"/>
- <arg value="${build.dir}/${lang}/html_single/index.html"/>
- <arg value="${basedir}/${lang}/master.xml"/>
- <arg value="${basedir}/${lang}/styles/${db.style.htmlsingle}"/>
- </java>
- </target>
-
- <target name="lang.htmlmisc">
-
- <!-- Copy images and CSS for HTML documentation, language specific. -->
- <copy todir="${build.dir}/${lang}/shared/images">
- <fileset dir="${basedir}/${lang}/images">
- <include name="**/*.png"/>
- <include name="**/*.gif"/>
- </fileset>
- </copy>
- <copy todir="${build.dir}/${lang}/shared/css">
- <fileset dir="${basedir}/${lang}/styles">
- <include name="**/*.css"/>
- </fileset>
- </copy>
-
- </target>
-
- <target name="lang.revdiff"
- description="Reports difference between English and translation (set lang)">
-
- <taskdef name="revdiff"
- classname="org.hibernate.docproc.revdiff.RevDiffReportTask"
- classpathref="lib.classpath">
-
- </taskdef>
-
- <revdiff original="${basedir}/en/master.xml"
- copy="${basedir}/${lang}/master.xml"
- report="${build.dir}/status_${lang}.html"/>
-
- </target>
-
- <target name="lang.section-check" depends="lang.dochtml"
- description="Reports missing unique chapter/section identifiers (set lang)">
- <java classname="com.icl.saxon.StyleSheet" fork="true" dir="${build.dir}/${lang}/html" maxmemory="192m">
- <classpath refid="lib.classpath"/>
- <arg value="${basedir}/${lang}/master.xml"/>
- <arg value="${support.dir}/section-check.xsl"/>
- </java>
- </target>
-
-</project>
Deleted: branches/Seam_2_0/doc/Seam_Reference_Guide/pom.xml
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/pom.xml 2008-03-13 11:43:03 UTC (rev 7560)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/pom.xml 2008-03-13 11:43:58 UTC (rev 7561)
@@ -1,98 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.jboss.seam.reference-guide</groupId>
- <artifactId>seam-reference-guide-${translation}</artifactId>
- <version>2.0.2-SNAPSHOT</version>
- <packaging>jdocbook</packaging>
- <name>Seam Reference Guide (${translation})</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.0.0</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.0.0</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
- <configuration>
- <minmemory>1024m</minmemory>
- <maxmemory>1024m</maxmemory>
- <sourceDocumentName>resolved.xml</sourceDocumentName>
- <sourceDirectory>en-US</sourceDirectory>
- <imageResource>
- <directory>en-US</directory>
- <includes>
- <include>images/*</include>
- </includes>
- </imageResource>
- <!--<cssResource>
- <directory>src/main/css</directory>
- </cssResource>-->
- <formats>
-
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-html.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/nochunk-html.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-pdf.xsl</stylesheetResource>
- <finalName>Seam_Reference_Guide.pdf</finalName>
- </format >
- <!--<format>
- <formatName>eclipse</formatName>
- <stylesheetResource>classpath:/xslt/main-eclipse.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>-->
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
- <!-- could also locate the docbook dependency and inspect its version... -->
- <docbookVersion>1.72.0</docbookVersion>
- <transformerParameters>
- <property>
- <name>javax.xml.parsers.DocumentBuilderFactory</name>
- <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
- </property>
- <property>
- <name>javax.xml.parsers.SAXParserFactory</name>
- <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
- </property>
- <!--<javax.xml.parsers.DocumentBuilderFactory>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</javax.xml.parsers.DocumentBuilderFactory>
- <javax.xml.parsers.SAXParserFactory>org.apache.xerces.jaxp.SAXParserFactoryImpl</javax.xml.parsers.SAXParserFactory>
- <javax.xml.validation.SchemaFactory:http\://www.w3.org/2001/XMLSchema>org.apache.xerces.jaxp.validation.XMLSchemaFactory</javax.xml.validation.SchemaFactory:http\://www.w3.org/2001/XMLSchema>-->
- </transformerParameters>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <translation>en-US</translation>
- </properties>
-</project>
Added: branches/Seam_2_0/doc/Seam_Reference_Guide/pom.xml
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/pom.xml (rev 0)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/pom.xml 2008-03-13 11:43:58 UTC (rev 7561)
@@ -0,0 +1,98 @@
+<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/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.jboss.seam.reference-guide</groupId>
+ <artifactId>seam-reference-guide-${translation}</artifactId>
+ <version>2.0.2-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+ <name>Seam Reference Guide (${translation})</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.0.0</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-docbook-xslt</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.0.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <minmemory>1024m</minmemory>
+ <maxmemory>1024m</maxmemory>
+ <sourceDocumentName>resolved.xml</sourceDocumentName>
+ <sourceDirectory>en-US</sourceDirectory>
+ <imageResource>
+ <directory>en-US</directory>
+ <includes>
+ <include>images/*</include>
+ </includes>
+ </imageResource>
+ <!--<cssResource>
+ <directory>src/main/css</directory>
+ </cssResource>-->
+ <formats>
+
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/main-html.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/nochunk-html.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/main-pdf.xsl</stylesheetResource>
+ <finalName>Seam_Reference_Guide.pdf</finalName>
+ </format >
+ <!--<format>
+ <formatName>eclipse</formatName>
+ <stylesheetResource>classpath:/xslt/main-eclipse.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>-->
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
+ <!-- could also locate the docbook dependency and inspect its version... -->
+ <docbookVersion>1.72.0</docbookVersion>
+ <transformerParameters>
+ <property>
+ <name>javax.xml.parsers.DocumentBuilderFactory</name>
+ <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
+ </property>
+ <property>
+ <name>javax.xml.parsers.SAXParserFactory</name>
+ <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
+ </property>
+ <!--<javax.xml.parsers.DocumentBuilderFactory>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</javax.xml.parsers.DocumentBuilderFactory>
+ <javax.xml.parsers.SAXParserFactory>org.apache.xerces.jaxp.SAXParserFactoryImpl</javax.xml.parsers.SAXParserFactory>
+ <javax.xml.validation.SchemaFactory:http\://www.w3.org/2001/XMLSchema>org.apache.xerces.jaxp.validation.XMLSchemaFactory</javax.xml.validation.SchemaFactory:http\://www.w3.org/2001/XMLSchema>-->
+ </transformerParameters>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <translation>en-US</translation>
+ </properties>
+</project>
Property changes on: branches/Seam_2_0/doc/Seam_Reference_Guide/pom.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
18 years, 1 month