misc cleanup:

+ committed new fcrepo-webapp/pom.xml (missed in prior checkin) + removed several empty, unused directories + using more conventional README filename in root, vs readme.txt pom cleanup: + fixed a few incorrect urls in root pom + more uniform names for modules + consistent ordering at top of each pom (parent always first) + no longer using parentPath (unnecessary when parent is a dir above) + no longer specifying groupId or version of sub-modules (inherited from parent module) + got rid a few obviously-old comments (though i didn't do a full review) note: With all the renaming and pom changes, I verified that everything still builds the same in Eclipse with a fresh import, using the same steps that worked me here: https://fedora-commons.org/confluence/pages/viewpage.action?pageId=13765655
fcrepo3 · Nov 25, 2009 · 103c23a · 103c23a
1 parent fcc916d
commit 103c23a
Show file tree

Hide file tree

Showing 17 changed files with 109 additions and 171 deletions.
diff --git a/.cvsignore b/.cvsignore
diff --git a/readme.txt → README b/readme.txt → README
diff --git a/fcrepo-client/fcrepo-client-admin/pom.xml b/fcrepo-client/fcrepo-client-admin/pom.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.fcrepo</groupId>
-  <artifactId>fcrepo-client-admin</artifactId>
-  <packaging>jar</packaging>
-  <version>3.3-SNAPSHOT</version>
-  <name>Fedora Admin Client</name>
-  <url>http://duraspace.org</url>
 
   <parent>
     <groupId>org.fcrepo</groupId>
-    <artifactId>fcrepo</artifactId>
+    <artifactId>fcrepo-client</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
+  <artifactId>fcrepo-client-admin</artifactId>
+  <packaging>jar</packaging>
+  <name>Fedora Admin Client Library</name>
+
   <build>
 
     <!-- 
@@ -123,34 +120,6 @@
 
   <dependencies>
 
-    <!-- 
-      Note: dependencies of client as defined in build.xml are:
-        lib.activation
-        lib.axis
-        lib.batik
-        lib.commons-codec
-        lib.commons-dbcp
-        lib.commons-discovery
-        lib.commons-httpclient
-        lib.commons-logging
-        lib.log4j
-        lib.commons-pool
-        lib.getopt
-        lib.jai_codec
-        lib.jai_core
-        lib.javamail
-        lib.jaxrpc-api
-        lib.jhbasic
-        lib.mulgara
-        lib.openrdf-model
-        lib.saaj-api
-        lib.saxon
-        lib.slf4j-api
-        lib.slf4j-jdk14
-        lib.sunxacml
-        lib.trippi-core
-        lib.wsdl4j
-    -->
     <dependency>
       <groupId>org.fcrepo</groupId>
       <artifactId>fcrepo-server</artifactId>
@@ -304,14 +273,5 @@
       <scope>runtime</scope>
     </dependency>
 
-    <!--
-	Note: This appears to no longer be required by the client. DWD 9/2/2009
-	<dependency>
-	    <groupId>commons-dbcp</groupId>
-	    <artifactId>commons-dbcp</artifactId>
-	    <version>1.2.1</version>
-	</dependency>
-	-->
-
   </dependencies>
 </project>
diff --git a/fcrepo-client/fcrepo-client-messaging/pom.xml b/fcrepo-client/fcrepo-client-messaging/pom.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.fcrepo</groupId>
-  <artifactId>fcrepo-client-messaging</artifactId>
-  <packaging>jar</packaging>
-  <version>3.3-SNAPSHOT</version>
-  <name>Fedora Messaging Client</name>
-  <url>http://duraspace.org</url>
 
   <parent>
     <groupId>org.fcrepo</groupId>
-    <artifactId>fcrepo</artifactId>
+    <artifactId>fcrepo-client</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
+  <artifactId>fcrepo-client-messaging</artifactId>
+  <packaging>jar</packaging>
+  <name>Fedora Messaging Client Library</name>
+
   <build>
 
     <!-- 

diff --git a/fcrepo-client/pom.xml b/fcrepo-client/pom.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.fcrepo</groupId>
-  <artifactId>fcrepo-client</artifactId>
-  <packaging>pom</packaging>
-  <version>3.3-SNAPSHOT</version>
-  <name>Fedora Clients</name>
-  <url>http://duraspace.org</url>
 
   <parent>
     <groupId>org.fcrepo</groupId>
     <artifactId>fcrepo</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
+  <artifactId>fcrepo-client</artifactId>
+  <packaging>pom</packaging>
+  <name>All Fedora Client Libraries</name>
+
   <modules>
     <module>fcrepo-client-admin</module>
     <module>fcrepo-client-messaging</module>

diff --git a/fcrepo-common/pom.xml b/fcrepo-common/pom.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.fcrepo</groupId>
-  <artifactId>fcrepo-common</artifactId>
-  <packaging>jar</packaging>
-  <version>3.3-SNAPSHOT</version>
-  <name>Common</name>
-  <url>http://duraspace.org</url>
 
   <parent>
     <groupId>org.fcrepo</groupId>
     <artifactId>fcrepo</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
+  <artifactId>fcrepo-common</artifactId>
+  <packaging>jar</packaging>
+  <name>Fedora Common Library</name>
+
   <build>
     <plugins>
 

diff --git a/fcrepo-generate/pom.xml b/fcrepo-generate/pom.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.fcrepo</groupId>
-  <artifactId>fcrepo-generate</artifactId>
-  <packaging>jar</packaging>
-  <version>3.3-SNAPSHOT</version>
-  <name>Generate</name>
-  <url>http://duraspace.org</url>
 
   <parent>
     <groupId>org.fcrepo</groupId>
     <artifactId>fcrepo</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
+
+  <artifactId>fcrepo-generate</artifactId>
+  <packaging>jar</packaging>
+  <name>Fedora Generate Library</name>
+
 </project>
 
diff --git a/fcrepo-installer/pom.xml b/fcrepo-installer/pom.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.fcrepo</groupId>
-  <artifactId>fcrepo-installer</artifactId>
-  <packaging>pom</packaging>
-  <version>3.3-SNAPSHOT</version>
-  <name>Installer</name>
-  <url>http://duraspace.org</url>
 
   <parent>
     <groupId>org.fcrepo</groupId>
     <artifactId>fcrepo</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
+  <artifactId>fcrepo-installer</artifactId>
+  <packaging>pom</packaging>
+  <name>Fedora Installer</name>
+
   <build>
 
     <!-- This 'resource' directory should be migrated to default location -->

diff --git a/fcrepo-integrationtest/pom.xml b/fcrepo-integrationtest/pom.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.fcrepo</groupId>
-  <artifactId>fcrepo-integrationtest</artifactId>
-  <packaging>jar</packaging>
-  <version>3.3-SNAPSHOT</version>
-  <name>Integration Test</name>
-  <url>http://duraspace.org</url>
 
   <parent>
     <groupId>org.fcrepo</groupId>
     <artifactId>fcrepo</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
+  <artifactId>fcrepo-integrationtest</artifactId>
+  <packaging>jar</packaging>
+  <name>Fedora Integration Test</name>
+
   <properties>
     <fedora.home>${env.FEDORA_HOME}</fedora.home>
     <javax.net.ssl.trustStore>${basedir}/../resources/inc/keystore</javax.net.ssl.trustStore>

diff --git a/fcrepo-server/pom.xml b/fcrepo-server/pom.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.fcrepo</groupId>
-  <artifactId>fcrepo-server</artifactId>
-  <packaging>jar</packaging>
-  <version>3.3-SNAPSHOT</version>
-  <name>Server</name>
-  <url>http://duraspace.org</url>
 
   <parent>
     <groupId>org.fcrepo</groupId>
     <artifactId>fcrepo</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
+  <artifactId>fcrepo-server</artifactId>
+  <packaging>jar</packaging>
+  <name>Fedora Server Library</name>
+
   <properties>
     <demo.src.dir>${basedir}/src/main/resources/demo</demo.src.dir>
     <fedora.home.build.dir>${basedir}/build/home</fedora.home.build.dir>

diff --git a/fcrepo-webapp/fcrepo-webapp-democontent/pom.xml b/fcrepo-webapp/fcrepo-webapp-democontent/pom.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.fcrepo</groupId>
-  <artifactId>fcrepo-webapp-democontent</artifactId>
-  <packaging>war</packaging>
-  <version>3.3-SNAPSHOT</version>
-  <name>Fedora Demo Content Webapp</name>
-  <url>http://duraspace.org</url>
 
   <parent>
     <groupId>org.fcrepo</groupId>
-    <artifactId>fcrepo</artifactId>
+    <artifactId>fcrepo-webapp</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
+  <artifactId>fcrepo-webapp-democontent</artifactId>
+  <packaging>war</packaging>
+  <name>Fedora Webapp - Demo Content</name>
+
   <build>
     <plugins>
 

diff --git a/fcrepo-webapp/fcrepo-webapp-fedora/pom.xml b/fcrepo-webapp/fcrepo-webapp-fedora/pom.xml
@@ -2,19 +2,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.fcrepo</groupId>
-  <artifactId>fcrepo-webapp-fedora</artifactId>
-  <packaging>war</packaging>
-  <version>3.3-SNAPSHOT</version>
-  <name>Fedora WAR</name>
-  <url>http://duraspace.org</url>
 
   <parent>
     <groupId>org.fcrepo</groupId>
-    <artifactId>fcrepo</artifactId>
+    <artifactId>fcrepo-webapp</artifactId>
     <version>3.3-SNAPSHOT</version>
   </parent>
 
+  <artifactId>fcrepo-webapp-fedora</artifactId>
+  <packaging>war</packaging>
+  <name>All Fedora Webapps</name>
+
   <build>
     <plugins>
       <plugin>

diff --git a/fcrepo-webapp/fcrepo-webapp-fop/pom.xml b/fcrepo-webapp/fcrepo-webapp-fop/pom.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.fcrepo</groupId>
-  <artifactId>fcrepo-webapp-fop</artifactId>
-  <packaging>war</packaging>
-  <version>3.3-SNAPSHOT</version>
-  <name>Formatting Objects Processor Webapp</name>
-  <url>http://duraspace.org</url>
 
   <parent>
     <groupId>org.fcrepo</groupId>
-    <artifactId>fcrepo</artifactId>
+    <artifactId>fcrepo-webapp</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
+  <artifactId>fcrepo-webapp-fop</artifactId>
+  <packaging>war</packaging>
+  <name>Fedora Webapp - Formatting Objects Processor</name>
+
   <build>
     <plugins>
       <plugin>

diff --git a/fcrepo-webapp/fcrepo-webapp-imagemanip/pom.xml b/fcrepo-webapp/fcrepo-webapp-imagemanip/pom.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.fcrepo</groupId>
-  <artifactId>fcrepo-webapp-imagemanip</artifactId>
-  <packaging>war</packaging>
-  <version>3.3-SNAPSHOT</version>
-  <name>Advanced Imaging Webapp</name>
-  <url>http://duraspace.org</url>
 
   <parent>
     <groupId>org.fcrepo</groupId>
-    <artifactId>fcrepo</artifactId>
+    <artifactId>fcrepo-webapp</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
+  <artifactId>fcrepo-webapp-imagemanip</artifactId>
+  <packaging>war</packaging>
+  <name>Fedora Webapp - Image Manipulation</name>
+
   <build>
     <plugins>
       <plugin>

diff --git a/fcrepo-webapp/fcrepo-webapp-saxon/pom.xml b/fcrepo-webapp/fcrepo-webapp-saxon/pom.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.fcrepo</groupId>
-  <artifactId>fcrepo-webapp-saxon</artifactId>
-  <packaging>war</packaging>
-  <version>3.3-SNAPSHOT</version>
-  <name>Saxon XSLT Processor Webapp</name>
-  <url>http://duraspace.org</url>
 
   <parent>
     <groupId>org.fcrepo</groupId>
-    <artifactId>fcrepo</artifactId>
+    <artifactId>fcrepo-webapp</artifactId>
     <version>3.3-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
+  <artifactId>fcrepo-webapp-saxon</artifactId>
+  <packaging>war</packaging>
+  <name>Fedora Webapp - Saxon XSLT Processor</name>
+
   <build>
     <plugins>
       <plugin>