commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r155983 - in jakarta/commons/proper/jelly/trunk/jelly-tags/ant: project.xml src/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java src/java/org/apache/commons/jelly/tags/ant/GrantProject.java src/java/org/apache/commons/jelly/tags/ant/PropsHandler.java
Date Thu, 03 Mar 2005 00:35:00 GMT
Author: brett
Date: Wed Mar  2 16:34:58 2005
New Revision: 155983

URL: http://svn.apache.org/viewcvs?view=rev&rev=155983
Log:
fold in grant

Added:
    jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java
      - copied, changed from r155972, jakarta/commons/sandbox/grant/trunk/src/java/org/apache/commons/grant/DefaultPropsHandler.java
    jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/GrantProject.java
      - copied, changed from r155972, jakarta/commons/sandbox/grant/trunk/src/java/org/apache/commons/grant/GrantProject.java
    jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/PropsHandler.java
      - copied, changed from r155972, jakarta/commons/sandbox/grant/trunk/src/java/org/apache/commons/grant/PropsHandler.java
Modified:
    jakarta/commons/proper/jelly/trunk/jelly-tags/ant/project.xml

Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/ant/project.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/ant/project.xml?view=diff&r1=155982&r2=155983
==============================================================================
--- jakarta/commons/proper/jelly/trunk/jelly-tags/ant/project.xml (original)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/ant/project.xml Wed Mar  2 16:34:58 2005
@@ -59,11 +59,6 @@
       </properties>
     </dependency>
     
-    <dependency>
-      <id>commons-grant</id>
-      <version>1.0-beta-4</version>
-    </dependency>
-    
     <!-- END for compilation -->
 
     <!-- START for testing -->

