Author: vsiveton
Date: Mon Mar 30 11:13:50 2009
New Revision: 759921
URL: http://svn.apache.org/viewvc?rev=759921&view=rev
Log:
o merged r759919
Added:
incubator/shindig/branches/1.0.x-incubating/java/common/src/main/resources/
- copied from r758708,
incubator/shindig/branches/1.0.x-incubating/java/common/src/main/bundle/
Removed:
incubator/shindig/branches/1.0.x-incubating/java/common/src/main/bundle/
Modified:
incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml
Modified: incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml?rev=759921&r1=759920&r2=759921&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/common/pom.xml Mon Mar 30
11:13:50 2009
@@ -57,13 +57,16 @@
</includes>
</resource>
<resource>
- <directory>src/main/bundle</directory>
+ <directory>src/main/resources</directory>
<includes>
<include>**/*</include>
</includes>
</resource>
<resource>
<directory>conf</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
</resource>
</resources>
</build>
