Author: nbelaevski Date: 2007-04-10 14:26:37 -0400 (Tue, 10 Apr 2007) New Revision: 65 Modified: trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml trunk/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml Log: Component & WebApp archetypes cleaned: extra dependencies removed, version tags removed Modified: trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml =================================================================== --- trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2007-04-10 18:25:26 UTC (rev 64) +++ trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2007-04-10 18:26:37 UTC (rev 65) @@ -3,7 +3,6 @@ <modelVersion>4.0.0</modelVersion> <groupId>${groupId}</groupId> <artifactId>${artifactId}</artifactId> - <version>${version}</version> <name>${artifactId}</name> <build> <plugins> @@ -30,17 +29,4 @@ </plugin> </plugins> </build> -<dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ajax4jsf</groupId> - <artifactId>ajax4jsf</artifactId> - <version>1.1.1-SNAPSHOT</version> - </dependency> - </dependencies> </project> Modified: trunk/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml =================================================================== --- trunk/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml 2007-04-10 18:25:26 UTC (rev 64) +++ trunk/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml 2007-04-10 18:26:37 UTC (rev 65) @@ -2,59 +2,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>${groupId}</groupId> <artifactId>${artifactId}</artifactId> - <version>${version}</version> <packaging>war</packaging> - <name>JSF Maven Webapp</name> - <properties> - <jsfVersion>1.1</jsfVersion> - </properties> + <name>${artifactId} Maven Webapp</name> <build> - <plugins> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.1</version> - <configuration> - <scanIntervalSeconds>10</scanIntervalSeconds> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>8080</port> - <maxIdleTime>60000</maxIdleTime> - </connector> - </connectors> - </configuration> - </plugin> - </plugins> - <finalName>webapp</finalName> + <finalName>${artifactId}</finalName> </build> - <pluginRepositories> - <!-- Repository to get the jetty plugin --> - <pluginRepository> - <id>mortbay-repo</id> - <name>mortbay-repo</name> - <url>http://www.mortbay.org/maven2/snapshot</url> - </pluginRepository> - <!-- Repository to get the Ajax4jsf CDK plugin --> - <pluginRepository> - <id>repository.jboss.com</id> - <name>Jboss Repository for Maven Artifacts</name> - <url>http://repository.jboss.com/maven2</url> - </pluginRepository> - </pluginRepositories> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ajax4jsf</groupId> - <artifactId>ajax4jsf</artifactId> - <version>1.1.1-SNAPSHOT</version> - </dependency> #if(${facelets}) <dependency> <groupId>com.sun.facelets</groupId> @@ -73,133 +27,5 @@ <scope>runtime</scope> </dependency> #end - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.0</version> - <scope>runtime</scope> - </dependency> </dependencies> -<!-- - <profiles> - <profile> - <id>jsf1_1</id> - <activation> - <activeByDefault>true</activeByDefault> - <property> - <name>jsfVersion</name> - <value>1.1</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - </profile> - <profile> - <id>jsf12</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_04</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_04</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>myfaces</id> - <properties> - <myfaces>1.1.5</myfaces> - <tomahawk>1.1.5</tomahawk> - </properties> - <dependencies> - <dependency> - <groupId>org.ajax4jsf</groupId> - <artifactId>ajax4jsf</artifactId> - <version>1.1.1-SNAPSHOT</version> - <exclusions> - <exclusion> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-api</artifactId> - <version>${myfaces}</version> - </dependency> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-impl</artifactId> - <version>${myfaces}</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - </profiles> - ---> </project>