You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by so...@apache.org on 2008/06/14 01:21:24 UTC
svn commit: r667693 [2/2] - in /myfaces/trinidad/trunk: ./ trinidad-api/
trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/
trinidad-assembly/ trinidad-build/ trinidad-examples/
trinidad-examples/trinidad-blank/ trinidad-examples/trinidad-...
Modified: myfaces/trinidad/trunk/trinidad-sandbox/sandbox-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-demo/pom.xml?rev=667693&r1=667692&r2=667693&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-sandbox/sandbox-demo/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-sandbox/sandbox-demo/pom.xml Fri Jun 13 16:21:23 2008
@@ -19,62 +19,43 @@
under the License.
-->
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>Apache MyFaces Trinidad Sandbox Demo</name>
+ <description>Apache MyFaces Trinidad Sandbox Demo</description>
+
<parent>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-sandbox</artifactId>
<version>1.0.9-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <name>Apache MyFaces Trinidad Sandbox Demo</name>
- <description>Apache MyFaces Trinidad Sandbox Demo</description>
-
<artifactId>sandbox-demo</artifactId>
<packaging>war</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.trinidadbuild</groupId>
- <artifactId>maven-jdev-plugin</artifactId>
- <version>1.2.3</version>
- <configuration>
- <libraries>
- <library>JSP Runtime</library>
- </libraries>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ <!-- Project dependencies -->
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>trinidad-api</artifactId>
- <version>${pom.version}</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>trinidad-impl</artifactId>
- <version>${pom.version}</version>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>sandbox-api</artifactId>
- <version>${pom.version}</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
</dependency>
+ <!-- For SourceCodeServlet -->
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>sandbox-impl</artifactId>
- <version>${pom.version}</version>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
-
-
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
@@ -87,79 +68,99 @@
<version>1.1</version>
</dependency>
+ <!-- Apache Trinidad -->
<dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- </dependency>
-
-<!-- Dependencies pulled in via myfaces/ri pom
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.6</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.5</version>
- <scope>runtime</scope>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-api</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1</version>
- <scope>runtime</scope>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-impl</artifactId>
</dependency>
--->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>sandbox-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>sandbox-impl</artifactId>
</dependency>
- <!-- For SourceCodeServlet -->
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.myfaces.trinidadbuild</groupId>
+ <artifactId>maven-jdev-plugin</artifactId>
+ <configuration>
+ <libraries>
+ <library>JSP Runtime</library>
+ </libraries>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
- <profile>
- <id>jettyConfig</id>
+ <profile>
+ <id>jettyConfig</id>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${jsf-ri.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${jsf-ri.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${jsf-myfaces.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${jsf-myfaces.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.2rc0</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
</configuration>
</plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- By default the war examples use myfaces! :) -->
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ This profile activates MyFaces as the release to use for these demos. By default
+ MyFaces is used when these examples are run in Jetty and/or used with the -PincludeJSF
+ flag. To invoke this profile, simply do not include a -Djsf= property on your maven
+ command line. Execute this profile like this:
+
+ mvn -PjettyConfig jetty:run
+ -->
<profile>
<id>myfaces</id>
<activation>
@@ -168,22 +169,25 @@
</property>
</activation>
<dependencies>
-
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
- <!-- To use the examples using the Sun's JSF Reference Implementation: -Djsf=ri -->
+ <!--
+ This profile activates the JSF RI as the release to use for these demos. When activated
+ the JSF RI is used when these examples are run in Jetty and/or used with the
+ -PincludeJSF flag. To invoke this profile, simply do include a -Djsf=ri property on
+ your maven command line. Execute this profile like this:
+
+ mvn -PjettyConfig -Djsf=ri jetty:run
+ -->
<profile>
<id>jsfri</id>
<activation>
@@ -193,48 +197,15 @@
</property>
</activation>
<dependencies>
-
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>1.1_02</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>1.1_02</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.0</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.5</version>
- <scope>runtime</scope>
</dependency>
-
- </dependencies>
-
- <repositories>
- <repository>
- <id>java.net</id>
- <name>java.net Maven 1 Repository</name>
- <url>https://maven-repository.dev.java.net/nonav/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
- <properties>
- <jsf_implementation>JSF-RI</jsf_implementation>
- </properties>
+ </dependencies>
</profile>
</profiles>
-
</project>
Modified: myfaces/trinidad/trunk/trinidad-sandbox/sandbox-impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-impl/pom.xml?rev=667693&r1=667692&r2=667693&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-sandbox/sandbox-impl/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-sandbox/sandbox-impl/pom.xml Fri Jun 13 16:21:23 2008
@@ -19,45 +19,113 @@
-->
<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>
+
+ <name>Apache MyFaces Trinidad Sandbox Impl</name>
+ <description>Private implementation of the Apache MyFaces Trinidad project</description>
+
<parent>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-sandbox</artifactId>
<version>1.0.9-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <name>Apache MyFaces Trinidad Sandbox Impl</name>
- <description>Private implementation of the Apache MyFaces Trinidad project</description>
-
<artifactId>sandbox-impl</artifactId>
<packaging>jar</packaging>
+ <dependencies>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope> <!-- force provided scope here -->
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>sandbox-build</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>sandbox-api</artifactId>
+ </dependency>
+
+ <!-- "test" scope dependencies -->
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>sandbox-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock-cglib</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
<build>
<plugins>
- <!--
- <plugin>
- <groupId>org.apache.myfaces.trinidadbuild</groupId>
- <artifactId>maven-jdev-plugin</artifactId>
- <version>1.2.3</version>
- <configuration>
- <sourceRoots>
- <sourceRoot>src/main/java-templates/</sourceRoot>
- </sourceRoots>
- <resourceRoots>
- <resourceRoot>src/main/javascript/</resourceRoot>
- </resourceRoots>
- </configuration>
- </plugin>
- -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
-<!-- Uncomment the following to run with assertions; however,
- do not do so with maven 2.0.6, as you get a LinkageError
- <argLine>-enableassertions</argLine>
- <forkMode>once</forkMode>
--->
<systemProperties>
<!-- Trinidad currently fails proper HTML ID validity,
and rather badly - so turn that test off -->
@@ -193,97 +261,7 @@
</plugin>
</plugins>
</build>
-
- <dependencies>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>sandbox-build</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-impl</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>sandbox-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- </dependency>
-
- <!-- "test" scope dependencies -->
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>sandbox-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock-cglib</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- </dependency>
-
- </dependencies>
-
+
<reporting>
<plugins>
<plugin>
@@ -294,7 +272,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<configuration>
- <targetJdk>1.5</targetJdk>
+ <targetJdk>${jdk.version}</targetJdk>
</configuration>
</plugin>
</plugins>
Modified: myfaces/trinidad/trunk/trinidad-sandbox/sandbox-impl/src/main/java/org/apache/myfaces/trinidadinternal/sandbox/renderkit/core/xhtml/TableFormLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-impl/src/main/java/org/apache/myfaces/trinidadinternal/sandbox/renderkit/core/xhtml/TableFormLayoutRenderer.java?rev=667693&r1=667692&r2=667693&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-sandbox/sandbox-impl/src/main/java/org/apache/myfaces/trinidadinternal/sandbox/renderkit/core/xhtml/TableFormLayoutRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-sandbox/sandbox-impl/src/main/java/org/apache/myfaces/trinidadinternal/sandbox/renderkit/core/xhtml/TableFormLayoutRenderer.java Fri Jun 13 16:21:23 2008
@@ -36,8 +36,7 @@
import javax.faces.context.ResponseWriter;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
import org.apache.myfaces.trinidad.component.UIXEditableValue;
@@ -56,8 +55,7 @@
public class TableFormLayoutRenderer extends XhtmlRenderer
{
- private static final Log LOG = LogFactory
- .getLog(TableFormLayoutRenderer.class);
+ private static final TrinidadLogger LOG = TrinidadLogger.createTrinidadLogger(TableFormLayoutRenderer.class);
public static final String USED = "used";
@@ -1440,7 +1438,7 @@
// set the width of the cell
boolean firstPut = false;
- LOG.info("ROW:" + rowIndex);
+ LOG.info("ROW: " + rowIndex);
int usedcells = 0;
int componentcells = 0;
@@ -2481,23 +2479,23 @@
if (end > columns)
{
- LOG.error("Error in Jsp (end > columns). "
+ LOG.severe("Error in Jsp (end > columns). "
+ "Try to insert more spanX as possible.");
- LOG.error("start: " + start);
- LOG.error("end: " + end);
- LOG.error("columns: " + columns);
- LOG.error("Actual cells:");
+ LOG.severe("start: " + start);
+ LOG.severe("end: " + end);
+ LOG.severe("columns: " + columns);
+ LOG.severe("Actual cells:");
for (Object component : cells)
{
if (component instanceof UIComponent)
{
- LOG.error("Cell-ID: "
+ LOG.severe("Cell-ID: "
+ ((UIComponent) component).getId() + " "
+ ((UIComponent) component).getRendererType());
}
else
{
- LOG.error("Cell: " + component); // e.g. marker
+ LOG.severe("Cell: " + component); // e.g. marker
}
}