Return-Path: Delivered-To: apmail-incubator-directory-cvs-archive@www.apache.org Received: (qmail 41450 invoked from network); 7 Jan 2005 15:19:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 7 Jan 2005 15:19:50 -0000 Received: (qmail 95184 invoked by uid 500); 7 Jan 2005 15:19:50 -0000 Delivered-To: apmail-incubator-directory-cvs-archive@incubator.apache.org Received: (qmail 95142 invoked by uid 500); 7 Jan 2005 15:19:49 -0000 Mailing-List: contact directory-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: directory-dev@incubator.apache.org Delivered-To: mailing list directory-cvs@incubator.apache.org Received: (qmail 95124 invoked by uid 99); 7 Jan 2005 15:19:49 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 07 Jan 2005 07:19:49 -0800 Received: (qmail 41374 invoked by uid 65534); 7 Jan 2005 15:19:47 -0000 Date: 7 Jan 2005 15:19:47 -0000 Message-ID: <20050107151947.41370.qmail@minotaur.apache.org> From: akarasulu@apache.org To: directory-cvs@incubator.apache.org Subject: svn commit: r124509 - in incubator/directory/server/trunk/plugin: . src/main/java/org/apache/ldap/server/tools/schema MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: akarasulu Date: Fri Jan 7 07:19:47 2005 New Revision: 124509 URL: http://svn.apache.org/viewcvs?view=rev&rev=124509 Log: changes ... o fixed a bug where there was a '..' in jelly o removed more references to eve in java docs o changes properties based on the old eve settings Modified: incubator/directory/server/trunk/plugin/plugin.jelly incubator/directory/server/trunk/plugin/project.properties incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaTool.java incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/ObjectClasses.template incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/typeless.template Modified: incubator/directory/server/trunk/plugin/plugin.jelly Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/plugin/plugin.jelly?view=diff&rev=124509&p1=incubator/directory/server/trunk/plugin/plugin.jelly&r1=124508&p2=incubator/directory/server/trunk/plugin/plugin.jelly&r2=124509 ============================================================================== --- incubator/directory/server/trunk/plugin/plugin.jelly (original) +++ incubator/directory/server/trunk/plugin/plugin.jelly Fri Jan 7 07:19:47 2005 @@ -5,7 +5,7 @@ - + Modified: incubator/directory/server/trunk/plugin/project.properties Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/plugin/project.properties?view=diff&rev=124509&p1=incubator/directory/server/trunk/plugin/project.properties&r1=124508&p2=incubator/directory/server/trunk/plugin/project.properties&r2=124509 ============================================================================== --- incubator/directory/server/trunk/plugin/project.properties (original) +++ incubator/directory/server/trunk/plugin/project.properties Fri Jan 7 07:19:47 2005 @@ -21,7 +21,7 @@ maven.antlr.grammars=openldap.g maven.antlr.src.dir=${basedir}/src/main/antlr -# eve schema configuration +# schema configuration maven.ldap.server.schema.dir=src/main/schema maven.ldap.server.schemas=core,java,inetorgperson Modified: incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaTool.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=124509&p1=incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaTool.java&r1=124508&p2=incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaTool.java&r2=124509 ============================================================================== --- incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaTool.java (original) +++ incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaTool.java Fri Jan 7 07:19:47 2005 @@ -42,10 +42,10 @@ /** property for dir where OpenLDAP schema files and deps file are stored */ public static final String SCHEMA_SRC_DIR_PROP = - "maven.eve.schema.src.dir"; + "maven.ldap.server.schema.src.dir"; /** property for dir where the generated class files are created */ public static final String SCHEMA_TARGET_DIR_PROP = - "maven.eve.schema.target.dir"; + "maven.ldap.server.schema.target.dir"; /** default dir where OpenLDAP schema files and deps file are kept */ public static final String SCHEMA_SRC_DIR_DEFAULT = @@ -355,7 +355,7 @@ // source directory, if so we return true File defaultFile = new File( getJavaSrcDir() + File.separator + getFilePath( defaultClass ) ); - + return defaultFile.exists(); } Modified: incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/ObjectClasses.template Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/ObjectClasses.template?view=diff&rev=124509&p1=incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/ObjectClasses.template&r1=124508&p2=incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/ObjectClasses.template&r2=124509 ============================================================================== --- incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/ObjectClasses.template (original) +++ incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/ObjectClasses.template Fri Jan 7 07:19:47 2005 @@ -28,7 +28,7 @@ * A producer of schema objectClass definations for the $schema schema. This * code has been automatically generated using schema files in the OpenLDAP * format along with the directory plugin for maven. This has been done - * to facilitate Eve<->OpenLDAP schema interoperability. + * to facilitate OpenLDAP schema interoperability. * * @author Apache Directory Project * @version $Rev$ Modified: incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/typeless.template Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/typeless.template?view=diff&rev=124509&p1=incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/typeless.template&r1=124508&p2=incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/typeless.template&r2=124509 ============================================================================== --- incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/typeless.template (original) +++ incubator/directory/server/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/typeless.template Fri Jan 7 07:19:47 2005 @@ -28,7 +28,7 @@ * A producer of $type objects for the $schema schema. This code has been * automatically generated using schema files in the OpenLDAP format along with * the directory plugin for maven. This has been done to facilitate - * Eve<->OpenLDAP schema interoperability. + * OpenLDAP schema interoperability. * * @author Apache Directory Project * @version $Rev$