Copied: jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java
(from r155972, jakarta/commons/sandbox/grant/trunk/src/java/org/apache/commons/grant/DefaultPropsHandler.java)
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java?view=diff&rev=155983&p1=jakarta/commons/sandbox/grant/trunk/src/java/org/apache/commons/grant/DefaultPropsHandler.java&r1=155972&p2=jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java&r2=155983
==============================================================================
--- jakarta/commons/sandbox/grant/trunk/src/java/org/apache/commons/grant/DefaultPropsHandler.java
(original)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java
Wed Mar  2 16:34:58 2005
@@ -1,4 +1,4 @@
-package org.apache.commons.grant;
+package org.apache.commons.jelly.tags.ant;
 
 /*
  * Copyright 1999-2001,2004 The Apache Software Foundation.
@@ -16,16 +16,16 @@
  * limitations under the License.
  */
  
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.JavaEnvUtils;
+
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.util.JavaEnvUtils;
-
-/** Implements the basic {@link PropsHandler} functionality 
+/** Implements the basic {@link org.apache.commons.jelly.tags.ant.PropsHandler} functionality
  *  against an existing map.
  * 
  * <p>
@@ -64,14 +64,14 @@
     }
 
     /**
-     * @see org.apache.commons.grant.PropsHandler#setProperty(String, String)
+     * @see PropsHandler#setProperty(String, String)
      */
     public void setProperty(String key, String value) {
         this.properties.put(key, value);
     }
 
     /**
-     * @see org.apache.commons.grant.PropsHandler#setUserProperty(String, String)
+     * @see PropsHandler#setUserProperty(String, String)
      */
     public void setUserProperty(String key, String value) {
         this.userProperties.put(key, value);
@@ -79,7 +79,7 @@
     }
 
     /**
-     * @see org.apache.commons.grant.PropsHandler#setNewProperty(String, String)
+     * @see PropsHandler#setNewProperty(String, String)
      */
     public void setNewProperty(String key, String value) {
         if (this.getProperty(key) == null) {
@@ -88,7 +88,7 @@
     }
 
     /**
-     * @see org.apache.commons.grant.PropsHandler#setInheritedProperty(String, String)
+     * @see PropsHandler#setInheritedProperty(String, String)
      */
     public void setInheritedProperty(String key, String value) {
         this.inheritedProperties.put(key, value);
@@ -96,7 +96,7 @@
     }
 
     /**
-     * @see org.apache.commons.grant.PropsHandler#setPropertyIfUndefinedByUser(String, String)
+     * @see PropsHandler#setPropertyIfUndefinedByUser(String, String)
      */
     public void setPropertyIfUndefinedByUser(String key, String value) {
         if (!this.getUserProperties().contains(key)) {
@@ -105,7 +105,7 @@
     }
 
     /**
-     * @see org.apache.commons.grant.PropsHandler#getProperty(String)
+     * @see PropsHandler#getProperty(String)
      */
     public String getProperty(String key) {
         if (key == null) {
@@ -115,7 +115,7 @@
     }
 
     /**
-     * @see org.apache.commons.grant.PropsHandler#getUserProperty(String)
+     * @see PropsHandler#getUserProperty(String)
      */
     public String getUserProperty(String key) {
         if (key == null) {
@@ -125,14 +125,14 @@
     }
 
     /**
-     * @see org.apache.commons.grant.PropsHandler#getProperties()
+     * @see PropsHandler#getProperties()
      */
     public Hashtable getProperties() {
         return new Hashtable(this.properties);
     }
 
     /**
-     * @see org.apache.commons.grant.PropsHandler#getUserProperties()
+     * @see PropsHandler#getUserProperties()
      */
     public Hashtable getUserProperties() {
         return new Hashtable(this.userProperties);
@@ -143,7 +143,7 @@
     }
     
     /**
-     * @see org.apache.commons.grant.PropsHandler#copyUserProperties(Project)
+     * @see PropsHandler#copyUserProperties(Project)
      */
     public void copyUserProperties(Project other) {
         Hashtable userProps = this.getUserProperties();
@@ -161,7 +161,7 @@
     }
 
     /**
-     * @see org.apache.commons.grant.PropsHandler#copyInheritedProperties(Project)
+     * @see PropsHandler#copyInheritedProperties(Project)
      */
     public void copyInheritedProperties(Project other) {
         Hashtable inheritedProps = this.getInheritedProperties();
@@ -178,7 +178,7 @@
     }
     
     /**
-     * @see org.apache.commons.grant.PropsHandler#setSystemProperties
+     * @see PropsHandler#setSystemProperties
      */
     public void setSystemProperties() {
         Properties systemProps = System.getProperties();
@@ -191,7 +191,7 @@
     }
 
     /**
-     * @see org.apache.commons.grant.PropsHandler#setJavaVersionProperty
+     * @see PropsHandler#setJavaVersionProperty
      */
     public void setJavaVersionProperty() {
         String javaVersion = JavaEnvUtils.getJavaVersion();

Copied: jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/GrantProject.java
(from r155972, jakarta/commons/sandbox/grant/trunk/src/java/org/apache/commons/grant/GrantProject.java)
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/GrantProject.java?view=diff&rev=155983&p1=jakarta/commons/sandbox/grant/trunk/src/java/org/apache/commons/grant/GrantProject.java&r1=155972&p2=jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/GrantProject.java&r2=155983
==============================================================================
--- jakarta/commons/sandbox/grant/trunk/src/java/org/apache/commons/grant/GrantProject.java
(original)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/GrantProject.java
Wed Mar  2 16:34:58 2005
@@ -1,4 +1,4 @@
-package org.apache.commons.grant;
+package org.apache.commons.jelly.tags.ant;
 
 /*
  * Copyright 1999-2001,2004 The Apache Software Foundation.

Copied: jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/PropsHandler.java
(from r155972, jakarta/commons/sandbox/grant/trunk/src/java/org/apache/commons/grant/PropsHandler.java)
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/PropsHandler.java?view=diff&rev=155983&p1=jakarta/commons/sandbox/grant/trunk/src/java/org/apache/commons/grant/PropsHandler.java&r1=155972&p2=jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/PropsHandler.java&r2=155983
==============================================================================
--- jakarta/commons/sandbox/grant/trunk/src/java/org/apache/commons/grant/PropsHandler.java
(original)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/PropsHandler.java
Wed Mar  2 16:34:58 2005
@@ -1,4 +1,4 @@
-package org.apache.commons.grant;
+package org.apache.commons.jelly.tags.ant;
 
 /*
  * Copyright 1999-2001,2004 The Apache Software Foundation.
@@ -23,19 +23,18 @@
 /** Interface for delegates supporting property management
  *  for a<code>GrantProject</code>.
  *
- *  @see GrantProject#setProperty
- *  @see GrantProject#setNewProperty
- *  @see GrantProject#setUserProperty
- *  @see GrantProject#setInheritedProperty
- *  @see GrantProject#setPropertyIfUndefinedByUser
- *  @see GrantProject#getProperty
- *  @see GrantProject#getUserProperty
- *  @see GrantProject#getProperties
- *  @see GrantProject#getUserProperties
- *  @see GrantProject#copyUserProperties
- *  @see GrantProject#copyInheritedProperties
- *  @see GrantProject#setSystemProperties
- *  @see GrantProject#setJavaVersionProperty
+ *  @see org.apache.commons.jelly.tags.ant.GrantProject#setProperty
+ *  @see org.apache.commons.jelly.tags.ant.GrantProject#setNewProperty
+ *  @see org.apache.commons.jelly.tags.ant.GrantProject#setUserProperty
+ *  @see org.apache.commons.jelly.tags.ant.GrantProject#setInheritedProperty
+ *  @see org.apache.commons.jelly.tags.ant.GrantProject#getProperty
+ *  @see org.apache.commons.jelly.tags.ant.GrantProject#getUserProperty
+ *  @see org.apache.commons.jelly.tags.ant.GrantProject#getProperties
+ *  @see org.apache.commons.jelly.tags.ant.GrantProject#getUserProperties
+ *  @see org.apache.commons.jelly.tags.ant.GrantProject#copyUserProperties
+ *  @see org.apache.commons.jelly.tags.ant.GrantProject#copyInheritedProperties
+ *  @see org.apache.commons.jelly.tags.ant.GrantProject#setSystemProperties
+ *  @see org.apache.commons.jelly.tags.ant.GrantProject#setJavaVersionProperty
  *
  *  @author <a href="mailto:bob@eng.werken.com">Bob McWhirter</a>
  *  @author <a href="mailto:stephenh@chase3000.com">Stephen Haberman</a>



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message