directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r124446 - in incubator/directory/server/trunk/plugin: . src/main/java/org/apache/ldap/server/tools/schema src/test/org/apache/ldap/server/tools/schema
Date Thu, 06 Jan 2005 20:57:46 GMT
Author: akarasulu
Date: Thu Jan  6 12:57:44 2005
New Revision: 124446

URL: http://svn.apache.org/viewcvs?view=rev&rev=124446
Log:
renamed classes to not reference Eve and changed jelly to use new tasks
Added:
   incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaTool.java
      - copied, changed from r124444, incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/EveSchemaTool.java
   incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolTask.java
      - copied, changed from r124444, incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/EveSchemaToolTask.java
   incubator/directory/server/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/DirectorySchemaToolTest.java
      - copied, changed from r124444, incubator/directory/server/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/EveSchemaToolTest.java
Removed:
   incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/EveSchemaTool.java
   incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/EveSchemaToolTask.java
   incubator/directory/server/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/EveSchemaToolTest.java
Modified:
   incubator/directory/server/trunk/plugin/plugin.jelly

Modified: incubator/directory/server/trunk/plugin/plugin.jelly
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/plugin/plugin.jelly?view=diff&rev=124446&p1=incubator/directory/server/trunk/plugin/plugin.jelly&r1=124445&p2=incubator/directory/server/trunk/plugin/plugin.jelly&r2=124446
==============================================================================
--- incubator/directory/server/trunk/plugin/plugin.jelly	(original)
+++ incubator/directory/server/trunk/plugin/plugin.jelly	Thu Jan  6 12:57:44 2005
@@ -2,60 +2,60 @@
  
 <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:util="jelly:util" xmlns:maven="jelly:maven">
 
-  <goal name="eve:init">
+  <goal name="directory:init">
 	<!-- Dir for generated source files -->
-	<j:set var="eveTargetDir" value="${maven.eve.schema.target.dir}"/>
-	<j:set var="eveSchemaDir" value="${maven.eve.schema.dir}"/>
-	<j:set var="eveSchemas" value="${maven.eve.schemas}"/>
+	<j:set var="targetDir" value="${maven.ldap.server.schema.target.dir}"/>
+	<j:set var="schemaDir" value="${maven.ldap.server..schema.dir}"/>
+	<j:set var="schemas" value="${maven.ldap.server.schemas}"/>
   </goal>
 
-  <goal name="eve:prepare-filesystem">
-    <j:if test="${!eveTargetDir.equals('MAVEN_EVE_TARGET_DIR_NOT_SET')}">
+  <goal name="directory:prepare-filesystem">
+    <j:if test="${!targetDir.equals('MAVEN_EVE_TARGET_DIR_NOT_SET')}">
       <ant:mkdir dir="${maven.build.dir}/schema"/>
     </j:if>
   </goal>
 
-  <goal name="eve:generate"
-        prereqs="eve:prepare-filesystem">
+  <goal name="directory:generate"
+        prereqs="directory:prepare-filesystem">
         
-    <j:if test="${!eveTargetDir.equals('MAVEN_EVE_TARGET_DIR_NOT_SET')}">
-      <ant:path id="maven.eve.schema.compile.src.set"
+    <j:if test="${!targetDir.equals('MAVEN_EVE_TARGET_DIR_NOT_SET')}">
+      <ant:path id="maven.ldap.server.schema.compile.src.set"
             location="${maven.build.dir}/schema"/>
 
       <maven:addPath id="maven.compile.src.set"
-                     refid="maven.eve.schema.compile.src.set"/>
+                     refid="maven.ldap.server.schema.compile.src.set"/>
 
       <!-- TODO: use this for src.dir, but smarter for individual schemas -->
       <!-- TODO: it seems that if target exists but the flagfile doesn't, it doesn't compile?
-->
-      <ant:uptodate property="maven.eve.schema.buildNotRequired" targetfile="${maven.build.dir}/schema/.flagfile">
+      <ant:uptodate property="maven.ldap.server.schema.buildNotRequired" targetfile="${maven.build.dir}/schema/.flagfile">
         <ant:srcfiles
-          dir   = "${maven.eve.schema.dir}"
+          dir   = "${maven.ldap.server.schema.dir}"
           includes = "*.schema"/>
       </ant:uptodate>
       
-      <j:set var="eveSchemaBuildNotRequired" value="${maven.eve.schema.buildNotRequired}"
/>
-      <j:if test="${eveSchemaBuildNotRequired == null}">
+      <j:set var="schemaBuildNotRequired" value="${maven.ldap.server.schema.buildNotRequired}"
/>
+      <j:if test="${schemaBuildNotRequired == null}">
       
-        <j:if test="${!eveSchemas.equals('MAVEN_EVE_SCHEMAS_NOT_SET')}">
+        <j:if test="${!schemas.equals('MAVEN_EVE_SCHEMAS_NOT_SET')}">
           <util:tokenize var="schemas" delim=",">
-            ${maven.eve.schemas}
+            ${maven.ldap.server.schemas}
           </util:tokenize>
           
           <j:forEach var="schema" items="${schemas.iterator()}">
           
-            <j:set var="ownerProp" value="maven.eve.schema.owner.${schema}"/>
+            <j:set var="ownerProp" value="maven.ldap.server.schema.owner.${schema}"/>
             <j:set var="owner" value="${context.getVariable(ownerProp)}"
-                defaultValue="${maven.eve.schema.ownerDefault}"/>
-            <j:set var="packageProp" value="maven.eve.schema.package.${schema}"/>
+                defaultValue="${maven.ldap.server.schema.ownerDefault}"/>
+            <j:set var="packageProp" value="maven.ldap.server.schema.package.${schema}"/>
             <j:set var="package" value="${context.getVariable(packageProp)}"
