Add new version of j2ee connector spec
git-svn-id: https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-j2ee-connector_1.5_spec@588344 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/NOTICE.txt b/NOTICE.txt
index 439eb83..3b4090d 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,3 +1,6 @@
+Apache Geronimo
+Copyright 2003-2006 The Apache Software Foundation
+
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
diff --git a/pom.xml b/pom.xml
index e546413..82d3eb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,15 +32,36 @@
</parent>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <packaging>bundle</packaging>
<name>J2EE Connector 1.5</name>
- <version>1.1-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>1.1-SNAPSHOT</version>
- </dependency>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <verbose>true</verbose>
+ <source>1.5</source>
+ <target>1.5</target>
+ <compilerVersion>1.5</compilerVersion>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <geronimo.osgi.export.pkg>javax.resource*</geronimo.osgi.export.pkg>
+ <geronimo.osgi.export.version>1.5</geronimo.osgi.export.version>
+ </properties>
+
</project>
diff --git a/src/main/java/javax/resource/ResourceException.java b/src/main/java/javax/resource/ResourceException.java
index a0a70de..ff37602 100644
--- a/src/main/java/javax/resource/ResourceException.java
+++ b/src/main/java/javax/resource/ResourceException.java
@@ -75,9 +75,4 @@
// unit tests revealed that Throwable.initCause is not invoked
this.linkedException = ex;
}
-
- public String toString() {
- // unit tests revealed that the errorCode is not included
- return getMessage();
- }
}
diff --git a/src/test/java/javax/resource/ResourceExceptionTest.java b/src/test/java/javax/resource/ResourceExceptionTest.java
index d725e31..58e0d06 100644
--- a/src/test/java/javax/resource/ResourceExceptionTest.java
+++ b/src/test/java/javax/resource/ResourceExceptionTest.java
@@ -50,12 +50,4 @@
exception.setLinkedException(root);
assertSame(root, exception.getLinkedException());
}
-
- public void testToString() {
- ResourceException exception = new ResourceException("problem");
- assertEquals("problem", exception.toString());
-
- ResourceException other = new ResourceException("other problem", "123");
- assertEquals("other problem", other.toString());
- }
}
