updated pom.xml and a few javadoc comments.

git-svn-id: http://anonsvn.jboss.org/repos/javassist/trunk@389 30ef5769-5b8d-40dd-aea6-55b5d6557bb3

diff --git a/pom.xml b/pom.xml
index 8c6912c079376837ce26f1195557d6b795352073..98fdc36cb540376e649afb58003467759849e71c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,14 +2,15 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
   <parent>\r
-    <groupId>jboss</groupId>\r
+    <groupId>org.jboss</groupId>\r
     <artifactId>jboss-parent</artifactId>\r
-    <version>1</version>\r
+    <version>3</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
+  <groupId>org.jboss</groupId>\r
   <artifactId>javassist</artifactId>\r
   <packaging>jar</packaging>\r
-  <version>3.6.0-BETA2</version>\r
+  <version>3.6.0-SNAPSHOT</version>\r
   <name>Javassist</name>\r
   <url>http://labs.jboss.com/portal/jbossaop</url>\r
   <build>\r
@@ -20,8 +21,8 @@
         <groupId>org.apache.maven.plugins</groupId>\r
         <artifactId>maven-compiler-plugin</artifactId>\r
         <configuration>\r
-          <source>1.5</source>\r
-          <target>1.5</target>\r
+          <source>1.4</source>\r
+          <target>1.4</target>\r
         </configuration>\r
       </plugin>\r
       <plugin>\r
@@ -64,7 +65,7 @@
         </dependency>\r
       </dependencies>\r
     </profile>\r
-     <profile>\r
+    <profile>\r
       <id>jdk16</id>\r
       <activation>\r
         <jdk>1.6</jdk>\r
@@ -82,12 +83,12 @@
   </profiles>\r
   <repositories>\r
     <repository>\r
-      <id>jboss</id>\r
+      <id>repository.jboss.org</id>\r
       <name>JBoss Inc. Repository</name>\r
       <layout>default</layout>\r
-      <url>http://repository.jboss.com/maven2/</url>\r
+      <url>http://repository.jboss.org/maven2/</url>\r
       <snapshots>\r
-        <enabled>true</enabled>\r
+        <enabled>false</enabled>\r
       </snapshots>\r
     </repository>\r
   </repositories>\r
@@ -99,13 +100,4 @@
       <scope>test</scope>\r
     </dependency>\r
   </dependencies>\r
-  <distributionManagement>\r
-    <repository>\r
-      <id>cvs-file-repository</id>\r
-      <!-- Set maven.cvs.root in your maven/conf/settings.xml\r
-            See http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossCommonProject\r
-            -->\r
-      <url>file://${maven.cvs.root}</url>\r
-    </repository>\r
-  </distributionManagement>\r
 </project>\r

diff --git a/src/main/javassist/CtClass.java b/src/main/javassist/CtClass.java
index 5fdd3495ef127f944405ff481625322722a40acb..a757ef0e75bbf4f3d067a006686dabd991a05114 100644 (file)
--- a/src/main/javassist/CtClass.java
+++ b/src/main/javassist/CtClass.java
@@ -553,7 +553,8 @@ public abstract class CtClass {
 
     /**
      * Changes a super class unless this object represents an interface.
-     * The new super class must be compatible with the old one.
+     * The new super class must be compatible with the old one; for example,
+     * it should inherit from the old super class.
      *
      * <p>If this object represents an interface, this method is equivalent
      * to <code>addInterface()</code>; it appends <code>clazz</code> to

diff --git a/src/main/javassist/bytecode/ClassFile.java b/src/main/javassist/bytecode/ClassFile.java
index 4c6a8fd81b1e202fe14ce30ad3e6207be80d4ffd..4720d289d02ccff9e5b0ad71796956f0b86d8ff5 100644 (file)
--- a/src/main/javassist/bytecode/ClassFile.java
+++ b/src/main/javassist/bytecode/ClassFile.java
@@ -326,6 +326,7 @@ public final class ClassFile {
      * Sets the super class.
      * 
      * <p>
+     * The new super class should inherit from the old super class.
      * This method modifies constructors so that they call constructors declared
      * in the new super class.
      */