myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From skitch...@apache.org
Subject svn commit: r673354 - in /myfaces/tomahawk/trunk: core12/pom.xml pom.xml
Date Wed, 02 Jul 2008 10:49:12 GMT
Author: skitching
Date: Wed Jul  2 03:49:11 2008
New Revision: 673354

URL: http://svn.apache.org/viewvc?rev=673354&view=rev
Log:
Make tomahawk core12 build again.

Modified:
    myfaces/tomahawk/trunk/core12/pom.xml
    myfaces/tomahawk/trunk/pom.xml

Modified: myfaces/tomahawk/trunk/core12/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core12/pom.xml?rev=673354&r1=673353&r2=673354&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core12/pom.xml (original)
+++ myfaces/tomahawk/trunk/core12/pom.xml Wed Jul  2 03:49:11 2008
@@ -52,7 +52,6 @@
       <version>1.1.1</version>
       <scope>compile</scope>
     </dependency>
-    
 
     <dependency>
       <groupId>commons-validator</groupId>
@@ -112,12 +111,24 @@
       <scope>compile</scope>
     </dependency>
 
-      <dependency>
-          <groupId>javax.servlet</groupId>
-          <artifactId>jstl</artifactId>
-          <version>1.1.0</version>
-          <scope>compile</scope>
-      </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jstl</artifactId>
+      <version>1.1.0</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>batik</groupId>
+      <artifactId>batik-awt-util</artifactId>
+      <version>1.6-1</version>
+    </dependency>   
+
+    <dependency>
+      <groupId>com.lowagie</groupId>
+      <artifactId>itext</artifactId>
+      <version>1.4.8</version>
+    </dependency> 
       
       <!--
       <dependency>
@@ -132,16 +143,14 @@
     <dependency>
       <groupId>org.apache.myfaces.core</groupId>
       <artifactId>myfaces-api</artifactId>
-      <version>1.2.4-SNAPSHOT</version>
-      <!-- <version>1.1.6-SNAPSHOT</version> -->
+      <version>${myfaces-core12-version}</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.myfaces.shared</groupId>
       <artifactId>myfaces-shared-tomahawk</artifactId>
-      <version>3.0.4-SNAPSHOT</version>
-      <!-- <version>2.0.8-SNAPSHOT</version> -->
+      <version>${myfaces-shared12-version}</version>
       <scope>provided</scope> <!-- because we add all classes to the jar directly
-->
     </dependency>
         
@@ -184,6 +193,7 @@
     <dependency>
       <groupId>org.apache.myfaces.core</groupId>
       <artifactId>myfaces-impl</artifactId>
+      <version>${myfaces-core12-version}</version>
       <!--
         Since Tomahawk must stay compatible to other JSF implementations we
         must not have any (compile time) dependency on myfaces-impl other than
@@ -505,26 +515,6 @@
           </excludes>
         </configuration>
       </plugin>
-      <!-- 
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>xslt-maven-plugin</artifactId>
-        <version>1.0</version>
-        <configuration>
-          <xslFile>src/main/tld/misc/resolve_entities.xsl</xslFile>
-          <srcIncludes>**/*.tld</srcIncludes>
-          <srcDir>src/main/tld</srcDir>
-          <destDir>target/classes/META-INF</destDir>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>transform</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-       -->
 
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
@@ -660,43 +650,6 @@
   <profiles>
     <profile>
       <id>generate-site</id>
-      <build>
-        <plugins>
-          <!-- 
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>xslt-maven-plugin</artifactId>
-            <version>1.0</version>
-            <executions>
-              <execution>
-                <id>generate-tld-for-tlddoc</id>
-                <goals>
-                  <goal>transform</goal>
-                </goals>
-                <configuration>
-                  <xslFile>src/main/tld/misc/resolve_entities-tlddoc.xsl</xslFile>
-                  <srcIncludes>**/*.tld</srcIncludes>
-                  <srcDir>src/main/tld</srcDir>
-                  <destDir>target/tlddoc-site</destDir>
-                </configuration>
-              </execution>
-              <execution>
-                <id>generate-tld-for-jar</id>
-                <goals>
-                  <goal>transform</goal>
-                </goals>
-                <configuration>
-                  <xslFile>src/main/tld/misc/resolve_entities.xsl</xslFile>
-                  <srcIncludes>**/*.tld</srcIncludes>
-                  <srcDir>src/main/tld</srcDir>
-                  <destDir>target/classes/META-INF</destDir>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          -->
-        </plugins>
-      </build>
       <reporting>
         <plugins>
           <plugin>
@@ -720,39 +673,6 @@
       </activation>
       <build>
         <plugins>
-          <!-- 
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>xslt-maven-plugin</artifactId>
-            <version>1.0</version>
-            <executions>
-              <execution>
-                <id>generate-tld-for-tlddoc</id>
-                <goals>
-                  <goal>transform</goal>
-                </goals>
-                <configuration>
-                  <xslFile>src/main/tld/misc/resolve_entities-tlddoc.xsl</xslFile>
-                  <srcIncludes>**/*.tld</srcIncludes>
-                  <srcDir>src/main/tld</srcDir>
-                  <destDir>target/tlddoc-site</destDir>
-                </configuration>
-              </execution>
-              <execution>
-                <id>generate-tld-for-jar</id>
-                <goals>
-                  <goal>transform</goal>
-                </goals>
-                <configuration>
-                  <xslFile>src/main/tld/misc/resolve_entities.xsl</xslFile>
-                  <srcIncludes>**/*.tld</srcIncludes>
-                  <srcDir>src/main/tld</srcDir>
-                  <destDir>target/classes/META-INF</destDir>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-           -->
           <plugin>
             <artifactId>maven-javadoc-plugin</artifactId>
             <version>2.4</version>

Modified: myfaces/tomahawk/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/pom.xml?rev=673354&r1=673353&r2=673354&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/pom.xml (original)
+++ myfaces/tomahawk/trunk/pom.xml Wed Jul  2 03:49:11 2008
@@ -84,9 +84,7 @@
     
   <modules>
     <module>core</module>
-<!--
     <module>core12</module>
--->
     <module>examples</module>
     <module>sandbox</module>
   </modules>
@@ -106,6 +104,21 @@
       - Define what shared lib version tomahawk and sandbox code will be compiled with.
       -->
     <myfaces-shared11-version>2.0.8-SNAPSHOT</myfaces-shared11-version>
+
+    <!--
+      - Define what version of myfaces core 1.2 the tomahawk core12 and sandbox12
+      - code will be compiled and tested against.
+      -
+      - This also affects what version of myfaces the sandbox examples run
+      - against *when jsf1.2 is selected*. When jsf1.1 or a Sun implementation
+      - are selected for running the examples, this is ignored.
+      -->
+    <myfaces-core12-version>1.2.4-SNAPSHOT</myfaces-core12-version>
+
+    <!--  
+      - Define what shared lib version tomahawk12 and sandbox12 code will be compiled with.
+      -->
+    <myfaces-shared12-version>3.0.4-SNAPSHOT</myfaces-shared12-version>
   </properties>
 
 </project>



Mime
View raw message