You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by da...@apache.org on 2006/03/22 19:14:32 UTC
svn commit: r387905 - in /db/derby/code/trunk: ./
java/client/org/apache/derby/client/am/
java/shared/org/apache/derby/shared/common/info/
Author: davidvc
Date: Wed Mar 22 10:14:30 2006
New Revision: 387905
URL: http://svn.apache.org/viewcvs?rev=387905&view=rev
Log:
DERBY-1125 : Revert putting JVMInfo into the shared area, as it causes
jar sealing issues
Removed:
db/derby/code/trunk/java/shared/org/apache/derby/shared/common/info/
Modified:
db/derby/code/trunk/build.xml
db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlWarning.java
Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/build.xml?rev=387905&r1=387904&r2=387905&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Wed Mar 22 10:14:30 2006
@@ -1106,8 +1106,7 @@
org/apache/derby/shared/**,
org/apache/derby/info/dnc.properties,
org/apache/derby/loc/clientmessages*.properties"
- excludes="org/apache/derby/iapi/services/info/JVMInfo.class,
- org/apache/derby/shared/common/reference/**"/>
+ excludes="org/apache/derby/shared/common/reference/**"/>
<fileset dir="${derby.jar.dir}/lists"
includes="META-INF/**"/>
</jar>
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java?rev=387905&r1=387904&r2=387905&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java Wed Mar 22 10:14:30 2006
@@ -27,7 +27,7 @@
import org.apache.derby.iapi.services.info.ProductGenusNames;
import org.apache.derby.iapi.services.info.ProductVersionHolder;
-import org.apache.derby.shared.common.info.JVMInfo;
+import org.apache.derby.iapi.services.info.JVMInfo;
public class Configuration {
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java?rev=387905&r1=387904&r2=387905&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java Wed Mar 22 10:14:30 2006
@@ -24,7 +24,7 @@
import java.util.TreeMap;
import org.apache.derby.client.resources.ResourceKeys;
-import org.apache.derby.shared.common.info.JVMInfo;
+import org.apache.derby.iapi.services.info.JVMInfo;
import org.apache.derby.shared.common.i18n.MessageUtil;
import org.apache.derby.shared.common.error.ExceptionUtil;
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlWarning.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlWarning.java?rev=387905&r1=387904&r2=387905&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlWarning.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlWarning.java Wed Mar 22 10:14:30 2006
@@ -22,7 +22,7 @@
package org.apache.derby.client.am;
import java.sql.SQLWarning;
-import org.apache.derby.shared.common.info.JVMInfo;
+import org.apache.derby.iapi.services.info.JVMInfo;
/**
* This represents a warning versus a full exception. As with