You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2009/10/23 11:43:26 UTC

svn commit: r828976 - in /myfaces/tobago/trunk: ./ core/ example/ example/experimental/ extension/ sandbox/ theme/ tobago-jsf-compat/ tobago-tool/tobago-tool-annotation/ tobago-tool/tobago-tool-apt/

Author: lofwyr
Date: Fri Oct 23 09:43:25 2009
New Revision: 828976

URL: http://svn.apache.org/viewvc?rev=828976&view=rev
Log:
TOBAGO-658: JSF 1.2 compatibility
 using -D instead of -P to activate profiles, because there seems to be no way to deactivate a profile, if an other profile is active in maven 2.0

Modified:
    myfaces/tobago/trunk/core/pom.xml
    myfaces/tobago/trunk/example/experimental/pom.xml
    myfaces/tobago/trunk/example/pom.xml
    myfaces/tobago/trunk/extension/pom.xml
    myfaces/tobago/trunk/pom.xml
    myfaces/tobago/trunk/sandbox/pom.xml
    myfaces/tobago/trunk/theme/pom.xml
    myfaces/tobago/trunk/tobago-jsf-compat/pom.xml
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml
    myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml

Modified: myfaces/tobago/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/pom.xml?rev=828976&r1=828975&r2=828976&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/pom.xml (original)
+++ myfaces/tobago/trunk/core/pom.xml Fri Oct 23 09:43:25 2009
@@ -510,6 +510,12 @@
 
     <profile>
       <id>myfaces-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>myfaces-1.1</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>org.apache.myfaces.core</groupId>
@@ -526,7 +532,7 @@
       <id>myfaces-1.2</id>
       <activation>
         <property>
-          <name>!jsf.target</name>
+          <name>!jsf</name>
         </property>
       </activation>
       <dependencies>
@@ -543,6 +549,12 @@
 
     <profile>
       <id>mojarra-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.1</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>javax.faces</groupId>
@@ -557,6 +569,12 @@
 
     <profile>
       <id>mojarra-1.2</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.2</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>javax.faces</groupId>
@@ -571,6 +589,12 @@
 
     <profile>
       <id>mojarra-2.0</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-2.0</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>com.sun.faces</groupId>

Modified: myfaces/tobago/trunk/example/experimental/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/experimental/pom.xml?rev=828976&r1=828975&r2=828976&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/experimental/pom.xml (original)
+++ myfaces/tobago/trunk/example/experimental/pom.xml Fri Oct 23 09:43:25 2009
@@ -130,6 +130,12 @@
 
     <profile>
       <id>myfaces-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>myfaces-1.1</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>org.apache.myfaces.tomahawk</groupId>
@@ -143,7 +149,7 @@
       <id>myfaces-1.2</id>
       <activation>
         <property>
-          <name>!jsf.target</name>
+          <name>!jsf</name>
         </property>
       </activation>
       <dependencies>
@@ -157,6 +163,12 @@
 
     <profile>
       <id>mojarra-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.1</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>org.apache.myfaces.tomahawk</groupId>
@@ -168,6 +180,12 @@
 
     <profile>
       <id>mojarra-1.2</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.2</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>org.apache.myfaces.tomahawk</groupId>
@@ -179,6 +197,12 @@
 
     <profile>
       <id>mojarra-2.0</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-2.0</value>
+        </property>
+      </activation>
       <dependencies>
         <!-- todo: use correct artifact/version -->
         <dependency>

Modified: myfaces/tobago/trunk/example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/pom.xml?rev=828976&r1=828975&r2=828976&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/pom.xml (original)
+++ myfaces/tobago/trunk/example/pom.xml Fri Oct 23 09:43:25 2009
@@ -125,6 +125,12 @@
 
     <profile>
       <id>myfaces-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>myfaces-1.1</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>org.apache.myfaces.core</groupId>
@@ -143,7 +149,7 @@
       <id>myfaces-1.2</id>
       <activation>
         <property>
