db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject [db-jdo] 03/06: Clean up 2.0-rc1
Date Fri, 07 May 2021 23:12:37 GMT
This is an automated email from the ASF dual-hosted git repository.

clr pushed a commit to branch origin/2.0-rc1
in repository https://gitbox.apache.org/repos/asf/db-jdo.git

commit f299993bf6b731b1960939f8d722df2c53b0b202
Author: Craig L Russell <clr@apache.org>
AuthorDate: Thu Feb 23 00:43:31 2006 +0000

    Clean up 2.0-rc1
---
 api20/project.xml                                |  2 +-
 btree/maven.xml                                  | 70 ------------------
 btree/project.properties                         | 29 --------
 btree/project.xml                                | 43 -----------
 btree/src/java/org/netbeans/mdr/util/Logger.java | 90 ------------------------
 core20/project.xml                               |  2 +-
 enhancer20/project.xml                           |  6 +-
 query20/project.xml                              |  8 +--
 runtime20/project.xml                            |  6 +-
 tck20/project.xml                                | 16 ++---
 10 files changed, 20 insertions(+), 252 deletions(-)

diff --git a/api20/project.xml b/api20/project.xml
index 5cabf9a..8644fa0 100644
--- a/api20/project.xml
+++ b/api20/project.xml
@@ -24,7 +24,7 @@
     <name>JDO2 API</name>
     <groupId>javax.jdo</groupId>
     <artifactId>jdo2-api</artifactId>
-    <currentVersion>SNAPSHOT</currentVersion>
+    <currentVersion>2.0-rc1</currentVersion>
     <package>javax.jdo</package>
     <shortDescription>Java Data Object 2.0 (JDO) API</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based

