myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bom...@apache.org
Subject svn commit: r399783 - in /myfaces/tobago/trunk: core/ core/src/main/java/org/apache/myfaces/tobago/renderkit/ example/addressbook/ example/blank/ example/demo/ example/facelets/ example/foreach/ example/nonfacesrequest/ example/test/ theme/charlottevil...
Date Thu, 04 May 2006 17:29:29 GMT
Author: bommel
Date: Thu May  4 10:29:25 2006
New Revision: 399783

URL: http://svn.apache.org/viewcvs?rev=399783&view=rev
Log:
enable tomcat plugin
enable retrotranslater

Modified:
    myfaces/tobago/trunk/core/pom.xml
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java
    myfaces/tobago/trunk/example/addressbook/pom.xml
    myfaces/tobago/trunk/example/blank/pom.xml
    myfaces/tobago/trunk/example/demo/pom.xml
    myfaces/tobago/trunk/example/facelets/pom.xml
    myfaces/tobago/trunk/example/foreach/pom.xml
    myfaces/tobago/trunk/example/nonfacesrequest/pom.xml
    myfaces/tobago/trunk/example/test/pom.xml
    myfaces/tobago/trunk/theme/charlotteville/pom.xml
    myfaces/tobago/trunk/theme/richmond/pom.xml
    myfaces/tobago/trunk/theme/scarborough/pom.xml
    myfaces/tobago/trunk/theme/speyside/pom.xml
    myfaces/tobago/trunk/theme/standard/pom.xml
    myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml

Modified: myfaces/tobago/trunk/core/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/core/pom.xml?rev=399783&r1=399782&r2=399783&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/pom.xml (original)
+++ myfaces/tobago/trunk/core/pom.xml Thu May  4 10:29:25 2006
@@ -324,58 +324,60 @@
         </plugins>
       </build>
     </profile>
-    <!--<profile>-->
+    <profile>
 
-<!--mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar-->
-<!--mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar-->
+<!--
 
-      <!--<id>jdk14retro</id>-->
-      <!--<build>-->
-        <!--<plugins>-->
-          <!--<plugin>-->
-            <!--<groupId>org.codehaus.mojo</groupId>-->
-            <!--<artifactId>retrotranslator-maven-plugin</artifactId>-->
-            <!--<executions>-->
-              <!--<execution>-->
-                <!--<goals>-->
-                  <!--<goal>translate</goal>-->
-                <!--</goals>-->
-                <!--<configuration>-->
-                  <!--<verify>true</verify>-->
-                <!--</configuration>-->
-              <!--</execution>-->
-            <!--</executions>-->
-          <!--</plugin>-->
-          <!--<plugin>-->
-            <!--<artifactId>maven-jar-plugin</artifactId>-->
-            <!--<executions>-->
-              <!--<execution>-->
-                <!--<goals>-->
-                  <!--<goal>jar</goal>-->
-                <!--</goals>-->
-                <!--<configuration>-->
-                <!--<classesDirectory>${project.build.directory}/classes-retro</classesDirectory>-->
-                  <!--<classifier>jdk14retro</classifier>-->
-                <!--</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>-->
-        <!--<dependency>-->
-          <!--<groupId>net.sf.retrotranslator</groupId>-->
-          <!--<artifactId>retrotranslator-runtime</artifactId>-->
-          <!--<version>1.0.3</version>-->
-        <!--</dependency>-->
-      <!--</dependencies>-->
-    <!--</profile>-->
+  mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar
+  mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar-->
+
+      <id>jdk14retro</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>retrotranslator-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>translate</goal>
+                </goals>
+                <configuration>
+                  <verify>true</verify>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-jar-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+                <configuration>
+                <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
+                  <classifier>jdk14retro</classifier>
+                </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>
+        <dependency>
+          <groupId>net.sf.retrotranslator</groupId>
+          <artifactId>retrotranslator-runtime</artifactId>
+          <version>1.0.3</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java?rev=399783&r1=399782&r2=399783&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java Thu May  4 10:29:25 2006
@@ -28,7 +28,6 @@
 import org.apache.myfaces.tobago.config.ThemeConfig;
 import org.apache.myfaces.tobago.util.LayoutUtil;
 
-import javax.faces.application.Application;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
 import javax.faces.component.ValueHolder;
