You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2007/11/30 20:48:43 UTC
svn commit: r599932 - in /myfaces/tobago/trunk: ./
core/src/main/java/org/apache/myfaces/tobago/component/
core/src/main/java/org/apache/myfaces/tobago/taglib/component/
core/src/main/java/org/apache/myfaces/tobago/taglib/decl/ example/demo/
example/fo...
Author: bommel
Date: Fri Nov 30 11:48:33 2007
New Revision: 599932
URL: http://svn.apache.org/viewvc?rev=599932&view=rev
Log:
some minor changes
update jetty version ...
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIColumn.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/HiddenTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasRenderRange.java
myfaces/tobago/trunk/example/demo/pom.xml
myfaces/tobago/trunk/example/foreach/pom.xml
myfaces/tobago/trunk/example/security/pom.xml
myfaces/tobago/trunk/example/test/pom.xml
myfaces/tobago/trunk/example/tobago-theme-example/pom.xml
myfaces/tobago/trunk/extension/fileupload/pom.xml
myfaces/tobago/trunk/extension/message-fix/pom.xml
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/theme/charlotteville/pom.xml
myfaces/tobago/trunk/theme/pom.xml
myfaces/tobago/trunk/theme/richmond/pom.xml
myfaces/tobago/trunk/theme/speyside/pom.xml
myfaces/tobago/trunk/theme/standard/pom.xml
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java?rev=599932&r1=599931&r2=599932&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java Fri Nov 30 11:48:33 2007
@@ -88,6 +88,7 @@
import javax.faces.webapp.UIComponentTag;
import javax.servlet.jsp.JspException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
@@ -582,9 +583,7 @@
list.add((SelectItem) value);
} else if (value instanceof SelectItem[]) {
SelectItem[] items = (SelectItem[]) value;
- for (SelectItem item : items) {
- list.add(item);
- }
+ list.addAll(Arrays.asList(items));
} else if (value instanceof Collection) {
for (Object o : ((Collection) value)) {
list.add((SelectItem) o);
@@ -1189,6 +1188,16 @@
return new String[0];
}
+
+ /**
+ * colonCount == 0: fully relative
+ * colonCount == 1: absolute (still normal findComponent syntax)
+ * colonCount > 1: for each extra colon after 1, go up a naming container
+ * (to the view root, if naming containers run out)
+ *
+ * @param
+ * @param
+ */
public static UIComponent findComponent(UIComponent from, String relativeId) {
int idLength = relativeId.length();
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIColumn.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIColumn.java?rev=599932&r1=599931&r2=599932&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIColumn.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIColumn.java Fri Nov 30 11:48:33 2007
@@ -18,8 +18,8 @@
*/
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_ALIGN;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SORTABLE;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LABEL;
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SORTABLE;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_WIDTH;
import javax.faces.context.FacesContext;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/HiddenTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/HiddenTagDeclaration.java?rev=599932&r1=599931&r2=599932&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/HiddenTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/HiddenTagDeclaration.java Fri Nov 30 11:48:33 2007
@@ -33,6 +33,7 @@
*/
/**
* Renders a 'hidden' input element.
+ *
*/
@Tag(name = "hidden")
@UIComponentTag(
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasRenderRange.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasRenderRange.java?rev=599932&r1=599931&r2=599932&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasRenderRange.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasRenderRange.java Fri Nov 30 11:48:33 2007
@@ -28,5 +28,5 @@
* Range of items to render.
*/
@TagAttribute @UIComponentTagAttribute()
- void setRenderRange(String range);
+ void setRenderRange(String renderRange);
}
Modified: myfaces/tobago/trunk/example/demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/pom.xml?rev=599932&r1=599931&r2=599932&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/pom.xml (original)
+++ myfaces/tobago/trunk/example/demo/pom.xml Fri Nov 30 11:48:33 2007
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -16,7 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-
<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>
<parent>
Modified: myfaces/tobago/trunk/example/foreach/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/foreach/pom.xml?rev=599932&r1=599931&r2=599932&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/foreach/pom.xml (original)
+++ myfaces/tobago/trunk/example/foreach/pom.xml Fri Nov 30 11:48:33 2007
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -16,7 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-
<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>
<parent>
Modified: myfaces/tobago/trunk/example/security/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/security/pom.xml?rev=599932&r1=599931&r2=599932&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/security/pom.xml (original)
+++ myfaces/tobago/trunk/example/security/pom.xml Fri Nov 30 11:48:33 2007
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -16,7 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-
<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>
<parent>
Modified: myfaces/tobago/trunk/example/test/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/pom.xml?rev=599932&r1=599931&r2=599932&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/pom.xml (original)
+++ myfaces/tobago/trunk/example/test/pom.xml Fri Nov 30 11:48:33 2007
@@ -161,6 +161,27 @@
</dependencies>
</profile>
<profile>
+ <id>myfaces12</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>myfaces12</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces12.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${myfaces12.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>jsf-provided</id>
<activation>
<property>
@@ -204,6 +225,61 @@
<scope>runtime</scope>
</dependency>
</dependencies>
+ </profile>
+ <profile>
+ <id>sunjsf12</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>ri12</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${sunjsf12.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${sunjsf12.version}</version>
+ </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>
+ </profile>
+ <profile>
+ <!--
+ mvn package cargo:start -Ptomcat5x
+ -->
+ <id>tomcat5x</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <configuration>
+ <container>
+ <containerId>tomcat5x</containerId>
+ <zipUrlInstaller>
+ <url>http://apache.easy-webs.de/tomcat/tomcat-5/v5.5.23/bin/apache-tomcat-5.5.23.zip</url>
+ <installDir>${project.build.directory}/tomcat5</installDir>
+ </zipUrlInstaller>
+ </container>
+ <configuration>
+ <home>${project.build.directory}/tomcat5/container</home>
+ </configuration>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
</project>
Modified: myfaces/tobago/trunk/example/tobago-theme-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/tobago-theme-example/pom.xml?rev=599932&r1=599931&r2=599932&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/tobago-theme-example/pom.xml (original)
+++ myfaces/tobago/trunk/example/tobago-theme-example/pom.xml Fri Nov 30 11:48:33 2007
@@ -15,7 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-
<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>
<parent>
Modified: myfaces/tobago/trunk/extension/fileupload/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/fileupload/pom.xml?rev=599932&r1=599931&r2=599932&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/fileupload/pom.xml (original)
+++ myfaces/tobago/trunk/extension/fileupload/pom.xml Fri Nov 30 11:48:33 2007
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -16,7 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-
<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>
<parent>
Modified: myfaces/tobago/trunk/extension/message-fix/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/message-fix/pom.xml?rev=599932&r1=599931&r2=599932&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/message-fix/pom.xml (original)
+++ myfaces/tobago/trunk/extension/message-fix/pom.xml Fri Nov 30 11:48:33 2007
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -16,7 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-
<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>
<parent>
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=599932&r1=599931&r2=599932&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Fri Nov 30 11:48:33 2007
@@ -511,21 +511,30 @@
<url>http://www.apache.org/</url>
</organization>
- <!--repositories>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>apache.snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </repository>
- </repositories>-->
<build>
<defaultGoal>install</defaultGoal>
<plugins>
+ <!--plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requirePluginVersions>
+ <message>Best Practice is to always define plugin versions!</message>
+ <banLatest>true</banLatest>
+ <banRelease>true</banRelease>
+ </requirePluginVersions>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
@@ -1008,7 +1017,7 @@
<sunjsf.version>1.1_02</sunjsf.version>
<sunjsf12.version>1.2_04-p02</sunjsf12.version>
<facelets.version>1.1.14</facelets.version>
- <jetty.version>6.1.5</jetty.version>
+ <jetty.version>6.1.6</jetty.version>
<common-io.version>1.1</common-io.version>
<common-lang.version>2.1</common-lang.version>
<commons-logging.version>1.1</commons-logging.version>
Modified: myfaces/tobago/trunk/theme/charlotteville/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/charlotteville/pom.xml?rev=599932&r1=599931&r2=599932&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/charlotteville/pom.xml (original)
+++ myfaces/tobago/trunk/theme/charlotteville/pom.xml Fri Nov 30 11:48:33 2007
@@ -15,7 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-
<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>
<parent>
Modified: myfaces/tobago/trunk/theme/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/pom.xml?rev=599932&r1=599931&r2=599932&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/pom.xml (original)
+++ myfaces/tobago/trunk/theme/pom.xml Fri Nov 30 11:48:33 2007
@@ -15,7 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-
<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>
<parent>
Modified: myfaces/tobago/trunk/theme/richmond/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/richmond/pom.xml?rev=599932&r1=599931&r2=599932&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/richmond/pom.xml (original)
+++ myfaces/tobago/trunk/theme/richmond/pom.xml Fri Nov 30 11:48:33 2007
@@ -15,7 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-
<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>
<parent>
Modified: myfaces/tobago/trunk/theme/speyside/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/pom.xml?rev=599932&r1=599931&r2=599932&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/pom.xml (original)
+++ myfaces/tobago/trunk/theme/speyside/pom.xml Fri Nov 30 11:48:33 2007
@@ -15,7 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-
<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>
<parent>
Modified: myfaces/tobago/trunk/theme/standard/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/pom.xml?rev=599932&r1=599931&r2=599932&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/pom.xml (original)
+++ myfaces/tobago/trunk/theme/standard/pom.xml Fri Nov 30 11:48:33 2007
@@ -15,7 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-
<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>
<parent>
@@ -26,6 +25,15 @@
<artifactId>tobago-theme-standard</artifactId>
<packaging>jar</packaging>
<name>Theme Standard</name>
+ <!--<build>
+ <plugins>
+ <plugin>
+ <groupId>gr.abiss.mvn.plugins</groupId>
+ <artifactId>mvn-jstools</artifactId>
+ <version>0.1</version>
+ </plugin>
+ </plugins>
+ </build>-->
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/theme/standard</connection>