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/06/10 09:22:55 UTC
svn commit: r545850 - in /myfaces/tobago/trunk: ./ contrib/facelets/
contrib/fileupload/ core/
core/src/main/java/org/apache/myfaces/tobago/renderkit/html/ sandbox/
theme/scarborough/
theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/...
Author: bommel
Date: Sun Jun 10 00:22:51 2007
New Revision: 545850
URL: http://svn.apache.org/viewvc?view=rev&rev=545850
Log:
(TOBAGO-418) Update retrotranslator to 1.2.1 version
Modified:
myfaces/tobago/trunk/contrib/facelets/pom.xml
myfaces/tobago/trunk/contrib/fileupload/pom.xml
myfaces/tobago/trunk/core/pom.xml
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/sandbox/pom.xml
myfaces/tobago/trunk/theme/scarborough/pom.xml
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
myfaces/tobago/trunk/theme/speyside/pom.xml
myfaces/tobago/trunk/theme/standard/pom.xml
myfaces/tobago/trunk/tobago-assembly/src/main/resources/README.txt
Modified: myfaces/tobago/trunk/contrib/facelets/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/contrib/facelets/pom.xml?view=diff&rev=545850&r1=545849&r2=545850
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/pom.xml (original)
+++ myfaces/tobago/trunk/contrib/facelets/pom.xml Sun Jun 10 00:22:51 2007
@@ -196,47 +196,23 @@
<artifactId>retrotranslator-maven-plugin</artifactId>
<executions>
<execution>
- <id>retrotranslate</id>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>create-jdk14retro-jar</id>
- <goals><goal>jar</goal></goals>
+ <goals>
+ <goal>translate-project</goal>
+ </goals>
<configuration>
- <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
<classifier>jdk14retro</classifier>
- <archive>
- <manifestSections>
- <manifestSection>
- <name>${project.artifactId}-jdk14retr</name>
- <manifestEntries>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Title>${project.description}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Revision>${scm.revision}</Revision>
- </manifestEntries>
- </manifestSection>
- </manifestSections>
- </archive>
+ <attach>true</attach>
+ <verify>true</verify>
+ <verifyClasspath>
+ <element>${java14.home}/lib/rt.jar</element>
+ </verifyClasspath>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>rt</artifactId>
- <version>1.4.0</version>
- <scope>system</scope>
- <systemPath>${java14.home}/lib/rt.jar</systemPath>
- </dependency>
+ <dependencies>
<dependency>
<groupId>net.sf.retrotranslator</groupId>
<artifactId>retrotranslator-runtime</artifactId>
Modified: myfaces/tobago/trunk/contrib/fileupload/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/contrib/fileupload/pom.xml?view=diff&rev=545850&r1=545849&r2=545850
==============================================================================
--- myfaces/tobago/trunk/contrib/fileupload/pom.xml (original)
+++ myfaces/tobago/trunk/contrib/fileupload/pom.xml Sun Jun 10 00:22:51 2007
@@ -54,35 +54,16 @@
<artifactId>retrotranslator-maven-plugin</artifactId>
<executions>
<execution>
- <id>retrotranslate</id>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>create-jdk14retro-jar</id>
<goals>
- <goal>jar</goal>
+ <goal>translate-project</goal>
</goals>
<configuration>
- <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
<classifier>jdk14retro</classifier>
- <archive>
- <manifestSections>
- <manifestSection>
- <name>${project.artifactId}-jdk14retr</name>
- <manifestEntries>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Title>${project.description}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Revision>${scm.revision}</Revision>
- </manifestEntries>
- </manifestSection>
- </manifestSections>
- </archive>
+ <attach>true</attach>
+ <verify>true</verify>
+ <verifyClasspath>
+ <element>${java14.home}/lib/rt.jar</element>
+ </verifyClasspath>
</configuration>
</execution>
</executions>
@@ -90,13 +71,6 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>rt</artifactId>
- <version>1.4.0</version>
- <scope>system</scope>
- <systemPath>${java14.home}/lib/rt.jar</systemPath>
- </dependency>
<dependency>
<groupId>net.sf.retrotranslator</groupId>
<artifactId>retrotranslator-runtime</artifactId>
Modified: myfaces/tobago/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/pom.xml?view=diff&rev=545850&r1=545849&r2=545850
==============================================================================
--- myfaces/tobago/trunk/core/pom.xml (original)
+++ myfaces/tobago/trunk/core/pom.xml Sun Jun 10 00:22:51 2007
@@ -379,66 +379,23 @@
<artifactId>retrotranslator-maven-plugin</artifactId>
<executions>
<execution>
- <id>retrotranslate</id>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-faces-configretro</id>
- <goals><goal>resources</goal></goals>
- <phase>process-classes</phase>
- <configuration>
- <outputDirectory>${project.build.directory}/classes-retro</outputDirectory>
- <resources>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>${project.build.directory}/generated-faces-config</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>create-jdk14retro-jar</id>
- <goals><goal>jar</goal></goals>
+ <goals>
+ <goal>translate-project</goal>
+ </goals>
<configuration>
- <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
<classifier>jdk14retro</classifier>
- <archive>
- <manifestSections>
- <manifestSection>
- <name>${project.artifactId}-jdk14retro</name>
- <manifestEntries>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Title>${project.description}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Revision>${scm.revision}</Revision>
- </manifestEntries>
- </manifestSection>
- </manifestSections>
- </archive>
+ <attach>true</attach>
+ <verify>true</verify>
+ <verifyClasspath>
+ <element>${java14.home}/lib/rt.jar</element>
+ </verifyClasspath>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>rt</artifactId>
- <version>1.4.0</version>
- <scope>system</scope>
- <systemPath>${java14.home}/lib/rt.jar</systemPath>
- </dependency>
+ <dependencies>
<dependency>
<groupId>net.sf.retrotranslator</groupId>
<artifactId>retrotranslator-runtime</artifactId>
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java?view=diff&rev=545850&r1=545849&r2=545850
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java Sun Jun 10 00:22:51 2007
@@ -161,9 +161,9 @@
public static void addClickAcceleratorKey(
FacesContext facesContext, String clientId, char key, String modifier)
throws IOException {
- StringBuilder buffer
+ String str
= createOnclickAcceleratorKeyJsStatement(clientId, key, modifier);
- writeScriptLoader(facesContext, null, new String[]{buffer.toString()});
+ writeScriptLoader(facesContext, null, new String[]{str});
}
public static void addAcceleratorKey(
@@ -174,17 +174,17 @@
public static void addAcceleratorKey(
FacesContext facesContext, String func, char key, String modifier)
throws IOException {
- StringBuilder buffer = createAcceleratorKeyJsStatement(func, key, modifier);
- writeScriptLoader(facesContext, null, new String[]{buffer.toString()});
+ String str = createAcceleratorKeyJsStatement(func, key, modifier);
+ writeScriptLoader(facesContext, null, new String[]{str});
}
- public static StringBuilder createOnclickAcceleratorKeyJsStatement(
+ public static String createOnclickAcceleratorKeyJsStatement(
String clientId, char key, String modifier) {
String func = "Tobago.clickOnElement('" + clientId + "');";
return createAcceleratorKeyJsStatement(func, key, modifier);
}
- public static StringBuilder createAcceleratorKeyJsStatement(
+ public static String createAcceleratorKeyJsStatement(
String func, char key, String modifier) {
StringBuilder buffer = new StringBuilder();
buffer.append("new Tobago.AcceleratorKey(function() {");
@@ -199,7 +199,7 @@
buffer.append(modifier);
}
buffer.append("\");");
- return buffer;
+ return buffer.toString();
}
public static String getLayoutSpaceStyle(UIComponent component) {
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?view=diff&rev=545850&r1=545849&r2=545850
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Sun Jun 10 00:22:51 2007
@@ -477,7 +477,7 @@
<artifactId>retrotranslator-runtime</artifactId>
<optional>true</optional>
<scope>provided</scope>
- <version>1.0.8</version>
+ <version>1.2.1</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -562,24 +562,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>retrotranslator-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
- <executions>
- <execution>
- <id>retrotranslate</id>
- <goals>
- <goal>translate</goal>
- </goals>
- <configuration>
- <verbose>true</verbose>
- <includes>
- <include>
- <directory>${project.build.directory}/classes</directory>
- </include>
- </includes>
- <destdir>${project.build.directory}/classes-retro</destdir>
- </configuration>
- </execution>
- </executions>
+ <version>1.0-alpha-2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: myfaces/tobago/trunk/sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/pom.xml?view=diff&rev=545850&r1=545849&r2=545850
==============================================================================
--- myfaces/tobago/trunk/sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/sandbox/pom.xml Sun Jun 10 00:22:51 2007
@@ -323,66 +323,23 @@
<artifactId>retrotranslator-maven-plugin</artifactId>
<executions>
<execution>
- <id>retrotranslate</id>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-faces-configretro</id>
- <goals><goal>resources</goal></goals>
- <phase>process-classes</phase>
- <configuration>
- <outputDirectory>${project.build.directory}/classes-retro</outputDirectory>
- <resources>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>target/generated-faces-config</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>create-jdk14retro-jar</id>
- <goals><goal>jar</goal></goals>
+ <goals>
+ <goal>translate-project</goal>
+ </goals>
<configuration>
- <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
<classifier>jdk14retro</classifier>
- <archive>
- <manifestSections>
- <manifestSection>
- <name>${project.artifactId}-jdk14retr</name>
- <manifestEntries>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Title>${project.description}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Revision>${scm.revision}</Revision>
- </manifestEntries>
- </manifestSection>
- </manifestSections>
- </archive>
+ <attach>true</attach>
+ <verify>true</verify>
+ <verifyClasspath>
+ <element>${java14.home}/lib/rt.jar</element>
+ </verifyClasspath>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>rt</artifactId>
- <version>1.4.0</version>
- <scope>system</scope>
- <systemPath>${java14.home}/lib/rt.jar</systemPath>
- </dependency>
+ <dependencies>
<dependency>
<groupId>net.sf.retrotranslator</groupId>
<artifactId>retrotranslator-runtime</artifactId>
Modified: myfaces/tobago/trunk/theme/scarborough/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/pom.xml?view=diff&rev=545850&r1=545849&r2=545850
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/pom.xml (original)
+++ myfaces/tobago/trunk/theme/scarborough/pom.xml Sun Jun 10 00:22:51 2007
@@ -94,43 +94,23 @@
<artifactId>retrotranslator-maven-plugin</artifactId>
<executions>
<execution>
- <id>retrotranslate</id>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>create-jdk14retro-jar</id>
- <goals><goal>jar</goal></goals>
+ <goals>
+ <goal>translate-project</goal>
+ </goals>
<configuration>
- <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
<classifier>jdk14retro</classifier>
- <archive>
- <manifestEntries>
- <Extension-Name>${project.artifactId}-jdk14retro</Extension-Name>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Title>${project.description}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Revision>${scm.revision}</Revision>
- </manifestEntries>
- </archive>
+ <attach>true</attach>
+ <verify>true</verify>
+ <verifyClasspath>
+ <element>${java14.home}/lib/rt.jar</element>
+ </verifyClasspath>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>rt</artifactId>
- <version>1.4.0</version>
- <scope>system</scope>
- <systemPath>${java14.home}/lib/rt.jar</systemPath>
- </dependency>
+ <dependencies>
<dependency>
<groupId>net.sf.retrotranslator</groupId>
<artifactId>retrotranslator-runtime</artifactId>
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java?view=diff&rev=545850&r1=545849&r2=545850
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java Sun Jun 10 00:22:51 2007
@@ -294,7 +294,7 @@
List<String> keys
= (List<String>) component.getAttributes().get(MENU_ACCELERATOR_KEYS);
String jsStatement = HtmlRendererUtil.createOnclickAcceleratorKeyJsStatement(
- clientId, accessKey, null).toString();
+ clientId, accessKey, null);
keys.add(jsStatement);
} else {
LOG.warn("Can't find menu root component!");
Modified: myfaces/tobago/trunk/theme/speyside/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/pom.xml?view=diff&rev=545850&r1=545849&r2=545850
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/pom.xml (original)
+++ myfaces/tobago/trunk/theme/speyside/pom.xml Sun Jun 10 00:22:51 2007
@@ -71,47 +71,23 @@
<artifactId>retrotranslator-maven-plugin</artifactId>
<executions>
<execution>
- <id>retrotranslate</id>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>create-jdk14retro-jar</id>
- <goals><goal>jar</goal></goals>
+ <goals>
+ <goal>translate-project</goal>
+ </goals>
<configuration>
- <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
<classifier>jdk14retro</classifier>
- <archive>
- <manifestSections>
- <manifestSection>
- <name>${project.artifactId}-jdk14retr</name>
- <manifestEntries>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Title>${project.description}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Revision>${scm.revision}</Revision>
- </manifestEntries>
- </manifestSection>
- </manifestSections>
- </archive>
+ <attach>true</attach>
+ <verify>true</verify>
+ <verifyClasspath>
+ <element>${java14.home}/lib/rt.jar</element>
+ </verifyClasspath>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>rt</artifactId>
- <version>1.4.0</version>
- <scope>system</scope>
- <systemPath>${java14.home}/lib/rt.jar</systemPath>
- </dependency>
+ <dependencies>
<dependency>
<groupId>net.sf.retrotranslator</groupId>
<artifactId>retrotranslator-runtime</artifactId>
Modified: myfaces/tobago/trunk/theme/standard/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/pom.xml?view=diff&rev=545850&r1=545849&r2=545850
==============================================================================
--- myfaces/tobago/trunk/theme/standard/pom.xml (original)
+++ myfaces/tobago/trunk/theme/standard/pom.xml Sun Jun 10 00:22:51 2007
@@ -69,43 +69,23 @@
<artifactId>retrotranslator-maven-plugin</artifactId>
<executions>
<execution>
- <id>retrotranslate</id>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>create-jdk14retro-jar</id>
- <goals><goal>jar</goal></goals>
+ <goals>
+ <goal>translate-project</goal>
+ </goals>
<configuration>
- <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
<classifier>jdk14retro</classifier>
- <archive>
- <manifestEntries>
- <Extension-Name>${project.artifactId}-jdk14retro</Extension-Name>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Title>${project.description}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Revision>${scm.revision}</Revision>
- </manifestEntries>
- </archive>
+ <attach>true</attach>
+ <verify>true</verify>
+ <verifyClasspath>
+ <element>${java14.home}/lib/rt.jar</element>
+ </verifyClasspath>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>rt</artifactId>
- <version>1.4.0</version>
- <scope>system</scope>
- <systemPath>${java14.home}/lib/rt.jar</systemPath>
- </dependency>
+ <dependencies>
<dependency>
<groupId>net.sf.retrotranslator</groupId>
<artifactId>retrotranslator-runtime</artifactId>
Modified: myfaces/tobago/trunk/tobago-assembly/src/main/resources/README.txt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-assembly/src/main/resources/README.txt?view=diff&rev=545850&r1=545849&r2=545850
==============================================================================
--- myfaces/tobago/trunk/tobago-assembly/src/main/resources/README.txt (original)
+++ myfaces/tobago/trunk/tobago-assembly/src/main/resources/README.txt Sun Jun 10 00:22:51 2007
@@ -20,8 +20,8 @@
don't need a JDK 1.4 version, because they don't contain any classes.
-Addtionally add the retrotranslator-runtime-1.0.8.jar from
-http://www.ibiblio.org/maven2/net/sf/retrotranslator/retrotranslator-runtime/
+Addtionally add the retrotranslator-runtime-1.2.1.jar from
+http://repo1.maven.org/maven2/net/sf/retrotranslator/retrotranslator-runtime/
to the WEB-INF/lib directory of your WAR.
NOTE: The JDK 1.4 version is work in progress.