Author: alexsmirnov Date: 2007-03-09 15:09:51 -0500 (Fri, 09 Mar 2007) New Revision: 31 Added: tags/1_1_0/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml tags/1_1_0/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml Removed: tags/1_1_0/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml.prev tags/1_1_0/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml.prev Log: Fix names of archetype's pom ( rename from missing pom.xml.next to pom.xml ) Copied: tags/1_1_0/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml (from rev 30, tags/1_1_0/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml.prev) =================================================================== --- tags/1_1_0/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml (rev 0) +++ tags/1_1_0/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2007-03-09 20:09:51 UTC (rev 31) @@ -0,0 +1,45 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>${groupId}</groupId> + <artifactId>${artifactId}</artifactId> + <version>${version}</version> + <build> + <plugins> + <plugin> + <groupId>org.ajax4jsf.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>1.1.0</version> + <configuration> + <library> + <prefix>${groupId}</prefix> + <taglib> + <shortName>${artifactId}</shortName> + </taglib> + </library> + </configuration> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </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.0</version> + </dependency> + </dependencies> +</project> Deleted: tags/1_1_0/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml.prev =================================================================== --- tags/1_1_0/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml.prev 2007-03-09 19:22:34 UTC (rev 30) +++ tags/1_1_0/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml.prev 2007-03-09 20:09:51 UTC (rev 31) @@ -1,109 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>${groupId}</groupId> - <artifactId>${artifactId}</artifactId> - <version>${version}</version> - <build> - <plugins> - <plugin> - <groupId>org.ajax4jsf.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>1.1.0-SNAPSHOT</version> - <configuration> - <library> - <prefix>${groupId}</prefix> - <taglib> - <shortName>${artifactId}</shortName> - </taglib> - </library> - </configuration> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - <repositories> - <repository> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - <id>maven2-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url> - https://maven2-repository.dev.java.net/nonav/repository - </url> - <layout>default</layout> - </repository> - <repository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - </snapshots> - <id>maven2-snapshots.ajax4jsf.org</id> - <name>Ajax4jsf Repository for Maven Snapshots</name> - <url>https://ajax4jsf.dev.java.net/nonav/snapshots</url> - <layout>default</layout> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>maven2-snapshots.ajax4jsf.org</id> - <name>Ajax4jsf Repository for Maven Snapshots</name> - <url>https://ajax4jsf.dev.java.net/nonav/snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - </snapshots> - </pluginRepository> - </pluginRepositories> -<dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.6</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.1_02</version> - </dependency> - <dependency> - <groupId>org.ajax4jsf</groupId> - <artifactId>ajax4jsf</artifactId> - <version>1.1.0-SNAPSHOT</version> - </dependency> - </dependencies> -</project> Copied: tags/1_1_0/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml (from rev 30, tags/1_1_0/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml.prev) =================================================================== --- tags/1_1_0/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml (rev 0) +++ tags/1_1_0/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml 2007-03-09 20:09:51 UTC (rev 31) @@ -0,0 +1,80 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>${groupId}</groupId> + <artifactId>${artifactId}</artifactId> + <version>${version}</version> + <packaging>war</packaging> + <name>webapp Maven Webapp</name> + <url>http://maven.apache.org</url> + <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> + </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.0</version> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.12</version> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>el-impl</groupId> + <artifactId>el-impl</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.0</version> + <scope>runtime</scope> + </dependency> + </dependencies> +</project> Deleted: tags/1_1_0/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml.prev =================================================================== --- tags/1_1_0/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml.prev 2007-03-09 19:22:34 UTC (rev 30) +++ tags/1_1_0/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml.prev 2007-03-09 20:09:51 UTC (rev 31) @@ -1,124 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>${groupId}</groupId> - <artifactId>${artifactId}</artifactId> - <version>${version}</version> - <packaging>war</packaging> - <name>webapp Maven Webapp</name> - <url>http://maven.apache.org</url> - <build> - <plugins> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <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> - </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> - </pluginRepositories> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>opensymphony</groupId> - <artifactId>oscache</artifactId> - <version>2.3</version> - <scope>runtime</scope> - </dependency> - <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.1.2</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.1_02</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.1_02</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.ajax4jsf</groupId> - <artifactId>ajax4jsf</artifactId> - <version>1.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections-testframework</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.7</version> - </dependency> -<!-- Dependencies for run JETTY--> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - <version>5.5.9</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - <version>5.5.9</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler-jdt</artifactId> - <version>5.5.9</version> - <scope>compile</scope> - </dependency> - - </dependencies> -</project>