directory-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alex Karasulu <aok...@bellsouth.net>
Subject [eve] multiproject in eve/trunk works like a champ now - Thanks Brett!
Date Wed, 24 Nov 2004 02:21:06 GMT
maven -Dgoal=java:compile multiproject:goal

in eve/trunk builds Eve just fine now thanks!  The antlr issue is gone.

Alex

brett@apache.org wrote:

>Author: brett
>Date: Tue Nov 23 14:47:13 2004
>New Revision: 106358
>
>Modified:
>   incubator/directory/eve/trunk/tools/maven-eve-plugin/project.properties
>   incubator/directory/eve/trunk/tools/maven-eve-plugin/src/java/org/apache/eve/tools/schema/EveSchemaTool.java
>   incubator/directory/eve/trunk/tools/maven-eve-plugin/src/test/org/apache/eve/tools/schema/AbstractTestCase.java
>Log:
>fix multiproject build problems by ensuring basedir is used
>
>
>Modified: incubator/directory/eve/trunk/tools/maven-eve-plugin/project.properties
>Url: http://svn.apache.org/viewcvs/incubator/directory/eve/trunk/tools/maven-eve-plugin/project.properties?view=diff&rev=106358&p1=incubator/directory/eve/trunk/tools/maven-eve-plugin/project.properties&r1=106357&p2=incubator/directory/eve/trunk/tools/maven-eve-plugin/project.properties&r2=106358
>==============================================================================
>--- incubator/directory/eve/trunk/tools/maven-eve-plugin/project.properties	(original)
>+++ incubator/directory/eve/trunk/tools/maven-eve-plugin/project.properties	Tue Nov 23
14:47:13 2004
>@@ -19,7 +19,7 @@
> 
> # antlr configuration
> maven.antlr.grammars=openldap.g
>-maven.antlr.src.dir=src/antlr
>+maven.antlr.src.dir=${basedir}/src/antlr
> 
> # eve schema configuration
> maven.eve.schemas=core,java,inetorgperson
>@@ -33,3 +33,4 @@
> 
> maven.eve.schema.deps.inetorgperson=system,core
> 
>+maven.multiproject.type=plugin
>
>Modified: incubator/directory/eve/trunk/tools/maven-eve-plugin/src/java/org/apache/eve/tools/schema/EveSchemaTool.java
>Url: http://svn.apache.org/viewcvs/incubator/directory/eve/trunk/tools/maven-eve-plugin/src/java/org/apache/eve/tools/schema/EveSchemaTool.java?view=diff&rev=106358&p1=incubator/directory/eve/trunk/tools/maven-eve-plugin/src/java/org/apache/eve/tools/schema/EveSchemaTool.java&r1=106357&p2=incubator/directory/eve/trunk/tools/maven-eve-plugin/src/java/org/apache/eve/tools/schema/EveSchemaTool.java&r2=106358
>==============================================================================
>--- incubator/directory/eve/trunk/tools/maven-eve-plugin/src/java/org/apache/eve/tools/schema/EveSchemaTool.java
(original)
>+++ incubator/directory/eve/trunk/tools/maven-eve-plugin/src/java/org/apache/eve/tools/schema/EveSchemaTool.java
Tue Nov 23 14:47:13 2004
>@@ -36,6 +36,7 @@
>  */
> public class EveSchemaTool
> {
>+    private static String basedir = System.getProperty( "basedir", "." );
> 
>     /** property for dir where OpenLDAP schema files and deps file are stored */
>     public static final String SCHEMA_SRC_DIR_PROP =
>@@ -46,12 +47,12 @@
> 
>     /** default dir where OpenLDAP schema files and deps file are kept */
>     public static final String SCHEMA_SRC_DIR_DEFAULT =
>-            "src" + File.separator + "schema";
>+            basedir + File.separator + "src" + File.separator + "schema";
>     /** property for the name of the schema dependency file */
>     public static final String SCHEMA_DEP_FILE_DEFAULT = "schema.deps";
>     /** default dir where the generated class files are created */
>     public static final String SCHEMA_TARGET_DIR_DEFAULT =
>-            "target" + File.separator + "schema";
>+            basedir + File.separator + "target" + File.separator + "schema";
> 
> 
>     /** the source directory where the schema OpenLDAP source files are kept */
>
>Modified: incubator/directory/eve/trunk/tools/maven-eve-plugin/src/test/org/apache/eve/tools/schema/AbstractTestCase.java
>Url: http://svn.apache.org/viewcvs/incubator/directory/eve/trunk/tools/maven-eve-plugin/src/test/org/apache/eve/tools/schema/AbstractTestCase.java?view=diff&rev=106358&p1=incubator/directory/eve/trunk/tools/maven-eve-plugin/src/test/org/apache/eve/tools/schema/AbstractTestCase.java&r1=106357&p2=incubator/directory/eve/trunk/tools/maven-eve-plugin/src/test/org/apache/eve/tools/schema/AbstractTestCase.java&r2=106358
>==============================================================================
>--- incubator/directory/eve/trunk/tools/maven-eve-plugin/src/test/org/apache/eve/tools/schema/AbstractTestCase.java
(original)
>+++ incubator/directory/eve/trunk/tools/maven-eve-plugin/src/test/org/apache/eve/tools/schema/AbstractTestCase.java
Tue Nov 23 14:47:13 2004
>@@ -39,11 +39,14 @@
> public class AbstractTestCase extends TestCase
> {
>     private OpenLdapSchemaParser parser;
>+    private String basedir;
> 
>     protected void setUp() throws Exception
>     {
>         super.setUp();
> 
>+        basedir = System.getProperty( "basedir", "." );
>+
>         parser = new OpenLdapSchemaParser();
>         parser.setParserMonitor( new ConsoleParserMonitor() );
>     }
>@@ -95,7 +98,7 @@
>         context.put( "attrTypes", attributeTypes );
> 
>         FileReader template = getResourceReader( "AttributeTypes.template" );
>-        FileWriter writer = getResourceWriter( "target/schema",
>+        FileWriter writer = getResourceWriter( basedir + "/target/schema",
>             schema.getPackageName(),
>             schema.getUnqualifiedClassName( ProducerTypeEnum.ATTRIBUTE_TYPE_PRODUCER
) );
>         Velocity.init();
>@@ -121,7 +124,7 @@
>         context.put( "objectClasses", objectClasses );
> 
>         FileReader template = getResourceReader( "ObjectClasses.template" );
>-        FileWriter writer = getResourceWriter( "target/schema",
>+        FileWriter writer = getResourceWriter( basedir + "/target/schema",
>             schema.getPackageName(),
>             schema.getUnqualifiedClassName( ProducerTypeEnum.OBJECT_CLASS_PRODUCER )
);
>         Velocity.init();
>
>  
>


Mime
View raw message