-          <name>!jsf.target</name>
+          <name>!jsf</name>
         </property>
       </activation>
       <dependencies>
@@ -162,6 +168,12 @@
 
     <profile>
       <id>mojarra-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.1</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>javax.faces</groupId>
@@ -178,6 +190,12 @@
 
     <profile>
       <id>mojarra-1.2</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.2</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>javax.faces</groupId>
@@ -194,6 +212,12 @@
 
     <profile>
       <id>mojarra-2.0</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-2.0</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>com.sun.faces</groupId>

Modified: myfaces/tobago/trunk/extension/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/pom.xml?rev=828976&r1=828975&r2=828976&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/pom.xml (original)
+++ myfaces/tobago/trunk/extension/pom.xml Fri Oct 23 09:43:25 2009
@@ -54,6 +54,12 @@
 
     <profile>
       <id>myfaces-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>myfaces-1.1</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>org.apache.myfaces.core</groupId>
@@ -66,7 +72,7 @@
       <id>myfaces-1.2</id>
       <activation>
         <property>
-          <name>!jsf.target</name>
+          <name>!jsf</name>
         </property>
       </activation>
       <dependencies>
@@ -79,6 +85,12 @@
 
     <profile>
       <id>mojarra-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.1</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>javax.faces</groupId>
@@ -89,6 +101,12 @@
 
     <profile>
       <id>mojarra-1.2</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.2</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>javax.faces</groupId>
@@ -99,6 +117,12 @@
 
     <profile>
       <id>mojarra-2.0</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-2.0</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>com.sun.faces</groupId>

Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=828976&r1=828975&r2=828976&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Fri Oct 23 09:43:25 2009
@@ -1329,14 +1329,20 @@
 <!--
     Attention: The next profiles should only be changed by a clean build.
     It may also make sense to activate it in your personal settings.xml.
-    
+
     They define the JSF version which are generally incompatible.
-    
+
     They also define the JSF implementation used to compile and for runtime.
 -->
 
     <profile>
       <id>myfaces-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>myfaces-1.1</value>
+        </property>
+      </activation>
       <properties>
         <jsf.target>1.1</jsf.target>
       </properties>
@@ -1374,7 +1380,7 @@
       <id>myfaces-1.2</id>
       <activation>
         <property>
-          <name>!jsf.target</name>
+          <name>!jsf</name>
         </property>
       </activation>
       <properties>
@@ -1412,6 +1418,12 @@
 
     <profile>
       <id>mojarra-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.1</value>
+        </property>
+      </activation>
       <properties>
         <jsf.target>1.1</jsf.target>
       </properties>
@@ -1459,6 +1471,12 @@
 
     <profile>
       <id>mojarra-1.2</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.2</value>
+        </property>
+      </activation>
       <properties>
         <jsf.target>1.2</jsf.target>
       </properties>
@@ -1506,6 +1524,12 @@
 
     <profile>
       <id>mojarra-2.0</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-2.0</value>
+        </property>
+      </activation>
       <properties>
         <jsf.target>2.0</jsf.target>
       </properties>

Modified: myfaces/tobago/trunk/sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/pom.xml?rev=828976&r1=828975&r2=828976&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/sandbox/pom.xml Fri Oct 23 09:43:25 2009
@@ -449,6 +449,12 @@
 
     <profile>
       <id>myfaces-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>myfaces-1.1</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>org.apache.myfaces.core</groupId>
@@ -461,7 +467,7 @@
       <id>myfaces-1.2</id>
       <activation>
         <property>
-          <name>!jsf.target</name>
+          <name>!jsf</name>
         </property>
       </activation>
       <dependencies>
@@ -474,6 +480,12 @@
 
     <profile>
       <id>mojarra-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.1</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>javax.faces</groupId>
@@ -484,6 +496,12 @@
 
     <profile>
       <id>mojarra-1.2</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.2</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>javax.faces</groupId>
@@ -494,6 +512,12 @@
 
     <profile>
       <id>mojarra-2.0</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-2.0</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>com.sun.faces</groupId>

