directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: rev 21321 - in incubator/directory/rms/trunk/gui/ocmm: . conf
Date Tue, 15 Jun 2004 22:56:25 GMT
Author: akarasulu
Date: Tue Jun 15 15:56:24 2004
New Revision: 21321

Modified:
   incubator/directory/rms/trunk/gui/ocmm/conf/block.xml
   incubator/directory/rms/trunk/gui/ocmm/conf/config.xml
   incubator/directory/rms/trunk/gui/ocmm/maven.xml
   incubator/directory/rms/trunk/gui/ocmm/merlin.properties
   incubator/directory/rms/trunk/gui/ocmm/project.xml
Log:
corrected build


Modified: incubator/directory/rms/trunk/gui/ocmm/conf/block.xml
==============================================================================
--- incubator/directory/rms/trunk/gui/ocmm/conf/block.xml	(original)
+++ incubator/directory/rms/trunk/gui/ocmm/conf/block.xml	Tue Jun 15 15:56:24 2004
@@ -7,9 +7,7 @@
      <classpath>
        <repository>
          <resource id="commons-lang:commons-lang" version="2.0"/>
-         <resource id="rms:rms-rbac-api" version="SNAPSHOT"/>
-         <resource id="rms:rms-gui-ocmm-api" version="SNAPSHOT"/>
-         <resource id="rms:rms-gui-ocmm-spi" version="SNAPSHOT"/>
+         <resource id="incubator-directory:rms-api" version="SNAPSHOT"/>
        </repository>
      </classpath>
    </classloader>

Modified: incubator/directory/rms/trunk/gui/ocmm/conf/config.xml
==============================================================================
--- incubator/directory/rms/trunk/gui/ocmm/conf/config.xml	(original)
+++ incubator/directory/rms/trunk/gui/ocmm/conf/config.xml	Tue Jun 15 15:56:24 2004
@@ -3,7 +3,7 @@
 <targets>
 
   <target path="/rmc/ocmm-factory">
