You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/10/07 10:41:17 UTC
svn commit: r453865 - in /myfaces/tobago/trunk: contrib/facelets/
tobago-sandbox/
tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/
Author: bommel
Date: Sat Oct 7 01:41:16 2006
New Revision: 453865
URL: http://svn.apache.org/viewvc?view=rev&rev=453865
Log:
[TOBAGO-149] Resource directory should set with a absolute path
Modified:
myfaces/tobago/trunk/contrib/facelets/pom.xml
myfaces/tobago/trunk/tobago-sandbox/pom.xml
myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/AptMojo.java
myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/TestAptMojo.java
Modified: myfaces/tobago/trunk/contrib/facelets/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/contrib/facelets/pom.xml?view=diff&rev=453865&r1=453864&r2=453865
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/pom.xml (original)
+++ myfaces/tobago/trunk/contrib/facelets/pom.xml Sat Oct 7 01:41:16 2006
@@ -16,23 +16,7 @@
</scm>
<build>
-
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>target/generated-sources</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
-
+
<plugins>
<plugin>
Modified: myfaces/tobago/trunk/tobago-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-sandbox/pom.xml?view=diff&rev=453865&r1=453864&r2=453865
==============================================================================
--- myfaces/tobago/trunk/tobago-sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-sandbox/pom.xml Sat Oct 7 01:41:16 2006
@@ -10,15 +10,6 @@
<name>Tobago Sandbox</name>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>target/generated-tld</directory>
- </resource>
- </resources>
<plugins>
<plugin>
@@ -96,7 +87,7 @@
<fork>true</fork>
<nocompile>true</nocompile>
<encoding>UTF-8</encoding>
- <A>sourceFacesConfig=src/main/faces-config/faces-config.xml,targetFacesConfig=faces-config.xml</A>
+ <A>sourceFacesConfig=${basedir}/src/main/faces-config/faces-config.xml,targetFacesConfig=faces-config.xml</A>
<!--verbose>true</verbose-->
</configuration>
</execution>
@@ -130,8 +121,8 @@
<groupId>net.sourceforge.maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
<configuration>
- <taglib.src.dir>${basedir}/target/generated-tld</taglib.src.dir>
- <tldDocDir>${basedir}/target/site/tlddoc</tldDocDir>
+ <taglib.src.dir>${project.build.directory}/generated-tld</taglib.src.dir>
+ <tldDocDir>${project.build.directory}/site/tlddoc</tldDocDir>
</configuration>
</plugin>
@@ -231,8 +222,8 @@
<groupId>net.sourceforge.maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
<configuration>
- <taglib.src.dir>${basedir}/target/generated-tld</taglib.src.dir>
- <tldDocDir>${basedir}/target/tlddoc</tldDocDir>
+ <taglib.src.dir>${project.build.directory}/generated-tld</taglib.src.dir>
+ <tldDocDir>${project.build.directory}/tlddoc</tldDocDir>
</configuration>
<executions>
<execution>
Modified: myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/AptMojo.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/AptMojo.java?view=diff&rev=453865&r1=453864&r2=453865
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/AptMojo.java (original)
+++ myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/AptMojo.java Sat Oct 7 01:41:16 2006
@@ -110,14 +110,15 @@
public void execute() throws MojoExecutionException
{
super.execute();
- project.addCompileSourceRoot(
- new File( project.getBasedir(), getGenerated() ).getPath() );
+ File absoluteGeneratedPath = new File( project.getBasedir(), getGenerated() );
+ project.addCompileSourceRoot( absoluteGeneratedPath.getPath() );
Resource resource = new Resource();
+ //resource.setFiltering(resourceFiltering);
if ( resourceTargetPath != null )
{
resource.setTargetPath(resourceTargetPath);
}
- resource.setDirectory( getGenerated() );
+ resource.setDirectory( absoluteGeneratedPath.getPath() );
resource.addExclude( "**/*.java" );
project.addResource( resource );
}
Modified: myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/TestAptMojo.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/TestAptMojo.java?view=diff&rev=453865&r1=453864&r2=453865
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/TestAptMojo.java (original)
+++ myfaces/tobago/trunk/tobago-tool/maven-apt-plugin/src/main/java/org/apache/myfaces/maven/plugin/TestAptMojo.java Sat Oct 7 01:41:16 2006
@@ -112,13 +112,15 @@
} else
{
super.execute();
- project.addTestCompileSourceRoot( getGenerated() );
+ File absoluteGeneratedPath = new File( project.getBasedir(), getGenerated() );
+ project.addTestCompileSourceRoot( absoluteGeneratedPath.getPath() );
Resource resource = new Resource();
+ //resource.setFiltering(resourceFiltering);
if ( resourceTargetPath != null )
{
resource.setTargetPath(resourceTargetPath);
}
- resource.setDirectory( getGenerated() );
+ resource.setDirectory( absoluteGeneratedPath.getPath() );
resource.addExclude( "**/*.java" );
project.addTestResource( resource );
}