reference resolving evaluator baked into core
git-svn-id: https://svn.apache.org/repos/asf/ant/antlibs/props/trunk@916109 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/docs/index.html b/docs/index.html
index ede5d0b..6e91ce6 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -113,13 +113,6 @@
<td>Implements *nix shell-inspired string operations.</td>
</tr>
<tr>
- <a name="refs" />
- <td align="center">refs</td>
- <td align="center">PropertyEvaluator</td>
- <td>Given <code>ref:<em>refid</em></code>,
- resolves Ant Project reference <code><em>refid</em></code>.</td>
- </tr>
- <tr>
<a name="types" />
<td align="center">types</td>
<td align="center">PropertyEvaluator</td>
diff --git a/src/main/org/apache/ant/props/ReferenceResolvingEvaluator.java b/src/main/org/apache/ant/props/ReferenceResolvingEvaluator.java
deleted file mode 100644
index 522e2e7..0000000
--- a/src/main/org/apache/ant/props/ReferenceResolvingEvaluator.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.ant.props;
-
-import org.apache.tools.ant.PropertyHelper;
-
-/**
- * PropertyEvaluator that resolves a reference against the current project.
- */
-public class ReferenceResolvingEvaluator extends StaticPrefixedEvaluator {
- /** Default prefix */
- public static final String DEFAULT_PREFIX = "ref";
-
- /**
- * Create a new ReferenceResolvingEvaluator.
- */
- public ReferenceResolvingEvaluator() {
- super(DEFAULT_PREFIX);
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.apache.ant.props.PrefixedEvaluator#evaluatePrefixed(java.lang.String,
- * java.lang.String, org.apache.tools.ant.PropertyHelper)
- */
- protected Object evaluate(String property, String prefix, PropertyHelper propertyHelper) {
- return propertyHelper.getProject().getReference(property);
- }
-}
diff --git a/src/main/org/apache/ant/props/antlib.xml b/src/main/org/apache/ant/props/antlib.xml
index e01ec85..3946873 100644
--- a/src/main/org/apache/ant/props/antlib.xml
+++ b/src/main/org/apache/ant/props/antlib.xml
@@ -21,7 +21,6 @@
<typedef name="nested" classname="org.apache.ant.props.NestedPropertyExpander" />
<typedef name="stringops" classname="org.apache.ant.props.stringops.StringOperationsEvaluator" />
<typedef name="types" classname="org.apache.ant.props.ComponentTypeEvaluator" />
- <typedef name="refs" classname="org.apache.ant.props.ReferenceResolvingEvaluator" />
<typedef name="encodeURL" classname="org.apache.ant.props.EncodeURLEvaluator" />
<typedef name="conditions" classname="org.apache.ant.props.ConditionEvaluator" />
</antlib>
diff --git a/src/tests/antunit/refs-test.xml b/src/tests/antunit/refs-test.xml
deleted file mode 100644
index 5f94ebd..0000000
--- a/src/tests/antunit/refs-test.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit"
- xmlns:props="antlib:org.apache.ant.props">
- <target name="setUp">
- <propertyhelper>
- <props:refs />
- <props:refs delimiter="," />
- <props:nested />
- </propertyhelper>
- <path id="cp" path="${java.class.path}" />
- </target>
-
- <target name="testPath" depends="setUp">
- <whichresource property="control" class="org.apache.tools.ant.Project" classpathref="cp" />
- <whichresource property="test" class="org.apache.tools.ant.Project" classpath="${ref:cp}" />
- <au:assertTrue>
- <equals arg1="${control}" arg2="${test}" />
- </au:assertTrue>
- </target>
-
- <target name="testDelimiter" depends="setUp">
- <au:assertTrue>
- <equals arg1="${ref:cp}" arg2="${ref,cp}" />
- </au:assertTrue>
- </target>
-
- <target name="antunit">
- <au:antunit>
- <fileset file="${ant.file}" />
- </au:antunit>
- </target>
-
-</project>
