From 62ea1e4838a47b45739572bda508a9b5cec1e86c Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Walter?= <cedricwalter@apache.org>
Date: Tue, 8 Apr 2014 21:27:10 +0000
Subject: [PATCH] cleaned up module name, use classifier (tests) for exporting
 test classes and resources to any module, remove empty directories

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/maven@1585837 13f79535-47bb-0310-9956-ffa450edef68
---
 etc/assembly/bundle.xml                       |  38 +++++++++---------
 ooxml-schemas/pom.xml                         |   8 ++--
 poi-examples/pom.xml                          |   2 +-
 poi-ooxml-schemas/pom.xml                     |   2 +-
 poi-ooxml/pom.xml                             |   6 +--
 .../models/poi-hdf.zargo                      | Bin
 poi-scratchpad/pom.xml                        |   8 ++--
 pom.xml                                       |  18 ++++++++-
 8 files changed, 49 insertions(+), 33 deletions(-)
 rename {src/scratchpad => poi-scratchpad}/models/poi-hdf.zargo (100%)

diff --git a/etc/assembly/bundle.xml b/etc/assembly/bundle.xml
index a860719ed0..f29bf3a0ff 100644
--- a/etc/assembly/bundle.xml
+++ b/etc/assembly/bundle.xml
@@ -2,25 +2,25 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
 
-    <id>dist</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
+    <!--<id>dist</id>-->
+    <!--<formats>-->
+        <!--<format>zip</format>-->
+    <!--</formats>-->
+    <!--<includeBaseDirectory>false</includeBaseDirectory>-->
 
-    <dependencySets>
-        <dependencySet>
-            <includes>
-                <include>org.apache.poi:poi-examples:jar</include>
-                <include>org.apache.poi:poi-excelant:jar</include>
-                <include>org.apache.poi:poi-main:jar</include>
-                <include>org.apache.poi:poi-ooxml:jar</include>
-                <include>org.apache.poi:poi-ooxml-schemas:jar</include>
-                <include>org.apache.poi:poi-scratchpad:jar</include>
-            </includes>
-            <unpack>false</unpack>
-            <outputDirectory>dist</outputDirectory>
-        </dependencySet>
-    </dependencySets>
+    <!--<dependencySets>-->
+        <!--<dependencySet>-->
+            <!--<includes>-->
+                <!--<include>org.apache.poi:poi-examples:jar</include>-->
+                <!--<include>org.apache.poi:poi-excelant:jar</include>-->
+                <!--<include>org.apache.poi:poi-main:jar</include>-->
+                <!--<include>org.apache.poi:poi-ooxml:jar</include>-->
+                <!--<include>org.apache.poi:poi-ooxml-schemas:jar</include>-->
+                <!--<include>org.apache.poi:poi-scratchpad:jar</include>-->
+            <!--</includes>-->
+            <!--<unpack>false</unpack>-->
+            <!--<outputDirectory>dist</outputDirectory>-->
+        <!--</dependencySet>-->
+    <!--</dependencySets>-->
 
 </assembly>
\ No newline at end of file
diff --git a/ooxml-schemas/pom.xml b/ooxml-schemas/pom.xml
index a1805c2b1a..ac5bc7ecb7 100644
--- a/ooxml-schemas/pom.xml
+++ b/ooxml-schemas/pom.xml
@@ -30,7 +30,7 @@
     <artifactId>ooxml-schemas</artifactId>
     <packaging>jar</packaging>
 
-    <name>Apache POI - Openxmlformats Schema package</name>
+    <name>Apache POI - ooxml schema package</name>
     <description>XmlBeans generated from the Ecma supplied xsds:
         http://www.ecma-international.org/publications/files/ECMA-ST/Office%20Open%20XML%20Part%204%20(DOCX).zip</description>
     <url>http://poi.apache.org/</url>
@@ -99,13 +99,15 @@
                 <configuration>
                     <schemaDirectory>target/schemas</schemaDirectory>
                     <javaSource>1.5</javaSource>
-                    <optimize>yes</optimize>
+                    <!--<optimize>yes</optimize>-->
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
     <dependencies>
+
+        <!-- TODO to check not required to build
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-main</artifactId>
@@ -115,7 +117,7 @@
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-scratchpad</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>org.apache.xmlbeans</groupId>
diff --git a/poi-examples/pom.xml b/poi-examples/pom.xml
index f1c29b9a9b..1df2a94d09 100644
--- a/poi-examples/pom.xml
+++ b/poi-examples/pom.xml
@@ -30,7 +30,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>poi-examples</artifactId>
 
-    <name>Apache POI Examples package</name>
+    <name>Apache POI - examples package</name>
     <url>http://poi.apache.org/</url>
     <description>Apache POI Examples</description>
 
diff --git a/poi-ooxml-schemas/pom.xml b/poi-ooxml-schemas/pom.xml
index dae3477a07..676200cac2 100644
--- a/poi-ooxml-schemas/pom.xml
+++ b/poi-ooxml-schemas/pom.xml
@@ -30,7 +30,7 @@ limitations under the License.
     <modelVersion>4.0.0</modelVersion>
     <artifactId>poi-ooxml-schemas</artifactId>
 
-    <name>Apache POI</name>
+    <name>Apache POI - ooxml schemas</name>
     <url>http://poi.apache.org/</url>
     <description>Apache POI - Java API To Access Microsoft Format Files</description>
     <packaging>jar</packaging>
diff --git a/poi-ooxml/pom.xml b/poi-ooxml/pom.xml
index c6c93c12c9..0aa59f563c 100644
--- a/poi-ooxml/pom.xml
+++ b/poi-ooxml/pom.xml
@@ -28,8 +28,8 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>poi-ooxml</artifactId>
-    <name>Apache POI OOXML package</name>
-    <description>Apache POI - Java API To Access Microsoft Format Files</description>
+    <name>Apache POI - ooxml package</name>
+    <description>Apache POI - java api to access microsoft format files</description>
     <url>http://poi.apache.org/</url>
 
     <dependencies>
@@ -52,7 +52,7 @@
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-main</artifactId>
             <version>${project.version}</version>
-            <type>test-jar</type>
+            <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
 
diff --git a/src/scratchpad/models/poi-hdf.zargo b/poi-scratchpad/models/poi-hdf.zargo
similarity index 100%
rename from src/scratchpad/models/poi-hdf.zargo
rename to poi-scratchpad/models/poi-hdf.zargo
diff --git a/poi-scratchpad/pom.xml b/poi-scratchpad/pom.xml
index fdc00ddc7c..cb10b78845 100644
--- a/poi-scratchpad/pom.xml
+++ b/poi-scratchpad/pom.xml
@@ -29,20 +29,20 @@ limitations under the License.
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>poi-scratchpad</artifactId>
-    <name>Apache POI Scratchpad package</name>
+    <name>Apache POI - scratchpad package</name>
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.apache.poi</groupId>
             <artifactId>poi-main</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.apache.poi</groupId>
             <artifactId>poi-main</artifactId>
             <version>${project.version}</version>
-            <type>test-jar</type>
+            <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index 53b448b0fd..69ad488b38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,9 +27,9 @@
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
-    <name>Apache POI - the Java API for Microsoft Documents</name>
+    <name>Apache POI</name>
 
-    <description>Maven build of Apache POI for Sonar checks</description>
+    <description>Apache POI - the java api for microsoft documents</description>
     <url>http://poi.apache.org/</url>
 
     <properties>
@@ -215,6 +215,20 @@
                     <threadCount>10</threadCount-->
                 </configuration>
             </plugin>
+
+            <!-- provide the test-jar for other modules -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
-- 
2.39.5