From 36e6637926203201648e7892ec6ee1240807218e Mon Sep 17 00:00:00 2001
From: patriot1burke <patriot1burke@sourceforge.net>
Date: Thu, 10 Jan 2008 21:04:35 +0000
Subject: [PATCH] Renaming artifact and packages

---
 pom.xml                                              | 12 ++++++++++--
 src/main/java/org/scannotation/AnnotationDB.java     |  6 +++---
 .../{classpath => }/ClasspathUrlFinder.java          |  2 +-
 .../scannotation/{classpath => }/WarUrlFinder.java   |  2 +-
 .../DirectoryIteratorFactory.java                    |  2 +-
 .../{classpath => archiveiterator}/FileIterator.java |  2 +-
 .../FileProtocolIteratorFactory.java                 |  2 +-
 .../{classpath => archiveiterator}/Filter.java       |  2 +-
 .../InputStreamWrapper.java                          |  2 +-
 .../IteratorFactory.java                             |  2 +-
 .../{classpath => archiveiterator}/JarIterator.java  |  2 +-
 .../StreamIterator.java                              |  2 +-
 src/test/java/org/scannotation/test/TestSmoke.java   |  4 +++-
 13 files changed, 26 insertions(+), 16 deletions(-)
 rename src/main/java/org/scannotation/{classpath => }/ClasspathUrlFinder.java (99%)
 rename src/main/java/org/scannotation/{classpath => }/WarUrlFinder.java (98%)
 rename src/main/java/org/scannotation/{classpath => archiveiterator}/DirectoryIteratorFactory.java (86%)
 rename src/main/java/org/scannotation/{classpath => archiveiterator}/FileIterator.java (97%)
 rename src/main/java/org/scannotation/{classpath => archiveiterator}/FileProtocolIteratorFactory.java (92%)
 rename src/main/java/org/scannotation/{classpath => archiveiterator}/Filter.java (79%)
 rename src/main/java/org/scannotation/{classpath => archiveiterator}/InputStreamWrapper.java (96%)
 rename src/main/java/org/scannotation/{classpath => archiveiterator}/IteratorFactory.java (96%)
 rename src/main/java/org/scannotation/{classpath => archiveiterator}/JarIterator.java (97%)
 rename src/main/java/org/scannotation/{classpath => archiveiterator}/StreamIterator.java (92%)

diff --git a/pom.xml b/pom.xml
index 353ce83..82486f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,10 +2,10 @@
          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.scannotation</groupId>
-    <artifactId>annotation-db</artifactId>
+    <artifactId>scannotation</artifactId>
     <packaging>jar</packaging>
     <version>1.0</version>
-    <name>resteasy-jsr311</name>
+    <name>scannotation</name>
     <url>http://maven.apache.org</url>
     <repositories>
         <repository>
@@ -38,6 +38,14 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
     <build>
         <plugins>
             <plugin>
diff --git a/src/main/java/org/scannotation/AnnotationDB.java b/src/main/java/org/scannotation/AnnotationDB.java
index da19ea2..35f3a8d 100644
--- a/src/main/java/org/scannotation/AnnotationDB.java
+++ b/src/main/java/org/scannotation/AnnotationDB.java
@@ -6,9 +6,9 @@ import javassist.bytecode.FieldInfo;
 import javassist.bytecode.MethodInfo;
 import javassist.bytecode.ParameterAnnotationsAttribute;
 import javassist.bytecode.annotation.Annotation;