diff --git a/btree/maven.xml b/btree/maven.xml
deleted file mode 100644
index 9d4775e..0000000
--- a/btree/maven.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright 2005 The Apache Software Foundation
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-
-<project default="default"
-    xmlns:j="jelly:core"
-    xmlns:ant="jelly:ant"
-    xmlns:maven="jelly:maven"
-    >
-
-    <!-- ==================== -->
-    <!-- Default Global Goals -->
-    <!-- ==================== -->
-
-    <goal name="default">
-        <attainGoal name="jar:install"/>
-    </goal>
-
-    <goal name="build">
-        <attainGoal name="default"/>
-    </goal>
-
-    <goal name="rebuild">
-        <attainGoal name="clean"/>
-        <attainGoal name="build"/>
-    </goal>
-
-    <goal name="clobber">
-        <attainGoal name="clean"/>
-        <delete dir="mdr" includeEmptyDirs="true"/>
-    </goal>
-
-    <!-- Checkout btree sources from nebeans repository -->
-    <preGoal name="java:prepare-filesystem">
-        <echo>Using cvsroot ${netbeans.cvsroot}</echo>
-        <cvs cvsRoot="${netbeans.cvsroot}"
-             command="checkout -l ${netbeans.cvs.tag}"
-             package="mdr/src/org/netbeans/mdr/persistence"/>
-        <cvs cvsRoot="${netbeans.cvsroot}"
-             command="checkout ${netbeans.cvs.tag}"
-	     package="mdr/src/org/netbeans/mdr/persistence/btreeimpl"/>
-        <cvs cvsRoot="${netbeans.cvsroot}"
-             command="checkout ${netbeans.cvs.tag}"
-	     package="mdr/src/org/netbeans/mdr/util/MapEntryImpl.java"/>
-    </preGoal>
-
-    <!-- Need multiple source diretories: --> 
-    <!--   mdr - the netbeans sources     -->
-    <!--   src - local source files       -->
-    <preGoal name="java:compile">
-       <ant:path id="mdr.src" location="${basedir}/mdr/src"/>
-       <maven:addPath id="maven.compile.src.set" refid="mdr.src"/>
-    </preGoal>
-
-</project>
diff --git a/btree/project.properties b/btree/project.properties
deleted file mode 100644
index c95e87f..0000000
--- a/btree/project.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-#   Copyright 2005 The Apache Software Foundation
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-# The cvsroot of the netbeans repository. 
-# The official netbeans cvs host is cvs.netbeans.org. This might not work if you
-# are behind a firewall that blocks the cvs port. Please consult 
-# http://www.netbeans.org/community/sources for more info. 
-# If you are inside SWAN you can use a proxy cvsnetbeansorg.sfbay.sun.com.
-
-netbeans.cvsroot=:pserver:anoncvs@cvs.netbeans.org:/cvs
-# SWAN proxy
-#netbeans.cvsroot=:pserver:anoncvs@cvsnetbeansorg.sfbay.sun.com:/cvs
-
-# We need btree sources that compile with -target 1.3, 
-# so use a specific btree version
-netbeans.cvs.tag=-r release36-BLD200409100900
diff --git a/btree/project.xml b/btree/project.xml
deleted file mode 100644
index 02dc0d5..0000000
--- a/btree/project.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright 2005 The Apache Software Foundation
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<project>
-    <pomVersion>3</pomVersion>
-    <extend>../project.xml</extend>
-    <!-- ============== -->
-    <!-- Identification -->
-    <!-- ============== -->
-    <name>Binary Tree for FOStore JDO</name>
-    <groupId>org.apache.jdo</groupId>
-    <artifactId>jdo-btree</artifactId>
-    <currentVersion>1.1</currentVersion>
-    <package>org.netbeans.mdr</package>
-    <shortDescription>Binary Tree for FOStore JDO</shortDescription>
-    <description>This project takes the Netbeans mdr btree implementation and provides
it as a library.</description>
-    <repository />
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-    <!-- =================== -->
-    <!-- Build Specification -->
-    <!-- =================== -->
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-    </build>
-</project>
-
diff --git a/btree/src/java/org/netbeans/mdr/util/Logger.java b/btree/src/java/org/netbeans/mdr/util/Logger.java
deleted file mode 100644
index c28c512..0000000
--- a/btree/src/java/org/netbeans/mdr/util/Logger.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2005 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at 
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
- * limitations under the License.
- */
-package org.netbeans.mdr.util;
-
-import java.io.PrintStream;
-
-/** 
- * Logger utility.
- * 
- * This class replaces the implementation of the Logger class in package 
- * org.netbeans.mdr.util from the NetBeans open source mdr project. 
- * The NetBeans implemenation uses a non-mdr class
- * (org.openide.ErrorManager). This imposes a dependency on other NetBeans 
- * modules which makes it harder to use the btree implemenatation as a
- * library. 
- * 
- * @author Michael Bouschen
- */
-public class Logger {
-
-    /** */
-    public static final int INFORMATIONAL = 0x00000001;
-    public static final int WARNING = 0x00000010;
-    public static final int USER = 0x00000100;
-    public static final int EXCEPTION = 0x00001000;
-    public static final int ERROR = 0x00010000;
-
-    /** */
-    public static final PrintStream out = System.out;
-    
-    /** */
-    private static final Logger logger = new Logger();
-    
-
-    /** The name of the boolean system property to enable btree logging. */
-    public static final String VERBOSE_PROPERTY = 
-        "org.netbeans.mdr.persistence.verbose";
-
-    /** */
-    private boolean verbose;
-
-    /** */
-    public static Logger getDefault() {
-        return logger;
-    }
-
-    /** */
-    protected Logger() {
-        verbose = Boolean.getBoolean(VERBOSE_PROPERTY);
-    }
-
-    /** */
-    public void notify(int level, Exception e) {
-        if (verbose && (e != null))
-            log(e.toString());
-    }
-    
-    /** */
-    public void log(String msg) {
-        if (verbose) out.println(msg);
-    }
-
-    /** */
-    public void log(int severity, String msg) {
-        if (verbose) out.println(msg);
-    }
-
-    /** */
-    public final Throwable annotate(Throwable t, String localizedMessage) {
-        return t;
-    }
-
-    /** */
-    public final Throwable annotate(Throwable target, Throwable t) {
-        return target;
-    }
-}
diff --git a/core20/project.xml b/core20/project.xml
index b3697ab..330cee8 100644
--- a/core20/project.xml
+++ b/core20/project.xml
@@ -25,7 +25,7 @@
     <name>JDO2 Implementation (Core)</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-core</artifactId>
-    <currentVersion>SNAPSHOT</currentVersion>
+    <currentVersion>2.0-rc1</currentVersion>
     <package>org.apache.jdo</package>
     <shortDescription>Java Data Object 2.0 (JDO) Core</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based

diff --git a/enhancer20/project.xml b/enhancer20/project.xml
index d0933c4..d232183 100644
--- a/enhancer20/project.xml
+++ b/enhancer20/project.xml
@@ -25,7 +25,7 @@
     <name>JDO2 Implementation (Enhancer)</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-enhancer</artifactId>
-    <currentVersion>SNAPSHOT</currentVersion>
+    <currentVersion>2.0-rc1</currentVersion>
     <package>org.apache.jdo</package>
     <shortDescription>Java Data Object 2.0 (JDO) Enhancer</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based

