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 2010/05/03 17:31:28 UTC

svn commit: r940484 - in /myfaces/tobago/trunk: pom.xml sandbox/ tobago-extension/pom.xml tobago-extension/tobago-sandbox/ tobago-extension/tobago-sandbox/pom.xml

Author: lofwyr
Date: Mon May  3 15:31:28 2010
New Revision: 940484

URL: http://svn.apache.org/viewvc?rev=940484&view=rev
Log:
TOBAGO-878: Use the same name for the project directory and artifact name in the pom.xml - moving sandbox to tobago-extension

Added:
    myfaces/tobago/trunk/tobago-extension/tobago-sandbox/
      - copied from r940467, myfaces/tobago/trunk/sandbox/
Removed:
    myfaces/tobago/trunk/sandbox/
Modified:
    myfaces/tobago/trunk/pom.xml
    myfaces/tobago/trunk/tobago-extension/pom.xml
    myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml

Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=940484&r1=940483&r2=940484&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Mon May  3 15:31:28 2010
@@ -908,7 +908,6 @@
       <modules>
         <module>example</module>
         <module>tobago-assembly</module>
-        <module>sandbox</module>
       </modules>
     </profile>
     <profile>
@@ -1084,7 +1083,6 @@
       <modules>
         <module>tobago-extension</module>
         <module>example</module>
-        <module>sandbox</module>
       </modules>
     </profile>
     <!-- END SNIPPET: release-profile -->
@@ -1310,7 +1308,6 @@
         <module>tobago-extension</module>
         <module>example</module>
         <module>tobago-assembly</module>
-        <module>sandbox</module>
       </modules>
       <build>
         <plugins>

Modified: myfaces/tobago/trunk/tobago-extension/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/pom.xml?rev=940484&r1=940483&r2=940484&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/pom.xml Mon May  3 15:31:28 2010
@@ -36,6 +36,7 @@
     <module>tobago-fileupload</module>
     <!--module>math</module-->
     <module>tobago-message-fix</module>
+    <module>tobago-sandbox</module>
     <module>tobago-security</module>
     <module>tobago-taglib-extension</module>
   </modules>

Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml?rev=940484&r1=940467&r2=940484&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml Mon May  3 15:31:28 2010
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.myfaces.tobago</groupId>
-    <artifactId>tobago</artifactId>
+    <artifactId>tobago-extension</artifactId>
     <version>1.5.0-alpha-2-SNAPSHOT</version>
   </parent>
   <artifactId>tobago-sandbox</artifactId>
@@ -451,85 +451,5 @@
       </dependencies>
     </profile>
 
-
-    <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>
-          <artifactId>myfaces-api</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
-
-    <profile>
-      <id>myfaces-1.2</id>
-      <activation>
-        <property>
-          <name>!jsf</name>
-        </property>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.myfaces.core</groupId>
-          <artifactId>myfaces-api</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
-
-    <profile>
-      <id>mojarra-1.1</id>
-      <activation>
-        <property>
-          <name>jsf</name>
-          <value>mojarra-1.1</value>
-        </property>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>javax.faces</groupId>
-          <artifactId>jsf-api</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
-
-    <profile>
-      <id>mojarra-1.2</id>
-      <activation>
-        <property>
-          <name>jsf</name>
-          <value>mojarra-1.2</value>
-        </property>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>javax.faces</groupId>
-          <artifactId>jsf-api</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
-
-    <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>
-          <artifactId>jsf-api</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
-
   </profiles>
 </project>