You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2006/03/01 15:22:16 UTC
svn commit: r382027 - in /myfaces/tomahawk/branches/1_1_2/core: build.xml
pom.xml
Author: manolito
Date: Wed Mar 1 06:22:13 2006
New Revision: 382027
URL: http://svn.apache.org/viewcvs?rev=382027&view=rev
Log:
reintroduced shared-impl and shared-tomahawk submodules for better IDE support
Removed:
myfaces/tomahawk/branches/1_1_2/core/build.xml
Modified:
myfaces/tomahawk/branches/1_1_2/core/pom.xml
Modified: myfaces/tomahawk/branches/1_1_2/core/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/pom.xml?rev=382027&r1=382026&r2=382027&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/pom.xml (original)
+++ myfaces/tomahawk/branches/1_1_2/core/pom.xml Wed Mar 1 06:22:13 2006
@@ -2,6 +2,7 @@
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>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk</artifactId>
<packaging>jar</packaging>
@@ -75,14 +76,20 @@
<scope>provided</scope>
</dependency>
- <!--
+ <dependency>
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-tomahawk</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <scope>provided</scope> <!-- because we add all classes to the jar directly -->
+ </dependency>
+
<dependency>
<groupId>org.apache.myfaces.shared</groupId>
<artifactId>myfaces-shared-tomahawk</artifactId>
<version>2.0.0-SNAPSHOT</version>
<scope>provided</scope>
+ <classifier>sources</classifier> <!-- for IDEs -->
</dependency>
- -->
<dependency>
<groupId>javax.servlet</groupId>
@@ -186,10 +193,6 @@
<resource>
<directory>src/main/resources-facesconfig</directory>
</resource>
- <resource>
- <!-- because adding an additional resourceRoot not possible with antrun yet -->
- <directory>target/refactored-shared-sources/main/resources</directory>
- </resource>
</resources>
<plugins>
@@ -228,68 +231,37 @@
<artifactId>dependency-maven-plugin</artifactId>
<executions>
<execution>
- <id>unpack-sources</id>
- <phase>generate-sources</phase>
+ <id>unpack-shared-tomahawk</id>
+ <phase>process-classes</phase>
<goals><goal>unpack</goal></goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared</artifactId>
+ <artifactId>myfaces-shared-tomahawk</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <type>jar</type>
- <classifier>sources</classifier>
</artifactItem>
</artifactItems>
- <outputDirectory>${project.build.directory}/unpacked-shared-sources</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>refactor-shared-sources</id>
- <phase>process-sources</phase>
- <configuration>
- <tasks>
- <property name="refactor.src.dir" value="${project.build.directory}/unpacked-shared-sources"/>
- <property name="refactor.output.dir" value="${project.build.directory}/refactored-shared-sources/main/java"/>
- <property name="refactor.package.new" value="shared_tomahawk"/>
- <ant dir="${project.basedir}" antfile="build.xml"
- inheritRefs="true" inheritAll="true">
- <target name="refactor-java-sources"/>
- </ant>
- </tasks>
- <sourceRoot>${project.build.directory}/refactored-shared-sources/main/java</sourceRoot>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
</configuration>
- <goals><goal>run</goal></goals>
</execution>
-
- <execution>
- <id>refactor-resources</id>
- <phase>generate-resources</phase>
- <configuration>
- <tasks>
- <property name="refactor.src.dir" value="${project.build.directory}/unpacked-shared-sources"/>
- <property name="refactor.output.dir" value="${project.build.directory}/refactored-shared-sources/main/resources"/>
- <property name="refactor.package.new" value="shared_tomahawk"/>
- <ant dir="${project.basedir}" antfile="build.xml"
- inheritRefs="true" inheritAll="true">
- <target name="refactor-resources"/>
- </ant>
- </tasks>
- <resourceRoot>${project.build.directory}/refactored-shared-sources/main/resources</resourceRoot> <!-- not yet supported -->
- </configuration>
- <goals><goal>run</goal></goals>
- </execution>
-
</executions>
</plugin>
-
+
</plugins>
+
+
+ <pluginManagement>
+ <plugins>
+ <!-- this version has already the sources classifier feature -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.0-beta-2-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
</build>
<reporting>