Author: jlaskowski
Date: Tue Mar  7 03:35:36 2006
New Revision: 383848

URL: http://svn.apache.org/viewcvs?rev=383848&view=rev
Log:
GERONIMO-1681 directory module migration to Maven2

Thanks Reghu!

Note: The tests don't work when executed from within modules/directory dir

Modified:
    geronimo/trunk/modules/directory/pom.xml
    geronimo/trunk/modules/directory/src/test/org/apache/geronimo/directory/RunningTest.java

Modified: geronimo/trunk/modules/directory/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/directory/pom.xml?rev=383848&r1=383847&r2=383848&view=diff
==============================================================================
--- geronimo/trunk/modules/directory/pom.xml (original)
+++ geronimo/trunk/modules/directory/pom.xml Tue Mar  7 03:35:36 2006
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-
+  
     Copyright 2006 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.
@@ -207,5 +207,25 @@
       <artifactId>slf4j-simple</artifactId>
       <version>${slf4jVersion}</version>
     </dependency>
-  </dependencies>
+    <dependency>
+      <groupId>xmlbeans</groupId>
+      <artifactId>xbean</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax</artifactId>
+      <version>1.1.1-dev</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>xmlbeans</groupId>
+          <artifactId>xmlbeans-jsr173-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
 </project>

Modified: geronimo/trunk/modules/directory/src/test/org/apache/geronimo/directory/RunningTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/directory/src/test/org/apache/geronimo/directory/RunningTest.java?rev=383848&r1=383847&r2=383848&view=diff
==============================================================================
--- geronimo/trunk/modules/directory/src/test/org/apache/geronimo/directory/RunningTest.java (original)
+++ geronimo/trunk/modules/directory/src/test/org/apache/geronimo/directory/RunningTest.java Tue Mar  7 03:35:36 2006
@@ -101,7 +101,7 @@
         serverInfoName = new ObjectName("geronimo.system:role=ServerInfo");
         serverInfoGBean = new GBeanData(serverInfoName,
                 BasicServerInfo.GBEAN_INFO);
-        serverInfoGBean.setAttribute("baseDirectory", "./target");
+        serverInfoGBean.setAttribute("baseDirectory", "modules/directory/target");
         start(serverInfoGBean);
 
         // DirectoryGBean