@@ -39,12 +39,12 @@ Request JSR 243 under the auspices of the Java Community Process.</description>
         <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
-            <version>SNAPSHOT</version>
+            <version>2.0-rc1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-core</artifactId>
-            <version>SNAPSHOT</version>
+            <version>2.0-rc1</version>
         </dependency>
         <dependency>
             <id>commons-logging</id>
diff --git a/query20/project.xml b/query20/project.xml
index 4fed3d1..40f2299 100644
--- a/query20/project.xml
+++ b/query20/project.xml
@@ -25,7 +25,7 @@
     <name>JDO2 Implementation (Query)</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-query</artifactId>
-    <currentVersion>SNAPSHOT</currentVersion>
+    <currentVersion>2.0-rc1</currentVersion>
     <package>org.apache.jdo</package>
     <shortDescription>Java Data Object 2.0 (JDO) Core</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based

@@ -39,17 +39,17 @@ Request JSR 243 under the auspices of the Java Community Process.</description>
         <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
-            <version>SNAPSHOT</version>
+            <version>2.0-rc1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-core</artifactId>
-            <version>SNAPSHOT</version>
+            <version>2.0-rc1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-runtime</artifactId>
-            <version>SNAPSHOT</version>
+            <version>2.0-rc1</version>
         </dependency>
         <dependency>
             <id>commons-logging</id>
diff --git a/runtime20/project.xml b/runtime20/project.xml
index 63b43f2..27c8a5f 100644
--- a/runtime20/project.xml
+++ b/runtime20/project.xml
@@ -25,7 +25,7 @@
     <name>JDO2 Implementation (Runtime)</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-runtime</artifactId>
-    <currentVersion>SNAPSHOT</currentVersion>
+    <currentVersion>2.0-rc1</currentVersion>
     <package>org.apache.jdo</package>
     <shortDescription>Java Data Object 2.0 (JDO) Runtime</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based

@@ -39,12 +39,12 @@ Request JSR 243 under the auspices of the Java Community Process.</description>
         <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
-            <version>SNAPSHOT</version>
+            <version>2.0-rc1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-core</artifactId>
-            <version>SNAPSHOT</version>
+            <version>2.0-rc1</version>
         </dependency>
         <dependency>
             <id>commons-logging</id>
diff --git a/tck20/project.xml b/tck20/project.xml
index 4d37145..390d38d 100644
--- a/tck20/project.xml
+++ b/tck20/project.xml
@@ -23,7 +23,7 @@
     <name>JDO2 Technology Compatibility Kit</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-tck</artifactId>
-    <currentVersion>SNAPSHOT</currentVersion>
+    <currentVersion>2.0-rc1</currentVersion>
     <package>org.apache.jdo.tck</package>
     <shortDescription>Java Data Object 2.0 (JDO) TCK</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based
Java model abstraction of persistence, developed as Java Specification Request JSR 243 under
the auspices of the Java Community Process.
@@ -39,28 +39,28 @@ NOTE!! There are no unit tests in this project.</description>
         <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
-            <version>SNAPSHOT</version>
+            <version>2.0-rc1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-enhancer</artifactId>
-            <version>SNAPSHOT</version>
+            <version>2.0-rc1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-core</artifactId>
-            <version>SNAPSHOT</version>
+            <version>2.0-rc1</version>
         </dependency>
         <dependency>
             <groupId>jpox</groupId>
             <artifactId>jpox</artifactId>
-            <version>SNAPSHOT</version>
+            <version>1.1.0-rc-1</version>
             <url>http://www.jpox.org/docs/download.html</url>
         </dependency>
         <dependency>
             <groupId>jpox</groupId>
             <artifactId>jpox-enhancer</artifactId>
-            <version>SNAPSHOT</version>
+            <version>1.1.0-rc-1</version>
             <url>http://www.jpox.org/docs/download.html</url>
         </dependency>
         <dependency>
@@ -113,13 +113,13 @@ NOTE!! There are no unit tests in this project.</description>
         <dependency>
             <groupId>jpox</groupId>
             <artifactId>jpox-c3p0</artifactId>
-            <version>SNAPSHOT</version>
+            <version>1.1.0-rc-1</version>
             <url>http://www.jpox.org/docs/download.html</url>
         </dependency>
         <dependency>
             <groupId>jpox</groupId>
             <artifactId>jpox-dbcp</artifactId>
-            <version>SNAPSHOT</version>
+            <version>1.1.0-rc-1</version>
             <url>http://www.jpox.org/docs/download.html</url>
         </dependency>
         <dependency>

Mime
View raw message