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/12 00:41:32 UTC
svn commit: r666878 [2/2] - in /myfaces/trinidad/trunk_1.2.x: ./
trinidad-api/ trinidad-assembly/ trinidad-build/ trinidad-examples/
trinidad-examples/trinidad-blank/ trinidad-examples/trinidad-demo/
trinidad-examples/trinidad-example-assembly/ trinida...
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-impl/pom.xml?rev=666878&r1=666877&r2=666878&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-impl/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-impl/pom.xml Wed Jun 11 15:41:32 2008
@@ -19,45 +19,25 @@
-->
<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.2.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>
<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>
+ <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 -->
@@ -128,7 +108,7 @@
<renderKitPrefix>org.apache</renderKitPrefix>
<packageContains>org.apache.myfaces.trinidadinternal.sandbox</packageContains>
<removeRenderers>false</removeRenderers>
- <jsfVersion>1.2</jsfVersion>
+ <jsfVersion>${jsf-spec.version}</jsfVersion>
<force>true</force>
</configuration>
<executions>
@@ -142,24 +122,6 @@
</execution>
</executions>
</plugin>
- <!--
- <plugin>
- <groupId>org.apache.myfaces.trinidadbuild</groupId>
- <artifactId>maven-i18n-plugin</artifactId>
- <configuration>
- <force>true</force>
- <targetPath>META-INF/adf/jsLibs/resources</targetPath>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate-locale-elements</goal>
- <goal>generate-javascript-locales</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-javascript-plugin</artifactId>
@@ -218,8 +180,6 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.1</version>
- <scope>compile</scope>
</dependency>
<dependency>
@@ -237,15 +197,15 @@
<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>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope> <!-- force provided scope here -->
</dependency>
<!-- "test" scope dependencies -->
@@ -259,32 +219,27 @@
<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>
@@ -297,7 +252,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_1.2.x/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_1.2.x/trinidad-sandbox/sandbox-impl/src/main/java/org/apache/myfaces/trinidadinternal/sandbox/renderkit/core/xhtml/TableFormLayoutRenderer.java?rev=666878&r1=666877&r2=666878&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-impl/src/main/java/org/apache/myfaces/trinidadinternal/sandbox/renderkit/core/xhtml/TableFormLayoutRenderer.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-impl/src/main/java/org/apache/myfaces/trinidadinternal/sandbox/renderkit/core/xhtml/TableFormLayoutRenderer.java Wed Jun 11 15:41:32 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
}
}