[jboss-cvs] JBossAS SVN: r106528 - in projects/jboss-jsf-int/trunk: jboss-faces and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jul 9 13:51:46 EDT 2010
Author: stan.silvert at jboss.com
Date: 2010-07-09 13:51:46 -0400 (Fri, 09 Jul 2010)
New Revision: 106528
Modified:
projects/jboss-jsf-int/trunk/jboss-faces/pom.xml
projects/jboss-jsf-int/trunk/jsf-deployer/pom.xml
projects/jboss-jsf-int/trunk/pom.xml
Log:
Replace jboss-as-server dependency with org.jboss.scanning:scanning-plugins
Modified: projects/jboss-jsf-int/trunk/jboss-faces/pom.xml
===================================================================
--- projects/jboss-jsf-int/trunk/jboss-faces/pom.xml 2010-07-09 16:12:06 UTC (rev 106527)
+++ projects/jboss-jsf-int/trunk/jboss-faces/pom.xml 2010-07-09 17:51:46 UTC (rev 106528)
@@ -64,7 +64,13 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-tomcat</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-plugins</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
Modified: projects/jboss-jsf-int/trunk/jsf-deployer/pom.xml
===================================================================
--- projects/jboss-jsf-int/trunk/jsf-deployer/pom.xml 2010-07-09 16:12:06 UTC (rev 106527)
+++ projects/jboss-jsf-int/trunk/jsf-deployer/pom.xml 2010-07-09 17:51:46 UTC (rev 106528)
@@ -1,164 +1,164 @@
-<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.jboss.jsf.integration</groupId>
- <artifactId>jboss-jsf-int</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>jboss-jsf-deployer</artifactId>
- <packaging>jar</packaging>
- <name>JBoss JSF Deployer</name>
- <description>JBoss JSF Deployer</description>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss.web</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>apache-log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-tomcat</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.jsf.integration</groupId>
- <artifactId>jboss-faces</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>src/main/resources/Mojarra-1.2/jsf-libs</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${jsf12-version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>src/main/resources/Mojarra-1.2/jsf-libs</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>${jsf12-version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>src/main/resources/Mojarra-1.2/jsf-libs</outputDirectory>
- </artifactItem>
-
-
- <artifactItem>
- <groupId>org.jboss.jsf.integration</groupId>
- <artifactId>jboss-faces</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>src/main/resources/Mojarra-2.0/jsf-libs</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${jsf20-version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>src/main/resources/Mojarra-2.0/jsf-libs</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>${jsf20-version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>src/main/resources/Mojarra-2.0/jsf-libs</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>src/main/resources</directory>
- <includes>
- <includes>Mojarra-1.2/jsf-libs</includes>
- <includes>Mojarra-2.0/jsf-libs</includes>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
-</project>
+<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.jboss.jsf.integration</groupId>
+ <artifactId>jboss-jsf-int</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>jboss-jsf-deployer</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss JSF Deployer</name>
+ <description>JBoss JSF Deployer</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss.web</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-tomcat</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-plugins</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.jsf.integration</groupId>
+ <artifactId>jboss-faces</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>src/main/resources/Mojarra-1.2/jsf-libs</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${jsf12-version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>src/main/resources/Mojarra-1.2/jsf-libs</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${jsf12-version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>src/main/resources/Mojarra-1.2/jsf-libs</outputDirectory>
+ </artifactItem>
+
+
+ <artifactItem>
+ <groupId>org.jboss.jsf.integration</groupId>
+ <artifactId>jboss-faces</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>src/main/resources/Mojarra-2.0/jsf-libs</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${jsf20-version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>src/main/resources/Mojarra-2.0/jsf-libs</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${jsf20-version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>src/main/resources/Mojarra-2.0/jsf-libs</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>src/main/resources</directory>
+ <includes>
+ <includes>Mojarra-1.2/jsf-libs</includes>
+ <includes>Mojarra-2.0/jsf-libs</includes>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
+</project>
Modified: projects/jboss-jsf-int/trunk/pom.xml
===================================================================
--- projects/jboss-jsf-int/trunk/pom.xml 2010-07-09 16:12:06 UTC (rev 106527)
+++ projects/jboss-jsf-int/trunk/pom.xml 2010-07-09 17:51:46 UTC (rev 106528)
@@ -29,11 +29,11 @@
<modules>
<module>jboss-faces</module> <!-- This must be done before jsf-deployer -->
<module>jsf-deployer</module>
- <module>testwar</module>
+ <!-- <module>testwar</module>
<module>jsf12test</module>
<module>jsf20test</module>
<module>jsfbundledtest</module>
- <!-- <module>cargo</module> -->
+ <module>cargo</module> -->
</modules>
<dependencyManagement>
@@ -111,9 +111,9 @@
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- <version>6.0.0-SNAPSHOT</version>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-plugins</artifactId>
+ <version>1.0.0.Alpha4</version>
</dependency>
</dependencies>
</dependencyManagement>
More information about the jboss-cvs-commits
mailing list