Modified: myfaces/tobago/trunk/theme/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/pom.xml?rev=828976&r1=828975&r2=828976&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/pom.xml (original)
+++ myfaces/tobago/trunk/theme/pom.xml Fri Oct 23 09:43:25 2009
@@ -46,6 +46,12 @@
 
     <profile>
       <id>myfaces-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>myfaces-1.1</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>org.apache.myfaces.core</groupId>
@@ -58,7 +64,7 @@
       <id>myfaces-1.2</id>
       <activation>
         <property>
-          <name>!jsf.target</name>
+          <name>!jsf</name>
         </property>
       </activation>
       <dependencies>
@@ -71,6 +77,12 @@
 
     <profile>
       <id>mojarra-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.1</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>javax.faces</groupId>
@@ -81,6 +93,12 @@
 
     <profile>
       <id>mojarra-1.2</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.2</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>javax.faces</groupId>
@@ -91,6 +109,12 @@
 
     <profile>
       <id>mojarra-2.0</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-2.0</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>com.sun.faces</groupId>

Modified: myfaces/tobago/trunk/tobago-jsf-compat/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/pom.xml?rev=828976&r1=828975&r2=828976&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/pom.xml Fri Oct 23 09:43:25 2009
@@ -137,6 +137,12 @@
 
     <profile>
       <id>myfaces-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>myfaces-1.1</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>org.apache.myfaces.core</groupId>
@@ -151,7 +157,7 @@
       <id>myfaces-1.2</id>
       <activation>
         <property>
-          <name>!jsf.target</name>
+          <name>!jsf</name>
         </property>
       </activation>
       <dependencies>
@@ -164,6 +170,12 @@
 
     <profile>
       <id>mojarra-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.1</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>javax.faces</groupId>
@@ -176,6 +188,12 @@
 
     <profile>
       <id>mojarra-1.2</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.2</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>javax.faces</groupId>
@@ -186,6 +204,12 @@
 
     <profile>
       <id>mojarra-2.0</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-2.0</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>com.sun.faces</groupId>

Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml?rev=828976&r1=828975&r2=828976&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/pom.xml Fri Oct 23 09:43:25 2009
@@ -55,6 +55,12 @@
 
     <profile>
       <id>myfaces-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>myfaces-1.1</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>org.apache.myfaces.core</groupId>
@@ -67,7 +73,7 @@
       <id>myfaces-1.2</id>
       <activation>
         <property>
-          <name>!jsf.target</name>
+          <name>!jsf</name>
         </property>
       </activation>
       <dependencies>
@@ -80,6 +86,12 @@
 
     <profile>
       <id>mojarra-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.1</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>javax.faces</groupId>
@@ -90,6 +102,12 @@
 
     <profile>
       <id>mojarra-1.2</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.2</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>javax.faces</groupId>
@@ -100,6 +118,12 @@
 
     <profile>
       <id>mojarra-2.0</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-2.0</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>com.sun.faces</groupId>

Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml?rev=828976&r1=828975&r2=828976&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/pom.xml Fri Oct 23 09:43:25 2009
@@ -122,6 +122,12 @@
 
     <profile>
       <id>myfaces-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>myfaces-1.1</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>org.apache.myfaces.core</groupId>
@@ -134,7 +140,7 @@
       <id>myfaces-1.2</id>
       <activation>
         <property>
-          <name>!jsf.target</name>
+          <name>!jsf</name>
         </property>
       </activation>
       <dependencies>
@@ -147,6 +153,12 @@
 
     <profile>
       <id>mojarra-1.1</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.1</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>javax.faces</groupId>
@@ -157,6 +169,12 @@
 
     <profile>
       <id>mojarra-1.2</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-1.2</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>javax.faces</groupId>
@@ -167,6 +185,12 @@
 
     <profile>
       <id>mojarra-2.0</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>mojarra-2.0</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>com.sun.faces</groupId>