Author: akarasulu
Date: Thu Oct 21 18:30:33 2004
New Revision: 55294
Modified:
incubator/directory/eve/trunk/backend/maven-eve-plugin/plugin.jelly
incubator/directory/eve/trunk/backend/maven-eve-plugin/src/java/org/apache/eve/tools/schema/EveSchemaTool.java
Log:
fixed bug where deployed jar was causing all files to stop generating because
they were on the classpath
Modified: incubator/directory/eve/trunk/backend/maven-eve-plugin/plugin.jelly
==============================================================================
--- incubator/directory/eve/trunk/backend/maven-eve-plugin/plugin.jelly
(original)
+++ incubator/directory/eve/trunk/backend/maven-eve-plugin/plugin.jelly Thu Oct
21 18:30:33 2004
@@ -64,6 +64,7 @@
<j:useBean var="task"
class="org.apache.eve.tools.schema.EveSchemaToolTask"
name="${schema}" owner="${owner}"
package="${package}" dependencies="${deps}"/>
<j:expr value="${task.execute()}"/>
+ <echo>Generated ${schema}.schema files</echo>
</j:forEach>
</j:if>
Modified:
incubator/directory/eve/trunk/backend/maven-eve-plugin/src/java/org/apache/eve/tools/schema/EveSchemaTool.java
==============================================================================
---
incubator/directory/eve/trunk/backend/maven-eve-plugin/src/java/org/apache/eve/tools/schema/EveSchemaTool.java
(original)
+++
incubator/directory/eve/trunk/backend/maven-eve-plugin/src/java/org/apache/eve/tools/schema/EveSchemaTool.java
Thu Oct 21 18:30:33 2004
@@ -333,29 +333,8 @@
String defaultClass = schema.getFullDefaultBaseClassName( type );
String targetClass = schema.getFullDefaultBaseClassName( type );
- // first check and see the classes are in the classpath
- // although this is highly unlikely since we probably have
- // not even compiled the classes yet
- try
- {
- Class.forName( defaultClass );
- return true;
- }
- catch ( ClassNotFoundException e )
- {
- }
-
- try
- {
- Class.forName( targetClass );
- return true;
- }
- catch ( ClassNotFoundException e )
- {
- }
-
- // now we check to see if any of the classes are available
- // in the java source directory, if so we return true
+ // check to see if any of the classes are available in the java
+ // source directory, if so we return true
File defaultFile = new File( "src" + File.separator + "java"
+ File.separator + getFilePath( defaultClass ) );
File targetFile = new File( "src" + File.separator + "java"
