directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: rev 21326 - in incubator/directory/rms/trunk/gui: . conf ocmm ocmm/conf ocmm/src/java/org ocmm/src/test/org src/java/org src/java/org/apache src/test/org src/test/org/apache
Date Tue, 15 Jun 2004 23:16:49 GMT
Author: akarasulu
Date: Tue Jun 15 16:16:48 2004
New Revision: 21326

Added:
   incubator/directory/rms/trunk/gui/conf/
      - copied from rev 21318, incubator/directory/rms/trunk/gui/ocmm/conf/
   incubator/directory/rms/trunk/gui/conf/block.xml
      - copied unchanged from rev 21325, incubator/directory/rms/trunk/gui/ocmm/conf/block.xml
   incubator/directory/rms/trunk/gui/conf/config.xml
      - copied unchanged from rev 21325, incubator/directory/rms/trunk/gui/ocmm/conf/config.xml
   incubator/directory/rms/trunk/gui/merlin.properties
      - copied unchanged from rev 21321, incubator/directory/rms/trunk/gui/ocmm/merlin.properties
   incubator/directory/rms/trunk/gui/src/java/org/
      - copied from rev 21318, incubator/directory/rms/trunk/gui/ocmm/src/java/org/
   incubator/directory/rms/trunk/gui/src/java/org/apache/
      - copied from rev 21325, incubator/directory/rms/trunk/gui/ocmm/src/java/org/apache/
   incubator/directory/rms/trunk/gui/src/test/org/
      - copied from rev 21318, incubator/directory/rms/trunk/gui/ocmm/src/test/org/
   incubator/directory/rms/trunk/gui/src/test/org/apache/
      - copied from rev 21325, incubator/directory/rms/trunk/gui/ocmm/src/test/org/apache/
Removed:
   incubator/directory/rms/trunk/gui/ocmm/conf/
   incubator/directory/rms/trunk/gui/ocmm/merlin.properties
   incubator/directory/rms/trunk/gui/ocmm/src/java/org/
   incubator/directory/rms/trunk/gui/ocmm/src/test/org/
Modified:
   incubator/directory/rms/trunk/gui/maven.xml
   incubator/directory/rms/trunk/gui/project.xml
Log:
moving ocmm stuff up one level into the gui


Modified: incubator/directory/rms/trunk/gui/maven.xml
==============================================================================
--- incubator/directory/rms/trunk/gui/maven.xml	(original)
+++ incubator/directory/rms/trunk/gui/maven.xml	Tue Jun 15 16:16:48 2004
@@ -9,31 +9,8 @@
   xmlns:m="maven" 
   xmlns:deploy="deploy"
   >
-  
-  <preGoal name="site">
-    <attainGoal name="docbook:transform"/>
-  </preGoal>
-  
-  <postGoal name="site">
-    <attainGoal name="server:copy-images"/>
-    <attainGoal name="subproject:collectdocs"/>
-  </postGoal>
-
-  <goal name="subproject:collectdocs">
-    <ant:copy 
-      toDir="../target/docs/admin">
-      
-      <ant:fileSet dir="${basedir}/target/docs">
-        <ant:include name="**"/>
-      </ant:fileSet>
-    </ant:copy>
-  </goal>
 
-  <goal name="server:copy-images">
-    <copy toDir="target/docs/images">
-      <fileSet dir="${basedir}/src/images">
-        <include name="*.gif"/>
-      </fileSet>
-    </copy>
-  </goal>
+  <preGoal name="java:compile">
+    <attainGoal name="avalon:meta"/>
+  </preGoal>
 </project>

Modified: incubator/directory/rms/trunk/gui/project.xml
==============================================================================
--- incubator/directory/rms/trunk/gui/project.xml	(original)
+++ incubator/directory/rms/trunk/gui/project.xml	Tue Jun 15 16:16:48 2004
@@ -21,7 +21,79 @@
         <version>3.8.1</version>
         <url>http://junit.org</url>
       </dependency>
+
+    <dependency>
+      <artifactId>commons-lang</artifactId>
+      <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>
+
+    <dependency>
+      <artifactId>rms-api</artifactId>
+      <groupId>incubator-directory</groupId>
+      <version>SNAPSHOT</version>
+    </dependency>
+
     </dependencies>
+
+   <build>
+ 
+     <nagEmailAddress>directory-dev@incubator.apache.org</nagEmailAddress>
+     <sourceDirectory>${basedir}/src/java</sourceDirectory>
+     <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+ 
+     <unitTest>
+       <includes>
+         <include>**/*TestCase.*</include>
+         <include>**/*Test.*</include>
+       </includes>
+       <excludes>
+         <exclude>**/Abstract*.*</exclude>
+       </excludes>
+       <resources>
+         <resource>
+           <directory>${basedir}/src/test</directory>
+           <includes>
+             <include>**/*.dtd</include>
+             <include>**/*.properties</include>
+             <include>**/*.x*</include>
+           </includes>
+         </resource>
+       </resources>
+     </unitTest>
+ 
+     <resources>
+       <resource>
+         <directory>${basedir}/src/java</directory>
+         <includes>
+           <include>**/*.dtd</include>
+           <include>**/*.properties</include>
+           <include>**/*.x*</include>
+         </includes>
+       </resource>
+       <resource>
+         <directory>${basedir}/conf</directory>
+         <targetPath>BLOCK-INF</targetPath>
+         <includes>
+           <include>block.xml</include>
+         </includes>
+       </resource>
+     </resources>
+ 
+     <jars></jars>
+   </build>
 
 </project>
 

Mime
View raw message