-                defaultValue="${maven.eve.schema.packageDefault}"/>
-            <j:set var="depsProp" value="maven.eve.schema.deps.${schema}"/>
+                defaultValue="${maven.ldap.server.schema.packageDefault}"/>
+            <j:set var="depsProp" value="maven.ldap.server.schema.deps.${schema}"/>
             <j:set var="deps" value="${context.getVariable(depsProp)}"/>
 
                         <!-- Basedir sysprop not set when not forking -->
             <j:set var="noop" value="${systemScope.setProperty('basedir', basedir)}"/>
 
-            <j:useBean var="task" class="org.apache.ldap.server.tools.schema.EveSchemaToolTask"
+            <j:useBean var="task" class="org.apache.ldap.server.tools.schema.DirectorySchemaToolTask"
 			    name="${schema}" owner="${owner}" package="${package}" dependencies="${deps}"/>
 			<j:expr value="${task.execute()}"/>
             <j:if test="${task.hasFaulted()}">
@@ -75,15 +75,15 @@
 
   <!--
   <preGoal name="java:compile">
-    <j:if test="${!eveSchemaDir.equals('MAVEN_EVE_SCHEMA_DIR_NOT_SET')}">
-      <attainGoal name="eve:schema"/>
+    <j:if test="${!schemaDir.equals('MAVEN_EVE_SCHEMA_DIR_NOT_SET')}">
+      <attainGoal name="directory:schema"/>
     </j:if>
   </preGoal>
   -->
 
-  <goal name="eve:schema"> 
-    <attainGoal name="eve:init"/>
-    <attainGoal name="eve:generate"/>
+  <goal name="directory:schema"> 
+    <attainGoal name="directory:init"/>
+    <attainGoal name="directory:generate"/>
   </goal> 
   
 </project> 

Copied: incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaTool.java
(from r124444, incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/EveSchemaTool.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaTool.java?view=diff&rev=124446&p1=incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/EveSchemaTool.java&r1=124444&p2=incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaTool.java&r2=124446
==============================================================================
--- incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/EveSchemaTool.java
(original)
+++ incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaTool.java
Thu Jan  6 12:57:44 2005
@@ -36,7 +36,7 @@
  * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class EveSchemaTool
+public class DirectorySchemaTool
 {
     private static String basedir = System.getProperty( "basedir", "." );
 
@@ -74,7 +74,7 @@
 
 
 
-    public EveSchemaTool() throws Exception
+    public DirectorySchemaTool() throws Exception
     {
         parser = new OpenLdapSchemaParser();
         Velocity.init();

Copied: incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolTask.java
(from r124444, incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/EveSchemaToolTask.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolTask.java?view=diff&rev=124446&p1=incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/EveSchemaToolTask.java&r1=124444&p2=incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolTask.java&r2=124446
==============================================================================
--- incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/EveSchemaToolTask.java
(original)
+++ incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolTask.java
Thu Jan  6 12:57:44 2005
@@ -20,7 +20,7 @@
 import org.apache.tools.ant.BuildException;
 import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapSchema;
 import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapSchema;
-import org.apache.ldap.server.tools.schema.EveSchemaTool;
+import org.apache.ldap.server.tools.schema.DirectorySchemaTool;
 
 
 /**
@@ -29,7 +29,7 @@
  * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class EveSchemaToolTask extends org.apache.tools.ant.Task
+public class DirectorySchemaToolTask extends org.apache.tools.ant.Task
 {
     private String javaSrc;
     private String pkg;
@@ -77,11 +77,11 @@
     public void execute() throws BuildException
     {
         super.execute();
-        EveSchemaTool tool;
+        DirectorySchemaTool tool;
 
         try
         {
-            tool = new EveSchemaTool();
+            tool = new DirectorySchemaTool();
         }
         catch ( Exception e )
         {

Deleted: /incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/EveSchemaTool.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/EveSchemaTool.java?view=auto&rev=124445
==============================================================================

Deleted: /incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/EveSchemaToolTask.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/EveSchemaToolTask.java?view=auto&rev=124445
==============================================================================

Copied: incubator/directory/server/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/DirectorySchemaToolTest.java
(from r124444, incubator/directory/server/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/EveSchemaToolTest.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/DirectorySchemaToolTest.java?view=diff&rev=124446&p1=incubator/directory/server/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/EveSchemaToolTest.java&r1=124444&p2=incubator/directory/server/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/DirectorySchemaToolTest.java&r2=124446
==============================================================================
--- incubator/directory/server/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/EveSchemaToolTest.java
(original)
+++ incubator/directory/server/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/DirectorySchemaToolTest.java
Thu Jan  6 12:57:44 2005
@@ -22,20 +22,20 @@
 import junit.framework.TestCase;
 import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapSchema;
 import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapSchema;
-import org.apache.ldap.server.tools.schema.EveSchemaTool;
+import org.apache.ldap.server.tools.schema.DirectorySchemaTool;
 
 
 /**
- * Tests the EveSchemaTool.
+ * Tests the DirectorySchemaTool.
  *
  * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class EveSchemaToolTest extends TestCase
+public class DirectorySchemaToolTest extends TestCase
 {
     public void testEveSchemaTool() throws Exception
     {
-        EveSchemaTool tool = new EveSchemaTool();
+        DirectorySchemaTool tool = new DirectorySchemaTool();
         AbstractBootstrapSchema schema = new AbstractBootstrapSchema(
                 "cn=admin,ou=system", "core", null, new String[] { "system", "dep2" }
         ){};

Deleted: /incubator/directory/server/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/EveSchemaToolTest.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/EveSchemaToolTest.java?view=auto&rev=124445
==============================================================================

Mime
View raw message