brett 2004/04/02 15:37:19
Modified: src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
MavenUtils.java
Log:
PR: MAVEN-1205
remove function unused, and would cause ClassCastException if used
Revision Changes Path
No revision
No revision
1.107.4.16 +5 -7 maven/src/java/org/apache/maven/MavenUtils.java
Index: MavenUtils.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/MavenUtils.java,v
retrieving revision 1.107.4.15
retrieving revision 1.107.4.16
diff -u -r1.107.4.15 -r1.107.4.16
--- MavenUtils.java 28 Mar 2004 21:27:26 -0000 1.107.4.15
+++ MavenUtils.java 2 Apr 2004 23:37:19 -0000 1.107.4.16
@@ -33,7 +33,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.maven.jelly.JellyUtils;
-import org.apache.maven.jelly.MavenExpressionFactory;
import org.apache.maven.jelly.MavenJellyContext;
import org.apache.maven.project.BaseObject;
import org.apache.maven.project.Project;
@@ -97,9 +96,6 @@
/** Project Bean Reader */
private static BeanReader projectBeanReader;
- /** Maven Expression Factory. */
- private static MavenExpressionFactory mavenExpressionFactory = new
MavenExpressionFactory();
-
/** Map of loaded POMs. */
private static HashMap parentPoms = new HashMap();
@@ -225,7 +221,7 @@
// We must look in the <extend/> element for expressions that may be
present as
//
// <extend>../project.xml</extend>
- Expression e = JellyUtils.decomposeExpression( pomToExtend,
mavenExpressionFactory, context );
+ Expression e = JellyUtils.decomposeExpression( pomToExtend, context );
pomToExtend = e.evaluateAsString( context );
pomToExtend = MavenUtils.makeAbsolutePath(
projectDescriptor.getParentFile(), pomToExtend );
project.setExtend( pomToExtend );
@@ -377,7 +373,7 @@
throws IOException, SAXException, IntrospectionException,
ParserConfigurationException
{
String projectString = getProjectString(project);
- Expression e = JellyUtils.decomposeExpression( projectString,
mavenExpressionFactory, context );
+ Expression e = JellyUtils.decomposeExpression( projectString, context );
String newProjectString = e.evaluateAsString( context );
project = (Project) getProjectBeanReader().parse( new StringReader(
newProjectString ) );
return project;
@@ -762,6 +758,8 @@
// child's context values into the jelly context because we want the
// child values to win and only use the parent in the event the
// child cannot provide the value.
+
+ // TODO: need an exception for those specified on the command line
if ( parentContext != null )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
