Author: cziegeler
Date: Mon Aug 6 00:30:38 2007
New Revision: 563051
URL: http://svn.apache.org/viewvc?view=rev&rev=563051
Log:
Correct url to felix project and switch poi scratchpad to poi full, containing
poi, poi-contrib and poi-scratchpad.
Added:
felix/trunk/commons/poi-full/
- copied from r563050, felix/trunk/commons/poi-scratchpad/
Removed:
felix/trunk/commons/poi-scratchpad/
Modified:
felix/trunk/commons/commons-validator/pom.xml
felix/trunk/commons/poi-full/pom.xml
felix/trunk/commons/poi/pom.xml
felix/trunk/commons/pom.xml
Modified: felix/trunk/commons/commons-validator/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/commons/commons-validator/pom.xml?view=diff&rev=563051&r1=563050&r2=563051
==============================================================================
--- felix/trunk/commons/commons-validator/pom.xml (original)
+++ felix/trunk/commons/commons-validator/pom.xml Mon Aug 6 00:30:38 2007
@@ -41,7 +41,7 @@
</description>
<organization>
<name>Apache Felix Project</name>
- <url>http://incubator.apache.org/felix/</url>
+ <url>http://felix.apache.org/</url>
</organization>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/felix/trunk/commons/commons-validator</connection>
Modified: felix/trunk/commons/poi-full/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/commons/poi-full/pom.xml?view=diff&rev=563051&r1=563050&r2=563051
==============================================================================
--- felix/trunk/commons/poi-full/pom.xml (original)
+++ felix/trunk/commons/poi-full/pom.xml Mon Aug 6 00:30:38 2007
@@ -27,7 +27,7 @@
<relativePath>../pom</relativePath>
</parent>
<properties>
- <pkgArtifactId>poi-scratchpad</pkgArtifactId>
+ <pkgArtifactId>poi-full</pkgArtifactId>
<pkgVersion>3.0.1-FINAL</pkgVersion>
<pomVersion>0001</pomVersion>
<osgiVersion>${pkgVersion}</osgiVersion>
@@ -39,23 +39,33 @@
<packaging>bundle</packaging>
<name>${pkgArtifactId} bundle</name>
<description>
- This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+ This bundle simply wraps poi-${pkgVersion}.jar,
poi-contrib-${pkgVersion}.jar and poi-scratchpad-${pkgVersion}.jar.
</description>
<organization>
<name>Apache Felix Project</name>
- <url>http://incubator.apache.org/felix/</url>
+ <url>http://felix.apache.org/</url>
</organization>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/felix/trunk/commons/poi-scratchpad</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/felix/trunk/commons/poi-scratchpad</developerConnection>
-
<url>http://svn.apache.org/viewcvs/felix/trunk/commons/poi-scratchpad</url>
+
<connection>scm:svn:http://svn.apache.org/repos/felix/trunk/commons/poi-full</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/felix/trunk/commons/poi-full</developerConnection>
+ <url>http://svn.apache.org/viewcvs/felix/trunk/commons/poi-full</url>
</scm>
<dependencies>
<dependency>
<groupId>org.apache.poi</groupId>
- <artifactId>${pkgArtifactId}</artifactId>
+ <artifactId>poi</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-contrib</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-scratchpad</artifactId>
<version>${pkgVersion}</version>
</dependency>
</dependencies>
@@ -73,6 +83,10 @@
<Export-Package>
*;version=${pkgVersion}
</Export-Package>
+ <Include-Resource>
+ src/main/resources,
+ @poi-${pkgVersion}.jar!/font_metrics.properties
+ </Include-Resource>
</instructions>
</configuration>
</plugin>
Modified: felix/trunk/commons/poi/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/commons/poi/pom.xml?view=diff&rev=563051&r1=563050&r2=563051
==============================================================================
--- felix/trunk/commons/poi/pom.xml (original)
+++ felix/trunk/commons/poi/pom.xml Mon Aug 6 00:30:38 2007
@@ -41,7 +41,7 @@
</description>
<organization>
<name>Apache Felix Project</name>
- <url>http://incubator.apache.org/felix/</url>
+ <url>http://felix.apache.org/</url>
</organization>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/felix/trunk/commons/poi</connection>
Modified: felix/trunk/commons/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/commons/pom.xml?view=diff&rev=563051&r1=563050&r2=563051
==============================================================================
--- felix/trunk/commons/pom.xml (original)
+++ felix/trunk/commons/pom.xml Mon Aug 6 00:30:38 2007
@@ -69,7 +69,7 @@
<module>logkit</module>
<module>mail</module>
<module>poi</module>
- <module>poi-scratchpad</module>
+ <module>poi-full</module>
<module>portlet-api</module>
<module>servlet-api</module>
<module>xercesImpl</module>
