You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by so...@apache.org on 2009/10/07 23:38:31 UTC
svn commit: r822928 - /myfaces/portlet-bridge/testsuite/trunk/pom.xml
Author: sobryan
Date: Wed Oct 7 21:38:31 2009
New Revision: 822928
URL: http://svn.apache.org/viewvc?rev=822928&view=rev
Log:
Changed CR/LF and created some POM updates
Modified:
myfaces/portlet-bridge/testsuite/trunk/pom.xml
Modified: myfaces/portlet-bridge/testsuite/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/testsuite/trunk/pom.xml?rev=822928&r1=822927&r2=822928&view=diff
==============================================================================
--- myfaces/portlet-bridge/testsuite/trunk/pom.xml (original)
+++ myfaces/portlet-bridge/testsuite/trunk/pom.xml Wed Oct 7 21:38:31 2009
@@ -22,16 +22,16 @@
<version>2</version>
</parent>
- <properties>
- <servlet.version>2.4</servlet.version>
- <jsp.version>2.1</jsp.version>
+ <properties>
+ <servlet.version>2.4</servlet.version>
+ <jsp.version>2.1</jsp.version>
<portlet.version>1.0</portlet.version>
<bridge.version>1.0.0-SNAPSHOT</bridge.version>
<jetty.version>6.1.10</jetty.version>
- <pluto-embedded.version>1.0.1</pluto-embedded.version>
- <pluto.version>1.1.4</pluto.version>
- <jsf.version>1.2_03</jsf.version>
- <selenium.version>1.0-beta-1</selenium.version>
+ <pluto-embedded.version>1.0.1</pluto-embedded.version>
+ <pluto.version>1.1.7</pluto.version>
+ <jsf.version>1.2_03</jsf.version>
+ <selenium.version>1.0-beta-1</selenium.version>
<junit.version>4.7</junit.version>
</properties>
@@ -52,42 +52,42 @@
<id>apache-site</id>
<url>scpexe://minotaur.apache.org/www/myfaces.apache.org/portlet-bridge/testsuite</url>
</site>
- </distributionManagement>
-
- <repositories>
- <!-- For selenium dependency -->
- <repository>
- <id>openqa</id>
- <name>OpenQA Repository</name>
- <url>http://nexus.openqa.org/content/repositories/releases/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
-
-
- <pluginRepositories>
- <!-- For selenium plugin -->
- <pluginRepository>
- <id>codehaus snapshot repository</id>
- <url>http://snapshots.repository.codehaus.org/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
-
- <!--pluginRepository>
- <id>codehaus mojo repository</id>
- <url>http://repository.codehaus.org/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository-->
- </pluginRepositories>
+ </distributionManagement>
+
+ <repositories>
+ <!-- For selenium dependency -->
+ <repository>
+ <id>openqa</id>
+ <name>OpenQA Repository</name>
+ <url>http://nexus.openqa.org/content/repositories/releases/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+
+ <pluginRepositories>
+ <!-- For selenium plugin -->
+ <pluginRepository>
+ <id>codehaus snapshot repository</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+
+ <!--pluginRepository>
+ <id>codehaus mojo repository</id>
+ <url>http://repository.codehaus.org/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository-->
+ </pluginRepositories>
<dependencies>
@@ -97,63 +97,63 @@
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>${jsp.version}</version>
+ <artifactId>jsp-api</artifactId>
+ <version>${jsp.version}</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${jsf.version}</version>
+ <artifactId>jsf-api</artifactId>
+ <version>${jsf.version}</version>
<scope>compile</scope>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>${jsf.version}</version>
+ <artifactId>jsf-impl</artifactId>
+ <version>${jsf.version}</version>
<scope>runtime</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>${portlet.version}</version>
+ <artifactId>portlet-api</artifactId>
+ <version>${portlet.version}</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>portlet-bridge-api</artifactId>
- <version>${bridge.version}</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>portlet-bridge-api</artifactId>
+ <version>${bridge.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>portlet-bridge-impl</artifactId>
- <version>${bridge.version}</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>portlet-bridge-impl</artifactId>
+ <version>${bridge.version}</version>
<scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.openqa.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- <version>${selenium.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
-
+ </dependency>
+
+ <dependency>
+ <groupId>org.openqa.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ <version>${selenium.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>com.bekk.boss</groupId>
<artifactId>maven-jetty-pluto-embedded</artifactId>
@@ -162,17 +162,17 @@
</dependencies>
<build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
-
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.3</version>
</plugin>
-
+
<plugin>
<artifactId>maven-jdev-plugin</artifactId>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
@@ -235,67 +235,74 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>transform</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <transformationSets>
- <transformationSet>
- <dir>src/main/webapp/WEB-INF</dir>
- <includes>
- <include>portlet.xml</include>
- </includes>
- <fileMappers>
- <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.MergeFileMapper">
- <targetName>test.xml</targetName>
- </fileMapper>
- </fileMappers>
- <stylesheet>src/test/resources/test.xsl</stylesheet>
- </transformationSet>
- <transformationSet>
- <dir>src/main/webapp/WEB-INF</dir>
- <includes>
- <include>portlet.xml</include>
- </includes>
- <fileMappers>
- <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.MergeFileMapper">
- <targetName>pluto-portal-driver-config.xml</targetName>
- </fileMapper>
- </fileMappers>
- <stylesheet>src/test/resources/pluto-portal-driver-config.xsl</stylesheet>
- </transformationSet>
- </transformationSets>
- </configuration>
- </plugin>
-
- <plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>transform</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <transformationSets>
+ <transformationSet>
+ <dir>${project.build.sourceDirectory}/main/webapp/WEB-INF</dir>
+ <includes>
+ <include>portlet.xml</include>
+ </includes>
+ <fileMappers>
+ <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.MergeFileMapper">
+ <targetName>test.xml</targetName>
+ </fileMapper>
+ </fileMappers>
+ <stylesheet>src/test/resources/test.xsl</stylesheet>
+ </transformationSet>
+ <transformationSet>
+ <dir>${project.build.sourceDirectory}/main/webapp/WEB-INF</dir>
+ <includes>
+ <include>portlet.xml</include>
+ </includes>
+ <fileMappers>
+ <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.MergeFileMapper">
+ <targetName>pluto-portal-driver-config.xml</targetName>
+ </fileMapper>
+ </fileMappers>
+ <parameters>
+ <parameter>
+ <name>portlet-app-context</name>
+ <value>${project.artifactId}</value>
+ </parameter>
+ </parameters>
+ <outputDir>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF</outputDir>
+ <stylesheet>${project.build.sourceDirectory}/test/resources/pluto-portal-driver-config.xsl</stylesheet>
+ </transformationSet>
+ </transformationSets>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>${jetty.version}</version>
+ <version>${jetty.version}</version>
<configuration>
- <webDefaultXml>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
- <webXml>target/pluto-resources/web.xml</webXml>
- <!-- see http://docs.codehaus.org/display/JETTY/Maven+Jetty+Plugin systemPropertiesFile -->
- <systemProperties>
+ <webDefaultXml>${project.build.sourceDirectory}/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
+ <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+ <!-- see http://docs.codehaus.org/display/JETTY/Maven+Jetty+Plugin systemPropertiesFile -->
+ <!-- systemProperties>
<systemProperty>
<name>org.apache.pluto.embedded.portletIds</name>
<value>chapter3Tests-bridgeVersionTest-portlet,chapter6Tests-facesContextFactoryServiceProviderTest-portlet</value>
</systemProperty>
- </systemProperties>
+ </systemProperties-->
</configuration>
- </plugin>
-
+ </plugin>
+
<plugin>
<groupId>org.apache.pluto</groupId>
<artifactId>maven-pluto-plugin</artifactId>
- <version>1.1.4</version>
+ <version>${pluto.version}</version>
<executions>
<execution>
<phase>generate-resources</phase>
@@ -358,7 +365,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -377,4 +384,4 @@
</build>
</profile>
</profiles>
-</project>
+</project>