-import org.scannotation.classpath.Filter;
-import org.scannotation.classpath.IteratorFactory;
-import org.scannotation.classpath.StreamIterator;
+import org.scannotation.archiveiterator.Filter;
+import org.scannotation.archiveiterator.IteratorFactory;
+import org.scannotation.archiveiterator.StreamIterator;
 
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;
diff --git a/src/main/java/org/scannotation/classpath/ClasspathUrlFinder.java b/src/main/java/org/scannotation/ClasspathUrlFinder.java
similarity index 99%
rename from src/main/java/org/scannotation/classpath/ClasspathUrlFinder.java
rename to src/main/java/org/scannotation/ClasspathUrlFinder.java
index f56be22..122dfd0 100644
--- a/src/main/java/org/scannotation/classpath/ClasspathUrlFinder.java
+++ b/src/main/java/org/scannotation/ClasspathUrlFinder.java
@@ -1,4 +1,4 @@
-package org.scannotation.classpath;
+package org.scannotation;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/org/scannotation/classpath/WarUrlFinder.java b/src/main/java/org/scannotation/WarUrlFinder.java
similarity index 98%
rename from src/main/java/org/scannotation/classpath/WarUrlFinder.java
rename to src/main/java/org/scannotation/WarUrlFinder.java
index 73d3372..f253764 100644
--- a/src/main/java/org/scannotation/classpath/WarUrlFinder.java
+++ b/src/main/java/org/scannotation/WarUrlFinder.java
@@ -1,4 +1,4 @@
-package org.scannotation.classpath;
+package org.scannotation;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
diff --git a/src/main/java/org/scannotation/classpath/DirectoryIteratorFactory.java b/src/main/java/org/scannotation/archiveiterator/DirectoryIteratorFactory.java
similarity index 86%
rename from src/main/java/org/scannotation/classpath/DirectoryIteratorFactory.java
rename to src/main/java/org/scannotation/archiveiterator/DirectoryIteratorFactory.java
index 7239d1b..699074d 100644
--- a/src/main/java/org/scannotation/classpath/DirectoryIteratorFactory.java
+++ b/src/main/java/org/scannotation/archiveiterator/DirectoryIteratorFactory.java
@@ -1,4 +1,4 @@
-package org.scannotation.classpath;
+package org.scannotation.archiveiterator;
 
 import java.io.IOException;
 import java.net.URL;
diff --git a/src/main/java/org/scannotation/classpath/FileIterator.java b/src/main/java/org/scannotation/archiveiterator/FileIterator.java
similarity index 97%
rename from src/main/java/org/scannotation/classpath/FileIterator.java
rename to src/main/java/org/scannotation/archiveiterator/FileIterator.java
index b69709c..aa3593b 100644
--- a/src/main/java/org/scannotation/classpath/FileIterator.java
+++ b/src/main/java/org/scannotation/archiveiterator/FileIterator.java
@@ -1,4 +1,4 @@
-package org.scannotation.classpath;
+package org.scannotation.archiveiterator;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/main/java/org/scannotation/classpath/FileProtocolIteratorFactory.java b/src/main/java/org/scannotation/archiveiterator/FileProtocolIteratorFactory.java
similarity index 92%
rename from src/main/java/org/scannotation/classpath/FileProtocolIteratorFactory.java
rename to src/main/java/org/scannotation/archiveiterator/FileProtocolIteratorFactory.java
index 5d3b44c..a8c0a40 100644
--- a/src/main/java/org/scannotation/classpath/FileProtocolIteratorFactory.java
+++ b/src/main/java/org/scannotation/archiveiterator/FileProtocolIteratorFactory.java
@@ -1,4 +1,4 @@
-package org.scannotation.classpath;
+package org.scannotation.archiveiterator;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/org/scannotation/classpath/Filter.java b/src/main/java/org/scannotation/archiveiterator/Filter.java
similarity index 79%
rename from src/main/java/org/scannotation/classpath/Filter.java
rename to src/main/java/org/scannotation/archiveiterator/Filter.java
index 208b313..b1eecfb 100644
--- a/src/main/java/org/scannotation/classpath/Filter.java
+++ b/src/main/java/org/scannotation/archiveiterator/Filter.java
@@ -1,4 +1,4 @@
-package org.scannotation.classpath;
+package org.scannotation.archiveiterator;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
diff --git a/src/main/java/org/scannotation/classpath/InputStreamWrapper.java b/src/main/java/org/scannotation/archiveiterator/InputStreamWrapper.java
similarity index 96%
rename from src/main/java/org/scannotation/classpath/InputStreamWrapper.java
rename to src/main/java/org/scannotation/archiveiterator/InputStreamWrapper.java
index c19d0e7..5adb77d 100644
--- a/src/main/java/org/scannotation/classpath/InputStreamWrapper.java
+++ b/src/main/java/org/scannotation/archiveiterator/InputStreamWrapper.java
@@ -1,4 +1,4 @@
-package org.scannotation.classpath;
+package org.scannotation.archiveiterator;
 
 import java.io.InputStream;
 import java.io.IOException;