-    <categories priority="INFO"/>
+    <categories priority="DEBUG"/>
   </target>
 
 </targets>

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:56:24 2004
@@ -1,122 +1,6 @@
-<project default="avalon:build" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util"
xmlns:ant="jelly:ant">
+<project 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}"
-      includes="*/project.xml"
-      excludes="project.xml,target/**"
-      goals="clean"
-      banner="Cleaning:"
-      ignoreFailures="true"/>
-  </goal>
-
-  <goal name="avalon:build">
-    <maven:reactor basedir="${basedir}"
-      includes="*/project.xml"
-      excludes="project.xml,target/**"
-      goals=""
-      banner="Building:"
-      ignoreFailures="false"
-      postProcessing="true" />
-    <ant:copy todir="${maven.build.dir}">
-      <j:forEach var="child" items="${reactorProjects}">
-        <ant:fileset dir="${child.file.parentFile}/target">
-          <ant:include name="${child.artifactId}-${child.currentVersion}.jar"/>
-        </ant:fileset>
-      </j:forEach>
-    </ant:copy>
-  </goal>
-
-  <goal name="avalon:site" prereqs="avalon:build,xjavadoc,site"/>
-
-  <goal name="xjavadoc">
-
-    <maven:reactor basedir="${basedir}"
-      includes="*/project.xml"
-      excludes="project.xml"
-      banner="Site Prep:"
-      ignoreFailures="false"
-      postProcessing="true" />
-
-    <ant:mkdir dir="${maven.build.dir}/docs/api" />
-    <ant:property name="copyright"
-      value="Copyright &amp;copy; ${year} ${pom.organization.name}. All Rights Reserved."
/>
-
-    <ant:path id="template.classpath">
-      <j:forEach var="child" items="${reactorProjects}">
-        <j:set var="deps" value="${child.dependencies}"/>
-        <j:forEach var="dep" items="${deps}">
-          <ant:pathelement 
-            path="${maven.repo.local}/${dep.getArtifactDirectory()}/jars/${dep.getArtifact()}"/>
-        </j:forEach>
-      </j:forEach>
-    </ant:path>
-    
-    <util:tokenize var="links" delim="," trim="true">${maven.javadoc.links}</util:tokenize>
-
-    <ant:property name="title" value="${pom.name} ${pom.currentVersion}"/>
-    <ant:javadoc destdir="${maven.build.dir}/docs/api" 
-	doctitle="&lt;h1&gt;${title}&lt;/h1&gt;" 
-      noindex="false" author="true" use="true"
-	windowtitle="${title}" 
-      bottom="${copyright}"
-      additionalparam="-breakiterator -J-Xmx128m "
-      packagenames="*,org.*">
-        <j:forEach var="packageGroup" items="${pom.packageGroups}">
-          <group title="${packageGroup.title}" packages="${packageGroup.packages}"/>
-        </j:forEach>
-        <j:forEach var="child" items="${reactorProjects}">
-          <sourcepath path="${child.file.parentFile}/src/java"/>
-        </j:forEach>
-        <j:forEach var="link" items="${links}">
-          <ant:link href="${link.trim()}"/>
-        </j:forEach>
-        <classpath>
-          <path refid="template.classpath"/>
-	  </classpath>
-	  <link href="http://java.sun.com/j2se/1.4.2/docs/api/" />
-        <!-- allow custom tags -->    
-        <util:tokenize var="listOfTags" delim=" ">${maven.javadoc.customtags}</util:tokenize>
-        <j:forEach var="someTag" items="${listOfTags}">
-          <j:set var="nameVar" value="${someTag}.name"/>
-          <j:set var="name" value="${context.findVariable(nameVar)}"/>
-          <j:set var="descriptionVar" value="${someTag}.description"/>
-          <j:set var="description" value="${context.findVariable(descriptionVar)}"/>
-          <j:set var="enabledVar" value="${someTag}.enabled"/>
-          <j:set var="enabled" value="${context.findVariable(enabledVar)}"/>
-          <j:set var="scopeVar" value="${someTag}.scope"/>
-          <j:set var="scope" value="${context.findVariable(scopeVar)}"/>
-          <ant:tag name="${name}" description="${description}"
-               enabled="${enabled}" scope="${scope}"/>
-        </j:forEach>
-    </ant:javadoc>
-  </goal>
-
-  <goal name="template">
-    <ant:delete dir="${maven.build.dir}/template" />
-    <ant:mkdir dir="${maven.build.dir}/template" />
-    <ant:copy todir="${maven.build.dir}/template">
-      <ant:fileset dir=".">
-        <ant:include name="LICENSE*"/>
-        <ant:include name="project.properties"/>
-        <ant:include name="maven.xml"/>
-        <ant:include name="project.xml"/>
-        <ant:include name="master.xml"/>
-      </ant:fileset>
-    </ant:copy>
-    <ant:copy todir="${maven.build.dir}/template">
-      <ant:fileset dir="${basedir}">
-        <include name="api/**"/>
-        <include name="impl/**"/>
-        <include name="xdocs/**"/>
-        <exclude name="**/target/**"/>
-        <exclude name="**/*.log"/>
-      </ant:fileset>
-    </ant:copy>
-  </goal>
-
 </project>

Modified: incubator/directory/rms/trunk/gui/ocmm/merlin.properties
==============================================================================
--- incubator/directory/rms/trunk/gui/ocmm/merlin.properties	(original)
+++ incubator/directory/rms/trunk/gui/ocmm/merlin.properties	Tue Jun 15 15:56:24 2004
@@ -4,8 +4,6 @@
 # goals and the merlin unit test.
 #
 
-merlin.info = false
-merlin.debug = false
-
-
+merlin.info = true
+merlin.debug = true
 

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:56:24 2004
@@ -2,7 +2,6 @@
 
 <project>
 
-  <extend>${basedir}/../../project.xml</extend>
   <groupId>incubator-directory</groupId>
   <id>ocmm</id>
   <name>Object Containment Meta Model</name>
@@ -47,6 +46,13 @@
       <artifactId>merlin-unit</artifactId>
       <version>3.2.10</version>
     </dependency>
+
+    <dependency>
+      <artifactId>rms-api</artifactId>
+      <groupId>incubator-directory</groupId>
+      <version>SNAPSHOT</version>
+    </dependency>
+
   </dependencies>
 
 
@@ -59,6 +65,7 @@
      <unitTest>
        <includes>
          <include>**/*TestCase.*</include>
+         <include>**/*Test.*</include>
        </includes>
        <excludes>
          <exclude>**/Abstract*.*</exclude>

Mime
View raw message