@@ -37,6 +36,7 @@
 import javax.faces.convert.ConverterException;
 import javax.faces.el.ValueBinding;
 import javax.faces.render.Renderer;
+import javax.faces.FacesException;
 import java.awt.Dimension;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -317,33 +317,40 @@
     }
   }
 
-  public Object getConvertedValue(FacesContext context,
-      UIComponent component, Object submittedValue)
-      throws ConverterException {
-    ValueBinding valueBinding = component.getValueBinding("value");
+  public Converter getConverter(FacesContext context, UIComponent component) {
     Converter converter = null;
-    Object result;
     if (component instanceof ValueHolder) {
-      converter = ((ValueHolder) component).getConverter();
+      converter = ((ValueHolder)component).getConverter();
     }
-    if (null == converter && null != valueBinding) {
-      Class converterType = valueBinding.getType(context);
-      if (converterType == null || converterType == String.class
-          || converterType == Object.class) {
-        return submittedValue;
+    if (converter == null) {
+      ValueBinding valueBinding = component.getValueBinding("value");
+      if (valueBinding != null) {
+        Class converterType = valueBinding.getType(context);
+        if (converterType == null || converterType == String.class
+            || converterType == Object.class) {
+          return null;
+        }
+        try {
+          converter = context.getApplication().createConverter(converterType);
+        } catch (FacesException e) {
+          LOG.error("No Converter found for type " + converterType);
+        }
       }
-      Application application = context.getApplication();
-      converter = application.createConverter(converterType);
-    } else if (converter == null) {
+    }
+    return converter;
+  }
+
+  public Object getConvertedValue(FacesContext context,
+      UIComponent component, Object submittedValue)
+      throws ConverterException {
+    if (!(submittedValue instanceof String)) {
       return submittedValue;
     }
-    if (converter != null && submittedValue instanceof String) {
-      result
-          = converter.getAsObject(context, component, (String) submittedValue);
-      return result;
+    Converter converter = getConverter(context, component);
+    if (converter != null) {
+      return converter.getAsObject(context, component, (String) submittedValue);
     } else {
-      throw new ConverterException("type conversion error: "
-          + "submittedValue='" + submittedValue + "'");
+      return submittedValue;
     }
   }
 

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java?rev=399783&r1=399782&r2=399783&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java Thu May  4 10:29:25 2006
@@ -30,6 +30,7 @@
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Arrays;
 
 public class SelectManyRendererBase extends RendererBase {
 
@@ -111,12 +112,7 @@
         // expected type is a List
         // --> according to javadoc of UISelectMany we assume that the element type
         //     is java.lang.String, and copy the String array to a new List
-        int len = submittedValue.length;
-        List lst = new ArrayList(len);
-        for (int i = 0; i < len; i++) {
-          lst.add(submittedValue[i]);
-        }
-        return lst;
+        return Arrays.asList(submittedValue);
       }
 
       if (arrayComponentType == null) {
@@ -140,12 +136,10 @@
 
     // Now, we have a converter...
     // We determine the type of the component array after converting one of it's elements
-    if (vb != null) {
-      valueType = vb.getType(facesContext);
-      if (valueType != null && valueType.isArray()) {
-        if (submittedValue.length > 0) {
-          arrayComponentType = converter.getAsObject(facesContext, component, submittedValue[0]).getClass();
-        }
+    if (vb != null && arrayComponentType == null
+        && valueType != null && valueType.isArray()) {
+      if (submittedValue.length > 0) {
+        arrayComponentType = converter.getAsObject(facesContext, component, submittedValue[0]).getClass();
       }
     }
 

Modified: myfaces/tobago/trunk/example/addressbook/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/example/addressbook/pom.xml?rev=399783&r1=399782&r2=399783&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/pom.xml (original)
+++ myfaces/tobago/trunk/example/addressbook/pom.xml Thu May  4 10:29:25 2006
@@ -10,18 +10,18 @@
   <name>Tobago Example Addressbook</name>
   <build>
     <finalName>tobago-example-addressbook</finalName>
-    <!--<plugins>-->
-      <!--<plugin>-->
-        <!--<groupId>org.codehaus.mojo</groupId>-->
-        <!--<artifactId>tomcat-maven-plugin</artifactId>-->
-        <!--<version>1.0-SNAPSHOT</version>-->
-        <!--<configuration>-->
-          <!--<server>tomcat</server>-->
-          <!--<update>true</update>-->
-          <!--<url>change if not http://localhost:8080/manager</url>-->
-        <!--</configuration>-->
-      <!--</plugin>-->
-    <!--</plugins>-->
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>tomcat-maven-plugin</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <configuration>
+          <server>tomcat</server>
+          <update>true</update>
+          <url>http://localhost:8080/manager</url>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 
   <scm>

Modified: myfaces/tobago/trunk/example/blank/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/example/blank/pom.xml?rev=399783&r1=399782&r2=399783&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/blank/pom.xml (original)
+++ myfaces/tobago/trunk/example/blank/pom.xml Thu May  4 10:29:25 2006
@@ -11,18 +11,16 @@
   <build>
     <finalName>tobago-example-blank</finalName>
     <plugins>
-
-      <!--<plugin>-->
-        <!--<groupId>org.codehaus.mojo</groupId>-->
-        <!--<artifactId>tomcat-maven-plugin</artifactId>-->
-        <!--<version>1.0-SNAPSHOT</version>-->
-        <!--<configuration>-->
-          <!--<server>tomcat</server>-->
-          <!--<update>true</update>-->
-          <!--<url>http://localhost:8080/manager</url>-->
-        <!--</configuration>-->
-      <!--</plugin>-->
-
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>tomcat-maven-plugin</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <configuration>
+          <server>tomcat</server>
+          <update>true</update>
+          <url>http://localhost:8080/manager</url>-->
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

Modified: myfaces/tobago/trunk/example/demo/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/example/demo/pom.xml?rev=399783&r1=399782&r2=399783&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/pom.xml (original)
+++ myfaces/tobago/trunk/example/demo/pom.xml Thu May  4 10:29:25 2006
@@ -11,7 +11,6 @@
   <build>
     <finalName>tobago-example-demo</finalName>
     <plugins>
-
       <plugin>
         <groupId>org.apache.myfaces.tobago</groupId>
         <artifactId>maven-theme-plugin</artifactId>
@@ -24,21 +23,18 @@
           </execution>
         </executions>
       </plugin>
-
-      <!--<plugin>-->
-        <!--<groupId>org.codehaus.mojo</groupId>-->
-        <!--<artifactId>tomcat-maven-plugin</artifactId>-->
-        <!--<version>1.0-SNAPSHOT</version>-->
-        <!--<configuration>-->
-          <!--<server>tomcat</server>-->
-          <!--<update>true</update>-->
-          <!--<url>http://mononoke:8080/manager</url>-->
-        <!--</configuration>-->
-      <!--</plugin>-->
-
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>tomcat-maven-plugin</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <configuration>
+          <server>tomcat</server>
+          <update>true</update>
+          <url>http://localhost:8080/manager</url>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
-
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/demo</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/demo</developerConnection>

Modified: myfaces/tobago/trunk/example/facelets/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/example/facelets/pom.xml?rev=399783&r1=399782&r2=399783&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/facelets/pom.xml (original)
+++ myfaces/tobago/trunk/example/facelets/pom.xml Thu May  4 10:29:25 2006
@@ -10,18 +10,18 @@
   <name>Tobago Example Facelets</name>
   <build>
     <finalName>tobago-example-facelets</finalName>
-    <!--<plugins>-->
-      <!--<plugin>-->
-        <!--<groupId>org.codehaus.mojo</groupId>-->
-        <!--<artifactId>tomcat-maven-plugin</artifactId>-->
-        <!--<version>1.0-SNAPSHOT</version>-->
-        <!--<configuration>-->
-          <!--<server>tomcat</server>-->
-          <!--<update>true</update>-->
-          <!--<url>http://localhost:8080/manager</url>-->
-        <!--</configuration>-->
-      <!--</plugin>-->
-    <!--</plugins>-->
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>tomcat-maven-plugin</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <configuration>
+          <server>tomcat</server>
+          <update>true</update>
+          <url>http://localhost:8080/manager</url>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 
   <scm>

Modified: myfaces/tobago/trunk/example/foreach/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/example/foreach/pom.xml?rev=399783&r1=399782&r2=399783&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/foreach/pom.xml (original)
+++ myfaces/tobago/trunk/example/foreach/pom.xml Thu May  4 10:29:25 2006
@@ -10,20 +10,20 @@
   <name>Tobago Example Foreach</name>
   <build>
     <finalName>tobago-example-foreach</finalName>
-    <!--<plugins>-->
+    <plugins>
 
-      <!--<plugin>-->
-        <!--<groupId>org.codehaus.mojo</groupId>-->
-        <!--<artifactId>tomcat-maven-plugin</artifactId>-->
-        <!--<version>1.0-SNAPSHOT</version>-->
-        <!--<configuration>-->
-          <!--<server>tomcat</server>-->
-          <!--<update>true</update>-->
-          <!--<url>change if not http://localhost:8080/manager</url>-->
-        <!--</configuration>-->
-      <!--</plugin>-->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>tomcat-maven-plugin</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <configuration>
+          <server>tomcat</server>
+          <update>true</update>
+          <url>http://localhost:8080/manager</url>
+        </configuration>
+      </plugin>
 
-    <!--</plugins>-->
+    </plugins>
   </build>
 
   <scm>

Modified: myfaces/tobago/trunk/example/nonfacesrequest/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/example/nonfacesrequest/pom.xml?rev=399783&r1=399782&r2=399783&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/nonfacesrequest/pom.xml (original)
+++ myfaces/tobago/trunk/example/nonfacesrequest/pom.xml Thu May  4 10:29:25 2006
@@ -10,20 +10,18 @@
   <name>Tobago Example Non-Faces-Request</name>
   <build>
     <finalName>tobago-example-nonfacesrequest</finalName>
-    <!--<plugins>-->
-
-      <!--<plugin>-->
-        <!--<groupId>org.codehaus.mojo</groupId>-->
-        <!--<artifactId>tomcat-maven-plugin</artifactId>-->
-        <!--<version>1.0-SNAPSHOT</version>-->
-        <!--<configuration>-->
-          <!--<server>tomcat</server>-->
-          <!--<update>true</update>-->
-          <!--<url>change if not http://localhost:8080/manager</url>-->
-        <!--</configuration>-->
-      <!--</plugin>-->
-      
-    <!--</plugins>-->
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>tomcat-maven-plugin</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <configuration>
+          <server>tomcat</server>
+          <update>true</update>
+          <url>http://localhost:8080/manager</url>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 
   <scm>

Modified: myfaces/tobago/trunk/example/test/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/example/test/pom.xml?rev=399783&r1=399782&r2=399783&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/pom.xml (original)
+++ myfaces/tobago/trunk/example/test/pom.xml Thu May  4 10:29:25 2006
@@ -11,18 +11,16 @@
   <build>
     <finalName>tobago-example-test</finalName>
     <plugins>
-
-      <!--<plugin>-->
-        <!--<groupId>org.codehaus.mojo</groupId>-->
-        <!--<artifactId>tomcat-maven-plugin</artifactId>-->
-        <!--<version>1.0-SNAPSHOT</version>-->
-        <!--<configuration>-->
-          <!--<server>tomcat</server>-->
-          <!--<update>true</update>-->
-          <!--<url>http://localhost:8080/manager</url>-->
-        <!--</configuration>-->
-      <!--</plugin>-->
-
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>tomcat-maven-plugin</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <configuration>
+          <server>tomcat</server>
+          <update>true</update>
+          <url>http://localhost:8080/manager</url>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty6-plugin</artifactId>
@@ -30,7 +28,6 @@
           <scanIntervalSeconds>10</scanIntervalSeconds>
         </configuration>
       </plugin>
-      
     </plugins>
   </build>
 

Modified: myfaces/tobago/trunk/theme/charlotteville/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/theme/charlotteville/pom.xml?rev=399783&r1=399782&r2=399783&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/charlotteville/pom.xml (original)
+++ myfaces/tobago/trunk/theme/charlotteville/pom.xml Thu May  4 10:29:25 2006
@@ -41,61 +41,60 @@
     </dependency>
 
   </dependencies>
+  <profiles>
+    <profile>
 
-  <!--<profiles>-->
-    <!--<profile>-->
-
-  <!--mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar-->
-  <!--mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar-->
-
-      <!--<id>jdk14retro</id>-->
-      <!--<build>-->
-        <!--<plugins>-->
-          <!--<plugin>-->
-            <!--<groupId>org.codehaus.mojo</groupId>-->
-            <!--<artifactId>retrotranslator-maven-plugin</artifactId>-->
-            <!--<executions>-->
-              <!--<execution>-->
-                <!--<goals>-->
-                  <!--<goal>translate</goal>-->
-                <!--</goals>-->
-                <!--<configuration>-->
-                  <!--<verify>true</verify>-->
-                <!--</configuration>-->
-              <!--</execution>-->
-            <!--</executions>-->
-          <!--</plugin>-->
-          <!--<plugin>-->
-            <!--<artifactId>maven-jar-plugin</artifactId>-->
-            <!--<executions>-->
-              <!--<execution>-->
-                <!--<goals>-->
-                  <!--<goal>jar</goal>-->
-                <!--</goals>-->
-                <!--<configuration>-->
-                <!--<classesDirectory>${project.build.directory}/classes-retro</classesDirectory>-->
-                  <!--<classifier>jdk14retro</classifier>-->
-                <!--</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>-->
-        <!--<dependency>-->
-          <!--<groupId>net.sf.retrotranslator</groupId>-->
-          <!--<artifactId>retrotranslator-runtime</artifactId>-->
-          <!--<version>1.0.3</version>-->
-        <!--</dependency>-->
-      <!--</dependencies>-->
-    <!--</profile>-->
-  <!--</profiles>-->
+  <!--
+  mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar
+  mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar-->
 
+      <id>jdk14retro</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>retrotranslator-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>translate</goal>
+                </goals>
+                <configuration>
+                  <verify>true</verify>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-jar-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+                <configuration>
+                <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
+                  <classifier>jdk14retro</classifier>
+                </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>
+        <dependency>
+          <groupId>net.sf.retrotranslator</groupId>
+          <artifactId>retrotranslator-runtime</artifactId>
+          <version>1.0.3</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>

Modified: myfaces/tobago/trunk/theme/richmond/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/theme/richmond/pom.xml?rev=399783&r1=399782&r2=399783&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/richmond/pom.xml (original)
+++ myfaces/tobago/trunk/theme/richmond/pom.xml Thu May  4 10:29:25 2006
@@ -39,60 +39,60 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  <!--<profiles>-->
-      <!--<profile>-->
-
-  <!--mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar-->
-  <!--mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar-->
-
-        <!--<id>jdk14retro</id>-->
-        <!--<build>-->
-          <!--<plugins>-->
-            <!--<plugin>-->
-              <!--<groupId>org.codehaus.mojo</groupId>-->
-              <!--<artifactId>retrotranslator-maven-plugin</artifactId>-->
-              <!--<executions>-->
-                <!--<execution>-->
-                  <!--<goals>-->
-                    <!--<goal>translate</goal>-->
-                  <!--</goals>-->
-                  <!--<configuration>-->
-                    <!--<verify>true</verify>-->
-                  <!--</configuration>-->
-                <!--</execution>-->
-              <!--</executions>-->
-            <!--</plugin>-->
-            <!--<plugin>-->
-              <!--<artifactId>maven-jar-plugin</artifactId>-->
-              <!--<executions>-->
-                <!--<execution>-->
-                  <!--<goals>-->
-                    <!--<goal>jar</goal>-->
-                  <!--</goals>-->
-                  <!--<configuration>-->
-                  <!--<classesDirectory>${project.build.directory}/classes-retro</classesDirectory>-->
-                    <!--<classifier>jdk14retro</classifier>-->
-                  <!--</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>-->
-          <!--<dependency>-->
-            <!--<groupId>net.sf.retrotranslator</groupId>-->
-            <!--<artifactId>retrotranslator-runtime</artifactId>-->
-            <!--<version>1.0.3</version>-->
-          <!--</dependency>-->
-        <!--</dependencies>-->
-      <!--</profile>-->
-    <!--</profiles>-->
+  <profiles>
+      <profile>
+        <!--
+  mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar
+  mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar
+        -->
+        <id>jdk14retro</id>
+        <build>
+          <plugins>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>retrotranslator-maven-plugin</artifactId>
+              <executions>
+                <execution>
+                  <goals>
+                    <goal>translate</goal>
+                  </goals>
+                  <configuration>
+                    <verify>true</verify>
+                  </configuration>
+                </execution>
+              </executions>
+            </plugin>
+            <plugin>
+              <artifactId>maven-jar-plugin</artifactId>
+              <executions>
+                <execution>
+                  <goals>
+                    <goal>jar</goal>
+                  </goals>
+                  <configuration>
+                  <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
+                    <classifier>jdk14retro</classifier>
+                  </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>
+          <dependency>
+            <groupId>net.sf.retrotranslator</groupId>
+            <artifactId>retrotranslator-runtime</artifactId>
+            <version>1.0.3</version>
+          </dependency>
+        </dependencies>
+      </profile>
+    </profiles>
 
 </project>

Modified: myfaces/tobago/trunk/theme/scarborough/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/theme/scarborough/pom.xml?rev=399783&r1=399782&r2=399783&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/pom.xml (original)
+++ myfaces/tobago/trunk/theme/scarborough/pom.xml Thu May  4 10:29:25 2006
@@ -65,59 +65,59 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <!--<profiles>-->
-    <!--<profile>-->
-
-  <!--mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar-->
-  <!--mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar-->
-
-      <!--<id>jdk14retro</id>-->
-      <!--<build>-->
-        <!--<plugins>-->
-          <!--<plugin>-->
-            <!--<groupId>org.codehaus.mojo</groupId>-->
-            <!--<artifactId>retrotranslator-maven-plugin</artifactId>-->
-            <!--<executions>-->
-              <!--<execution>-->
-                <!--<goals>-->
-                  <!--<goal>translate</goal>-->
-                <!--</goals>-->
-                <!--<configuration>-->
-                  <!--<verify>true</verify>-->
-                <!--</configuration>-->
-              <!--</execution>-->
-            <!--</executions>-->
-          <!--</plugin>-->
-          <!--<plugin>-->
-            <!--<artifactId>maven-jar-plugin</artifactId>-->
-            <!--<executions>-->
-              <!--<execution>-->
-                <!--<goals>-->
-                  <!--<goal>jar</goal>-->
-                <!--</goals>-->
-                <!--<configuration>-->
-                <!--<classesDirectory>${project.build.directory}/classes-retro</classesDirectory>-->
-                  <!--<classifier>jdk14retro</classifier>-->
-                <!--</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>-->
-        <!--<dependency>-->
-          <!--<groupId>net.sf.retrotranslator</groupId>-->
-          <!--<artifactId>retrotranslator-runtime</artifactId>-->
-          <!--<version>1.0.3</version>-->
-        <!--</dependency>-->
-      <!--</dependencies>-->
-    <!--</profile>-->
-  <!--</profiles>-->
+  <profiles>
+    <profile>
+      <!--
+  mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar
+  mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar
+      -->
+      <id>jdk14retro</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>retrotranslator-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>translate</goal>
+                </goals>
+                <configuration>
+                  <verify>true</verify>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-jar-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+                <configuration>
+                <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
+                  <classifier>jdk14retro</classifier>
+                </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>
+        <dependency>
+          <groupId>net.sf.retrotranslator</groupId>
+          <artifactId>retrotranslator-runtime</artifactId>
+          <version>1.0.3</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>

Modified: myfaces/tobago/trunk/theme/speyside/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/theme/speyside/pom.xml?rev=399783&r1=399782&r2=399783&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/pom.xml (original)
+++ myfaces/tobago/trunk/theme/speyside/pom.xml Thu May  4 10:29:25 2006
@@ -43,58 +43,60 @@
 
   </dependencies>
 
-  <!--<profiles>-->
-    <!--<profile>-->
-  <!--mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar-->
-  <!--mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar-->
-      <!--<id>jdk14retro</id>-->
-      <!--<build>-->
-        <!--<plugins>-->
-          <!--<plugin>-->
-            <!--<groupId>org.codehaus.mojo</groupId>-->
-            <!--<artifactId>retrotranslator-maven-plugin</artifactId>-->
-            <!--<executions>-->
-              <!--<execution>-->
-                <!--<goals>-->
-                  <!--<goal>translate</goal>-->
-                <!--</goals>-->
-                <!--<configuration>-->
-                  <!--<verify>true</verify>-->
-                <!--</configuration>-->
-              <!--</execution>-->
-            <!--</executions>-->
-          <!--</plugin>-->
-          <!--<plugin>-->
-            <!--<artifactId>maven-jar-plugin</artifactId>-->
-            <!--<executions>-->
-              <!--<execution>-->
-                <!--<goals>-->
-                  <!--<goal>jar</goal>-->
-                <!--</goals>-->
-                <!--<configuration>-->
-                <!--<classesDirectory>${project.build.directory}/classes-retro</classesDirectory>-->
-                  <!--<classifier>jdk14retro</classifier>-->
-                <!--</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>-->
-        <!--<dependency>-->
-          <!--<groupId>net.sf.retrotranslator</groupId>-->
-          <!--<artifactId>retrotranslator-runtime</artifactId>-->
-          <!--<version>1.0.3</version>-->
-        <!--</dependency>-->
-      <!--</dependencies>-->
-    <!--</profile>-->
-  <!--</profiles>-->
+  <profiles>
+    <profile>
+      <!--
+  mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar
+  mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar
+      -->
+      <id>jdk14retro</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>retrotranslator-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>translate</goal>
+                </goals>
+                <configuration>
+                  <verify>true</verify>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-jar-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+                <configuration>
+                  <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
+                  <classifier>jdk14retro</classifier>
+                </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>
+        <dependency>
+          <groupId>net.sf.retrotranslator</groupId>
+          <artifactId>retrotranslator-runtime</artifactId>
+          <version>1.0.3</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 
 </project>

Modified: myfaces/tobago/trunk/theme/standard/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/theme/standard/pom.xml?rev=399783&r1=399782&r2=399783&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/pom.xml (original)
+++ myfaces/tobago/trunk/theme/standard/pom.xml Thu May  4 10:29:25 2006
@@ -38,60 +38,60 @@
 
   </dependencies>
 
-  <!--<profiles>-->
-    <!--<profile>-->
-
-<!--mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar-->
-<!--mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar-->
-
-      <!--<id>jdk14retro</id>-->
-      <!--<build>-->
-        <!--<plugins>-->
-          <!--<plugin>-->
-            <!--<groupId>org.codehaus.mojo</groupId>-->
-            <!--<artifactId>retrotranslator-maven-plugin</artifactId>-->
-            <!--<executions>-->
-              <!--<execution>-->
-                <!--<goals>-->
-                  <!--<goal>translate</goal>-->
-                <!--</goals>-->
-                <!--<configuration>-->
-                  <!--<verify>true</verify>-->
-                <!--</configuration>-->
-              <!--</execution>-->
-            <!--</executions>-->
-          <!--</plugin>-->
-          <!--<plugin>-->
-            <!--<artifactId>maven-jar-plugin</artifactId>-->
-            <!--<executions>-->
-              <!--<execution>-->
-                <!--<goals>-->
-                  <!--<goal>jar</goal>-->
-                <!--</goals>-->
-                <!--<configuration>-->
-                <!--<classesDirectory>${project.build.directory}/classes-retro</classesDirectory>-->
-                  <!--<classifier>jdk14retro</classifier>-->
-                <!--</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>-->
-        <!--<dependency>-->
-          <!--<groupId>net.sf.retrotranslator</groupId>-->
-          <!--<artifactId>retrotranslator-runtime</artifactId>-->
-          <!--<version>1.0.3</version>-->
-        <!--</dependency>-->
-      <!--</dependencies>-->
-    <!--</profile>-->
-  <!--</profiles>-->
+  <profiles>
+    <profile>
+      <!--
+mvn install:install-file -Dfile=retrotranslator-runtime-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-runtime -Dversion=1.0.3 -Dpackaging=jar
+mvn install:install-file -Dfile=retrotranslator-transformer-1.0.3.jar -DgroupId=net.sf.retrotranslator -DartifactId=retrotranslator-transformer -Dversion=1.0.3 -Dpackaging=jar
+      -->
+      <id>jdk14retro</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>retrotranslator-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>translate</goal>
+                </goals>
+                <configuration>
+                  <verify>true</verify>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-jar-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+                <configuration>
+                <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
+                  <classifier>jdk14retro</classifier>
+                </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>
+        <dependency>
+          <groupId>net.sf.retrotranslator</groupId>
+          <artifactId>retrotranslator-runtime</artifactId>
+          <version>1.0.3</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 
 </project>

Modified: myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml?rev=399783&r1=399782&r2=399783&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml Thu May  4 10:29:25 2006
@@ -10,7 +10,7 @@
   <name>Tobago gendoc</name>
   <build>
     <finalName>gendoc</finalName>
-    <!--<plugins>
+    <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>tomcat-maven-plugin</artifactId>
@@ -21,7 +21,7 @@
           <url>http://localhost:8080/manager</url>
         </configuration>
       </plugin>
-    </plugins>-->
+    </plugins>
   </build>
   <dependencies>
     <dependency>



Mime
View raw message