diff --git a/src/main/java/org/scannotation/classpath/IteratorFactory.java b/src/main/java/org/scannotation/archiveiterator/IteratorFactory.java
similarity index 96%
rename from src/main/java/org/scannotation/classpath/IteratorFactory.java
rename to src/main/java/org/scannotation/archiveiterator/IteratorFactory.java
index adbc091..5006ea7 100644
--- a/src/main/java/org/scannotation/classpath/IteratorFactory.java
+++ b/src/main/java/org/scannotation/archiveiterator/IteratorFactory.java
@@ -1,4 +1,4 @@
-package org.scannotation.classpath;
+package org.scannotation.archiveiterator;
 
 import java.io.IOException;
 import java.net.URL;
diff --git a/src/main/java/org/scannotation/classpath/JarIterator.java b/src/main/java/org/scannotation/archiveiterator/JarIterator.java
similarity index 97%
rename from src/main/java/org/scannotation/classpath/JarIterator.java
rename to src/main/java/org/scannotation/archiveiterator/JarIterator.java
index dd4cf35..67291a6 100644
--- a/src/main/java/org/scannotation/classpath/JarIterator.java
+++ b/src/main/java/org/scannotation/archiveiterator/JarIterator.java
@@ -1,4 +1,4 @@
-package org.scannotation.classpath;
+package org.scannotation.archiveiterator;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/main/java/org/scannotation/classpath/StreamIterator.java b/src/main/java/org/scannotation/archiveiterator/StreamIterator.java
similarity index 92%
rename from src/main/java/org/scannotation/classpath/StreamIterator.java
rename to src/main/java/org/scannotation/archiveiterator/StreamIterator.java
index 410df8f..9d4e4f1 100644
--- a/src/main/java/org/scannotation/classpath/StreamIterator.java
+++ b/src/main/java/org/scannotation/archiveiterator/StreamIterator.java
@@ -1,4 +1,4 @@
-package org.scannotation.classpath;
+package org.scannotation.archiveiterator;
 
 import java.io.InputStream;
 
diff --git a/src/test/java/org/scannotation/test/TestSmoke.java b/src/test/java/org/scannotation/test/TestSmoke.java
index 8f914aa..8a9331d 100644
--- a/src/test/java/org/scannotation/test/TestSmoke.java
+++ b/src/test/java/org/scannotation/test/TestSmoke.java
@@ -4,7 +4,7 @@ import com.titan.domain.Address;
 import org.junit.Assert;
 import org.junit.Test;
 import org.scannotation.AnnotationDB;
-import org.scannotation.classpath.ClasspathUrlFinder;
+import org.scannotation.ClasspathUrlFinder;
 
 import java.io.IOException;
 import java.net.URL;
@@ -41,6 +41,7 @@ public class TestSmoke
       if (System.getProperty("java.class.path").indexOf("titan-cruise-1.0.jar") == -1)
       {
          System.err.println("WARNING!!!!!!!! CANNOT TEST testFindClasspaths():  This is a Maven2 and Surefire problem in that it doesn't set java.class.path correctly.  I run this test within the IDE");
+         return;
       }
 
       URL[] urls = ClasspathUrlFinder.findClassPaths("titan-cruise-1.0.jar");
@@ -56,6 +57,7 @@ public class TestSmoke
       if (System.getProperty("java.class.path").indexOf("titan-cruise-1.0.jar") == -1)
       {
          System.err.println("WARNING!!!!!!! CANNOT TEST testFindClasspaths2():  This is a Maven2 and Surefire problem in that it doesn't set java.class.path correctly.  I run this test within the IDE");
+         return;
       }
 
       URL[] urls = ClasspathUrlFinder.findClassPaths();
-- 
2.20.1