directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: rev 20544 - in incubator/directory/rms/trunk: . je/src/java/org/apache/rms/je/application je/src/java/org/apache/rms/je/profile je/src/test/org/apache/rms/je/application spi spi/src/java/org/apache/rms/spi
Date Fri, 28 May 2004 16:52:47 GMT
Author: akarasulu
Date: Fri May 28 09:52:47 2004
New Revision: 20544

Modified:
   incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/application/JeApplicationDAO.java
   incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/profile/LoggingProfileDAOMonitor.java
   incubator/directory/rms/trunk/je/src/test/org/apache/rms/je/application/JeApplicationDAOTest.java
   incubator/directory/rms/trunk/je/src/test/org/apache/rms/je/application/JeApplicationFactoryTest.java
   incubator/directory/rms/trunk/maven.xml
   incubator/directory/rms/trunk/spi/project.xml
   incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/ApplicationDAO.java
   incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/ApplicationDAOMonitor.java
   incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/ApplicationDAOMonitorAdapter.java
   incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/LoggingApplicationDAOMonitor.java
Log:
changes for app DAO enities being move to spi

Modified: incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/application/JeApplicationDAO.java
==============================================================================
--- incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/application/JeApplicationDAO.java
(original)
+++ incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/application/JeApplicationDAO.java
Fri May 28 09:52:47 2004
@@ -19,6 +19,9 @@
 
 import org.apache.rms.je.JeUtils ;
 import org.apache.rms.RmsException ;
+import org.apache.rms.spi.ApplicationDAO;
+import org.apache.rms.spi.ApplicationDAOMonitor;
+import org.apache.rms.spi.ApplicationDAOMonitorAdapter;
 import org.apache.rms.je.JeRmsException ;
 import org.apache.rms.je.sequence.Sequence ;
 

Modified: incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/profile/LoggingProfileDAOMonitor.java
==============================================================================
--- incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/profile/LoggingProfileDAOMonitor.java
(original)
+++ incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/profile/LoggingProfileDAOMonitor.java
Fri May 28 09:52:47 2004
@@ -20,7 +20,7 @@
 import org.apache.commons.logging.Log ;
 import org.apache.commons.logging.LogFactory ;
 import org.apache.commons.lang.NotImplementedException;
-import org.apache.rms.je.application.ApplicationDAO ;
+import org.apache.rms.spi.ApplicationDAO ;
 import com.sleepycat.je.OperationStatus;
 
 

Modified: incubator/directory/rms/trunk/je/src/test/org/apache/rms/je/application/JeApplicationDAOTest.java
==============================================================================
--- incubator/directory/rms/trunk/je/src/test/org/apache/rms/je/application/JeApplicationDAOTest.java
(original)
+++ incubator/directory/rms/trunk/je/src/test/org/apache/rms/je/application/JeApplicationDAOTest.java
Fri May 28 09:52:47 2004
@@ -20,6 +20,7 @@
 import com.sleepycat.je.* ;
 
 import org.apache.rms.RmsException ;
+import org.apache.rms.spi.LoggingApplicationDAOMonitor;
 import org.apache.rms.je.AbstractJeTest ;
 import org.apache.rms.je.sequence.Sequence ;
 import org.apache.rms.je.sequence.JeSequenceDao ;

Modified: incubator/directory/rms/trunk/je/src/test/org/apache/rms/je/application/JeApplicationFactoryTest.java
==============================================================================
--- incubator/directory/rms/trunk/je/src/test/org/apache/rms/je/application/JeApplicationFactoryTest.java
(original)
+++ incubator/directory/rms/trunk/je/src/test/org/apache/rms/je/application/JeApplicationFactoryTest.java
Fri May 28 09:52:47 2004
@@ -20,6 +20,7 @@
 import com.sleepycat.je.* ;
 
 import org.apache.rms.RmsException ;
+import org.apache.rms.spi.LoggingApplicationDAOMonitor;
 import org.apache.rms.je.AbstractJeTest ;
 import org.apache.rms.je.role.JeRoleFactory;
 import org.apache.rms.je.role.JeRoleDAO;

