Return-Path: 
 <directory-cvs-return-1016-apmail-incubator-directory-cvs-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-directory-cvs-archive@www.apache.org
Received: (qmail 51701 invoked from network); 15 Jun 2004 22:19:02 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 15 Jun 2004 22:19:02 -0000
Received: (qmail 99481 invoked by uid 500); 15 Jun 2004 22:19:26 -0000
Delivered-To: apmail-incubator-directory-cvs-archive@incubator.apache.org
Received: (qmail 99432 invoked by uid 500); 15 Jun 2004 22:19:26 -0000
Mailing-List: contact directory-cvs-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: directory-dev@incubator.apache.org
list-help: <mailto:directory-cvs-help@incubator.apache.org>
list-unsubscribe: <mailto:directory-cvs-unsubscribe@incubator.apache.org>
list-post: <mailto:directory-cvs@incubator.apache.org>
Delivered-To: mailing list directory-cvs@incubator.apache.org
Received: (qmail 99416 invoked by uid 99); 15 Jun 2004 22:19:26 -0000
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.27.1) with SMTP; Tue, 15 Jun 2004 15:19:26 -0700
Received: (qmail 51625 invoked by uid 65534); 15 Jun 2004 22:18:59 -0000
Date: 15 Jun 2004 22:18:59 -0000
Message-ID: <20040615221859.51622.qmail@minotaur.apache.org>
From: akarasulu@apache.org
To: directory-cvs@incubator.apache.org
Subject: svn commit: rev 21317 - in incubator/directory/rms/trunk/gui/ocmm: .
 impl impl/src/java/org/apache/rms/ui/ocmm/impl impl/src/test
 src/java/org/apache/rms/ui/ocmm/impl src/test
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: akarasulu
Date: Tue Jun 15 15:18:59 2004
New Revision: 21317

Added:
   incubator/directory/rms/trunk/gui/ocmm/merlin.properties
      - copied unchanged from rev 21315, incubator/directory/rms/trunk/gui/ocmm/impl/merlin.properties
   incubator/directory/rms/trunk/gui/ocmm/src/java/org/apache/rms/ui/ocmm/impl/
      - copied from rev 21315, incubator/directory/rms/trunk/gui/ocmm/impl/src/java/org/apache/rms/ui/ocmm/impl/
   incubator/directory/rms/trunk/gui/ocmm/src/test/
      - copied from rev 21315, incubator/directory/rms/trunk/gui/ocmm/impl/src/test/
Removed:
   incubator/directory/rms/trunk/gui/ocmm/impl/merlin.properties
   incubator/directory/rms/trunk/gui/ocmm/impl/src/java/org/apache/rms/ui/ocmm/impl/
   incubator/directory/rms/trunk/gui/ocmm/impl/src/test/
Modified:
   incubator/directory/rms/trunk/gui/ocmm/maven.xml
   incubator/directory/rms/trunk/gui/ocmm/project.xml
Log:
moved source one level up for consolidation


Modified: incubator/directory/rms/trunk/gui/ocmm/maven.xml
==============================================================================
--- incubator/directory/rms/trunk/gui/ocmm/maven.xml	(original)
+++ incubator/directory/rms/trunk/gui/ocmm/maven.xml	Tue Jun 15 15:18:59 2004
@@ -1,5 +1,9 @@
 <project default="avalon:build" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
 
+  <preGoal name="java:compile">
+    <attainGoal name="avalon:meta"/>
+  </preGoal>
+
   <goal name="avalon:clean" prereqs="clean">
     <maven:reactor
       basedir="${basedir}"

Modified: incubator/directory/rms/trunk/gui/ocmm/project.xml
==============================================================================
--- incubator/directory/rms/trunk/gui/ocmm/project.xml	(original)
+++ incubator/directory/rms/trunk/gui/ocmm/project.xml	Tue Jun 15 15:18:59 2004
@@ -35,6 +35,18 @@
       <groupId>commons-lang</groupId>
       <version>2.0</version>
     </dependency>
+
+    <dependency>
+      <groupId>avalon-framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+      <version>4.1.5</version>
+    </dependency>
+
+    <dependency>
+      <groupId>merlin</groupId>
+      <artifactId>merlin-unit</artifactId>
+      <version>3.2.10</version>
+    </dependency>
   </dependencies>