You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/07/10 06:37:43 UTC
svn commit: r792804 - in /myfaces/test/trunk: ./ pom.xml test12/
test12/pom.xml test20/ test20/pom.xml test20/src/ test20/src/main/
test20/src/main/java/
Author: lu4242
Date: Fri Jul 10 04:37:43 2009
New Revision: 792804
URL: http://svn.apache.org/viewvc?rev=792804&view=rev
Log:
Create initial layout for myfaces test
Added:
myfaces/test/trunk/test20/pom.xml (with props)
myfaces/test/trunk/test20/src/
myfaces/test/trunk/test20/src/main/
myfaces/test/trunk/test20/src/main/java/
Modified:
myfaces/test/trunk/ (props changed)
myfaces/test/trunk/pom.xml
myfaces/test/trunk/test12/ (props changed)
myfaces/test/trunk/test12/pom.xml
myfaces/test/trunk/test20/ (props changed)
Propchange: myfaces/test/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 10 04:37:43 2009
@@ -0,0 +1 @@
+target
Modified: myfaces/test/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/pom.xml?rev=792804&r1=792803&r2=792804&view=diff
==============================================================================
--- myfaces/test/trunk/pom.xml (original)
+++ myfaces/test/trunk/pom.xml Fri Jul 10 04:37:43 2009
@@ -23,197 +23,81 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>myfaces</artifactId>
+ <version>6</version>
</parent>
-
- <artifactId>shale-test</artifactId>
- <packaging>jar</packaging>
- <name>Shale Test Framework</name>
-
- <dependencies>
-
- <!-- Required only for using the org.apache.shale.test.config package -->
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.8</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>1.0.1</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock-cglib</artifactId>
- <version>1.0.1</version>
- <optional>true</optional>
- </dependency>
-
- <!-- For the "org.apache.shale.test.cargo" package, we need to have -->
- <!-- JUnit as a compile time dependency, not just scope="test". -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
- <version>0.8</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-ant</artifactId>
- <version>0.8</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
- <!-- Allow building with JDK 1.4 as well as JDK 1.5,
- the 1.4 profile caters only to JSF 1.1 -->
- <profiles>
-
- <profile>
- <id>shale-test-jdk14</id>
- <activation>
- <jdk>1.4</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.1.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>1.1.4</version>
- <scope>test</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>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/apache/shale/test/el/**</exclude>
- <exclude>org/apache/shale/test/mock/*12.java</exclude>
- </excludes>
- <testExcludes>
- <testExclude>org/apache/shale/test/el/**</testExclude>
- </testExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>shale-test-jdk15</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_03</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_03</version>
- <scope>test</scope>
- </dependency>
- <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>
- </dependencies>
- </profile>
-
- <profile>
- <id>shale-test-jdk16</id>
- <activation>
- <jdk>1.6</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_03</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_03</version>
- <scope>test</scope>
- </dependency>
- <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>
- </dependencies>
- </profile>
-
- </profiles>
-
+ <groupId>org.apache.myfaces.test</groupId>
+ <artifactId>myfaces-test-project</artifactId>
+ <packaging>pom</packaging>
+ <name>Myfaces Test Framework</name>
+ <version>1.0.0-SNAPSHOT</version>
+ <url>http://myfaces.apache.org/test</url>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10600</url>
+ </issueManagement>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/test/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/test/trunk</developerConnection>
+ <url>http://svn.apache.org/repos/asf/myfaces/test/trunk</url>
+ </scm>
+ <modules>
+ <module>test12</module>
+ <module>test20</module>
+ </modules>
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <name>java.net Maven 1 Repository</name>
+ <url>http://download.java.net/maven/1</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+ <build>
+ <plugins>
+ <!-- plugin> -->
+ <!--
+ - Make a checkstyle violation a compile error. Note that if a compile error occurs,
+ - further information can be found in target/site/checkstyle.html (present even when
+ - just the compile goal and not the site goal has been run). Note also that child
+ - projects may redeclare this plugin and provide different configuration settings
+ - to use different checks (more or less strict than the default).
+ -->
+ <!--
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>verify-style</id>
+ <phase>verify</phase>
+ <goals><goal>check</goal></goals>
+ </execution>
+ </executions>
+ <configuration>
+ <configLocation>default/myfaces-checks-minimal.xml</configLocation>
+ <headerLocation>default/myfaces-header.txt</headerLocation>
+ </configuration>
+ </plugin>
+ -->
+ </plugins>
+ </build>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <distributionManagement>
+ <site>
+ <id>apache-site</id>
+ <name>Apache Website</name>
+ <url>scpexe://people.apache.org/www/myfaces.apache.org/test/</url>
+ </site>
+ </distributionManagement>
+
</project>
Propchange: myfaces/test/trunk/test12/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 10 04:37:43 2009
@@ -0,0 +1,4 @@
+target
+.classpath
+.settings
+.project
Modified: myfaces/test/trunk/test12/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test12/pom.xml?rev=792804&r1=792803&r2=792804&view=diff
==============================================================================
--- myfaces/test/trunk/test12/pom.xml (original)
+++ myfaces/test/trunk/test12/pom.xml Fri Jul 10 04:37:43 2009
@@ -23,14 +23,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <groupId>org.apache.myfaces.test</groupId>
+ <artifactId>myfaces-test-project</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>shale-test</artifactId>
+ <artifactId>myfaces-test12</artifactId>
<packaging>jar</packaging>
- <name>Shale Test Framework</name>
+ <name>Myfaces Test Framework for JSF 1.1 and 1.2</name>
<dependencies>
@@ -45,6 +45,7 @@
<dependency>
<groupId>htmlunit</groupId>
<artifactId>htmlunit</artifactId>
+ <version>1.14</version>
<optional>true</optional>
</dependency>
@@ -99,7 +100,7 @@
<profiles>
<profile>
- <id>shale-test-jdk14</id>
+ <id>myfaces-test-jdk14</id>
<activation>
<jdk>1.4</jdk>
</activation>
@@ -149,7 +150,7 @@
</profile>
<profile>
- <id>shale-test-jdk15</id>
+ <id>myfaces-test-jdk15</id>
<activation>
<jdk>1.5</jdk>
</activation>
@@ -182,7 +183,7 @@
</profile>
<profile>
- <id>shale-test-jdk16</id>
+ <id>myfaces-test-jdk16</id>
<activation>
<jdk>1.6</jdk>
</activation>
Propchange: myfaces/test/trunk/test20/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 10 04:37:43 2009
@@ -0,0 +1,4 @@
+target
+.settings
+.classpath
+.project
Added: myfaces/test/trunk/test20/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/test/trunk/test20/pom.xml?rev=792804&view=auto
==============================================================================
--- myfaces/test/trunk/test20/pom.xml (added)
+++ myfaces/test/trunk/test20/pom.xml Fri Jul 10 04:37:43 2009
@@ -0,0 +1,220 @@
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Id$
+ */
+-->
+<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>
+
+ <parent>
+ <groupId>org.apache.myfaces.test</groupId>
+ <artifactId>myfaces-test-project</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>myfaces-test20</artifactId>
+ <packaging>jar</packaging>
+ <name>Myfaces Test Framework for JSF 2.0</name>
+
+ <dependencies>
+
+ <!-- Required only for using the org.apache.shale.test.config package -->
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.8</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>1.14</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>1.0.1</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock-cglib</artifactId>
+ <version>1.0.1</version>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- For the "org.apache.shale.test.cargo" package, we need to have -->
+ <!-- JUnit as a compile time dependency, not just scope="test". -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>0.8</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-ant</artifactId>
+ <version>0.8</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+ <!-- Allow building with JDK 1.4 as well as JDK 1.5,
+ the 1.4 profile caters only to JSF 1.1 -->
+ <profiles>
+
+ <profile>
+ <id>myfaces-test-jdk14</id>
+ <activation>
+ <jdk>1.4</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.1.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>1.1.4</version>
+ <scope>test</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>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/apache/shale/test/el/**</exclude>
+ <exclude>org/apache/shale/test/mock/*12.java</exclude>
+ </excludes>
+ <testExcludes>
+ <testExclude>org/apache/shale/test/el/**</testExclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>myfaces-test-jdk15</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_03</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_03</version>
+ <scope>test</scope>
+ </dependency>
+ <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>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>myfaces-test-jdk16</id>
+ <activation>
+ <jdk>1.6</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_03</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_03</version>
+ <scope>test</scope>
+ </dependency>
+ <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>
+ </dependencies>
+ </profile>
+
+ </profiles>
+
+</project>
Propchange: myfaces/test/trunk/test20/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/test/trunk/test20/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL