Rename packages to org.openslide

openslide · c4b544e50b0f4e0a8a883ca7bec329f02b044e64 · bgilbert committed Nov 1, 2011 · Nov 1, 2011 · c4b544e
1 parent 00c66d0
commit c4b544e50b0f4e0a8a883ca7bec329f02b044e64
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 OpenSlide
 
-Carnegie Mellon University
+Carnegie Mellon University and others
 
 http://openslide.org/
 
diff --git a/Makefile.am b/Makefile.am
@@ -26,18 +26,18 @@ libopenslide_jni_la_SOURCES = openslide-jni.c
 
 pkglib_DATA = openslide.jar
 JAVA_SRC = build.xml \
-	src/edu/cmu/cs/openslide/AssociatedImageMap.java \
-	src/edu/cmu/cs/openslide/OpenSlideDisposedException.java \
-	src/edu/cmu/cs/openslide/OpenSlide.java \
-	src/edu/cmu/cs/openslide/OpenSlideJNI.java \
-	src/edu/cmu/cs/openslide/TestCLI.java \
-	src/edu/cmu/cs/openslide/gui/Annotation.java \
-	src/edu/cmu/cs/openslide/gui/DefaultAnnotation.java \
-	src/edu/cmu/cs/openslide/gui/DefaultSelectionListModel.java \
-	src/edu/cmu/cs/openslide/gui/Demo.java \
-	src/edu/cmu/cs/openslide/gui/OpenSlideView.java \
-	src/edu/cmu/cs/openslide/gui/SelectionListModel.java \
-	src/org/openslide/dzi/DeepZoomGenerator.java
+	src/org/openslide/AssociatedImageMap.java \
+	src/org/openslide/OpenSlideDisposedException.java \
+	src/org/openslide/OpenSlide.java \
+	src/org/openslide/OpenSlideJNI.java \
+	src/org/openslide/TestCLI.java \
+	src/org/openslide/dzi/DeepZoomGenerator.java \
+	src/org/openslide/gui/Annotation.java \
+	src/org/openslide/gui/DefaultAnnotation.java \
+	src/org/openslide/gui/DefaultSelectionListModel.java \
+	src/org/openslide/gui/Demo.java \
+	src/org/openslide/gui/OpenSlideView.java \
+	src/org/openslide/gui/SelectionListModel.java
 
 openslide.jar: $(JAVA_SRC) config.h
 	@$(ANT) -f $(srcdir)/build.xml -Dbuilddir=$(abs_builddir) \
diff --git a/build.xml b/build.xml
@@ -23,7 +23,7 @@
 	<target depends="build" name="jar">
 		<jar destfile="${builddir}/openslide.jar" basedir="${builddir}/bin">
 			<manifest>
-				<attribute name="Main-Class" value="edu.cmu.cs.openslide.gui.Demo"/>
+				<attribute name="Main-Class" value="org.openslide.gui.Demo"/>
 			</manifest>
 		</jar>
 
diff --git a/openslide-jni.c b/openslide-jni.c
@@ -205,7 +205,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
     return -1;
   }
 
-  jclass clazz = (*env)->FindClass(env, "edu/cmu/cs/openslide/OpenSlideJNI");
+  jclass clazz = (*env)->FindClass(env, "org/openslide/OpenSlideJNI");
   if (clazz == NULL) {
     return -1;
   }
diff --git a/.../cmu/cs/openslide/AssociatedImageMap.java → src/org/openslide/AssociatedImageMap.java b/.../cmu/cs/openslide/AssociatedImageMap.java → src/org/openslide/AssociatedImageMap.java
@@ -19,7 +19,7 @@
  *
  */
 
-package edu.cmu.cs.openslide;
+package org.openslide;
 
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferInt;
diff --git a/src/edu/cmu/cs/openslide/OpenSlide.java → src/org/openslide/OpenSlide.java b/src/edu/cmu/cs/openslide/OpenSlide.java → src/org/openslide/OpenSlide.java
@@ -19,7 +19,7 @@
  *
  */
 
-package edu.cmu.cs.openslide;
+package org.openslide;
 
 import java.awt.Color;
 import java.awt.Graphics2D;
diff --git a/...openslide/OpenSlideDisposedException.java → ...openslide/OpenSlideDisposedException.java b/...openslide/OpenSlideDisposedException.java → ...openslide/OpenSlideDisposedException.java
@@ -19,7 +19,7 @@
  *
  */
 
-package edu.cmu.cs.openslide;
+package org.openslide;
 
 public class OpenSlideDisposedException extends RuntimeException {
     private static final String MSG = "OpenSlide object has been disposed";
diff --git a/src/edu/cmu/cs/openslide/OpenSlideJNI.java → src/org/openslide/OpenSlideJNI.java b/src/edu/cmu/cs/openslide/OpenSlideJNI.java → src/org/openslide/OpenSlideJNI.java
@@ -19,7 +19,7 @@
  *
  */
 
-package edu.cmu.cs.openslide;
+package org.openslide;
 
 import java.io.InputStream;
 import java.io.IOException;
diff --git a/src/edu/cmu/cs/openslide/TestCLI.java → src/org/openslide/TestCLI.java b/src/edu/cmu/cs/openslide/TestCLI.java → src/org/openslide/TestCLI.java
@@ -19,7 +19,7 @@
  *
  */
 
-package edu.cmu.cs.openslide;
+package org.openslide;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/org/openslide/dzi/DeepZoomGenerator.java b/src/org/openslide/dzi/DeepZoomGenerator.java
@@ -35,7 +35,7 @@
 
 import javax.imageio.ImageIO;
 
-import edu.cmu.cs.openslide.OpenSlide;
+import org.openslide.OpenSlide;
 
 public class DeepZoomGenerator {
 
diff --git a/src/edu/cmu/cs/openslide/gui/Annotation.java → src/org/openslide/gui/Annotation.java b/src/edu/cmu/cs/openslide/gui/Annotation.java → src/org/openslide/gui/Annotation.java
@@ -19,7 +19,7 @@
  *
  */
 
-package edu.cmu.cs.openslide.gui;
+package org.openslide.gui;
 
 import java.awt.Shape;
 
diff --git a/...u/cs/openslide/gui/DefaultAnnotation.java → src/org/openslide/gui/DefaultAnnotation.java b/...u/cs/openslide/gui/DefaultAnnotation.java → src/org/openslide/gui/DefaultAnnotation.java
@@ -19,7 +19,7 @@
  *
  */
 
-package edu.cmu.cs.openslide.gui;
+package org.openslide.gui;
 
 import java.awt.Shape;
 
diff --git a/...nslide/gui/DefaultSelectionListModel.java → ...nslide/gui/DefaultSelectionListModel.java b/...nslide/gui/DefaultSelectionListModel.java → ...nslide/gui/DefaultSelectionListModel.java
@@ -19,7 +19,7 @@
  *
  */
 
-package edu.cmu.cs.openslide.gui;
+package org.openslide.gui;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/src/edu/cmu/cs/openslide/gui/Demo.java → src/org/openslide/gui/Demo.java b/src/edu/cmu/cs/openslide/gui/Demo.java → src/org/openslide/gui/Demo.java
@@ -19,7 +19,7 @@
  *
  */
 
-package edu.cmu.cs.openslide.gui;
+package org.openslide.gui;
 
 import java.awt.BorderLayout;
 import java.awt.event.*;
@@ -31,7 +31,7 @@
 
 import javax.swing.*;
 
-import edu.cmu.cs.openslide.OpenSlide;
+import org.openslide.OpenSlide;
 
 public class Demo {
     public static void main(final String[] args) {
diff --git a/...u/cmu/cs/openslide/gui/OpenSlideView.java → src/org/openslide/gui/OpenSlideView.java b/...u/cmu/cs/openslide/gui/OpenSlideView.java → src/org/openslide/gui/OpenSlideView.java
@@ -24,7 +24,7 @@
  * slides, non-pixel-perfect scrolling.
  */
 
-package edu.cmu.cs.openslide.gui;
+package org.openslide.gui;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -37,7 +37,7 @@
 
 import javax.swing.*;
 
-import edu.cmu.cs.openslide.OpenSlide;
+import org.openslide.OpenSlide;
 
 public class OpenSlideView extends JPanel {
     private static final int KEYBOARD_SCROLL_AMOUNT = 100;
diff --git a/.../cs/openslide/gui/SelectionListModel.java → ...org/openslide/gui/SelectionListModel.java b/.../cs/openslide/gui/SelectionListModel.java → ...org/openslide/gui/SelectionListModel.java
@@ -19,7 +19,7 @@
  *
  */
 
-package edu.cmu.cs.openslide.gui;
+package org.openslide.gui;
 
 import javax.swing.ListModel;