Modified: incubator/directory/rms/trunk/maven.xml
==============================================================================
--- incubator/directory/rms/trunk/maven.xml	(original)
+++ incubator/directory/rms/trunk/maven.xml	Fri May 28 09:52:47 2004
@@ -59,7 +59,20 @@
         ignoreFailures="false"/>
     </goal>
     
+  <goal
+      name="cleanall"
+      description="Cleans all projects">
+      <maven:reactor
+        basedir="${basedir}"
+        postProcessing="true"
+        includes="**/project.xml"
+        excludes="project.xml,gui/ocmm/project.xml"
+        goals="clean"
+	banner="clean"
+        ignoreFailures="true"/>
     <!-- ALERT: This only does docs for project.xml file one layer deep -->
+    </goal>
+
     <goal 
       name="sitedocs"
       description="Builds the entire site documentation">

Modified: incubator/directory/rms/trunk/spi/project.xml
==============================================================================
--- incubator/directory/rms/trunk/spi/project.xml	(original)
+++ incubator/directory/rms/trunk/spi/project.xml	Fri May 28 09:52:47 2004
@@ -23,6 +23,13 @@
     </dependency>
 
     <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0.3</version>
+      <url>http://jakarta.apache.org/commons/logging</url>
+    </dependency>
+
+    <dependency>
       <groupId>incubator-directory</groupId>
       <artifactId>rms-api</artifactId>
       <version>SNAPSHOT</version>

Modified: incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/ApplicationDAO.java
==============================================================================
--- incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/ApplicationDAO.java	(original)
+++ incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/ApplicationDAO.java	Fri
May 28 09:52:47 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.rms.je.application ;
+package org.apache.rms.spi ;
 
 
 import org.apache.rms.RmsException ;

Modified: incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/ApplicationDAOMonitor.java
==============================================================================
--- incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/ApplicationDAOMonitor.java
(original)
+++ incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/ApplicationDAOMonitor.java
Fri May 28 09:52:47 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.rms.je.application ;
+package org.apache.rms.spi ;
 
 
 import java.util.Iterator ;

Modified: incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/ApplicationDAOMonitorAdapter.java
==============================================================================
--- incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/ApplicationDAOMonitorAdapter.java
(original)
+++ incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/ApplicationDAOMonitorAdapter.java
Fri May 28 09:52:47 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.rms.je.application ;
+package org.apache.rms.spi ;
 
 
 import java.util.Iterator ;

Modified: incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/LoggingApplicationDAOMonitor.java
==============================================================================
--- incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/LoggingApplicationDAOMonitor.java
(original)
+++ incubator/directory/rms/trunk/spi/src/java/org/apache/rms/spi/LoggingApplicationDAOMonitor.java
Fri May 28 09:52:47 2004
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.rms.je.application ;
+package org.apache.rms.spi ;
 
 
 import java.util.Iterator ;
@@ -22,8 +22,6 @@
 import org.apache.commons.logging.Log ;
 import org.apache.commons.logging.LogFactory ;
 
-import com.sleepycat.je.DatabaseEntry ;
-
 
 /**
  * A logging monitor for Role data access objects.
@@ -427,19 +425,17 @@
 
             if ( log.isDebugEnabled() )
             {
-                if ( prefetched instanceof DatabaseEntry )
+                if ( prefetched instanceof String )
                 {
-                    DatabaseEntry entry = ( DatabaseEntry ) prefetched ;
-                    name = new String( entry.getData() ) ;
+                    name = ( String ) prefetched ;
                 }
-                else if ( prefetched instanceof String )
+                else if ( prefetched != null )
                 {
-                    name = ( String ) prefetched ;
+                    name = prefetched.toString() ;
                 }
                 else
                 {
-                    throw new IllegalArgumentException( "unknow type "
-                            + prefetched.getClass() ) ;
+                    name = "UNKNOWN" ;
                 }
 
                 log.debug( "Iterator " + listing + " created by " + dao

Mime
View raw message