Update of /var/cvs/applications/app-base
In directory james.mmbase.org:/tmp/cvs-serv14305
Modified Files:
pom.xml
Log Message:
sigh, errors if directory happen to not exists
See also: http://cvs.mmbase.org/viewcvs/applications/app-base
Index: pom.xml
===================================================================
RCS file: /var/cvs/applications/app-base/pom.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- pom.xml 11 Feb 2009 19:33:45 -0000 1.6
+++ pom.xml 11 Feb 2009 20:35:47 -0000 1.7
@@ -57,11 +57,17 @@
<webResources>
<resource>
<targetPath>mmbase/${mmbaseComponentId}</targetPath>
- <directory>${basedir}/templates</directory>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>templates/**</include>
+ </includes>
</resource>
<resource>
<targetPath>mmbase/components/${mmbaseComponentId}</targetPath>
- <directory>${basedir}/blocks</directory>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>blocks/**</include>
+ </includes>
</resource>
</webResources>
</configuration>
@@ -79,7 +85,7 @@
</configuration>
<executions>
<execution>
- <phase>deploy</phase>
+ <phase>deploy${phaseDisable}</phase>
<goals><goal>deploy-file</goal></goals>
<configuration>
<packaging>jar</packaging>
@@ -116,13 +122,35 @@
<dependencies>
<dependency>
- <groupId>org.mmbase</groupId>
+ <groupId>org.mmbase.jars</groupId>
<artifactId>mmbase</artifactId>
<version>${mmbase.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <!--
+ The following trick ensures that the 'deploy/install' of the jar o
+ doesn't owrk.
+
+ The idea was to enable the 'install-file/deploy-file' trick only if the
packaging is not pom (so _this_ file)
+ <profiles>
+ <profile>
+ <id>installparent</id>
+ <activation>
+ <property>
+ <name>packaging</name>
+ <value>pom</value>
+ </property>
+ </activation>
+ <properties>
+ <phaseDisable>disabled</phaseDisable>
+ </properties>
+ </profile>
+ </profiles>
+ -->
+
<repositories>
<repository>
<id>mmbase</id>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
