You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by jo...@apache.org on 2001/03/20 01:55:07 UTC
cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader ClasspathResourceLoader.java DataSourceResourceLoader.java FileResourceLoader.java JarHolder.java JarResourceLoader.java ResourceLoader.java ResourceLoaderFactory.java
jon 01/03/19 16:55:07
Modified: src/java/org/apache/velocity/runtime/resource/loader
ClasspathResourceLoader.java
DataSourceResourceLoader.java
FileResourceLoader.java JarHolder.java
JarResourceLoader.java ResourceLoader.java
ResourceLoaderFactory.java
Log:
fixed up license
added javadoc
fixed @version
Revision Changes Path
1.2 +3 -3 jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
Index: ClasspathResourceLoader.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClasspathResourceLoader.java 2001/03/05 02:59:28 1.1
+++ ClasspathResourceLoader.java 2001/03/20 00:55:03 1.2
@@ -25,7 +25,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
@@ -53,7 +53,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-
+
import java.io.InputStream;
import org.apache.velocity.runtime.Runtime;
@@ -104,7 +104,7 @@
* work just fine.
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ClasspathResourceLoader.java,v 1.1 2001/03/05 02:59:28 geirm Exp $
+ * @version $Id: ClasspathResourceLoader.java,v 1.2 2001/03/20 00:55:03 jon Exp $
*/
public class ClasspathResourceLoader extends ResourceLoader
{
1.6 +2 -2 jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
Index: DataSourceResourceLoader.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DataSourceResourceLoader.java 2001/03/20 00:50:25 1.5
+++ DataSourceResourceLoader.java 2001/03/20 00:55:03 1.6
@@ -25,7 +25,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
@@ -94,7 +94,7 @@
*
* @author <a href="mailto:david.kinnvall@alertir.com">David Kinnvall</a>
* @author <a href="mailto:paulo.gaspar@krankikom.de">Paulo Gaspar</a>
- * @version $Id: DataSourceResourceLoader.java,v 1.5 2001/03/20 00:50:25 jon Exp $
+ * @version $Id: DataSourceResourceLoader.java,v 1.6 2001/03/20 00:55:03 jon Exp $
*/
public class DataSourceResourceLoader extends ResourceLoader
{
1.9 +1 -1 jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
Index: FileResourceLoader.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FileResourceLoader.java 2001/03/14 22:07:51 1.8
+++ FileResourceLoader.java 2001/03/20 00:55:04 1.9
@@ -77,7 +77,7 @@
* That'll change once we decide how we want to do configuration
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * $Revision: 1.8 $
+ * @version $Id: FileResourceLoader.java,v 1.9 2001/03/20 00:55:04 jon Exp $
*/
public class FileResourceLoader extends ResourceLoader
{
1.4 +4 -3 jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/JarHolder.java
Index: JarHolder.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/JarHolder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JarHolder.java 2001/03/05 11:47:01 1.3
+++ JarHolder.java 2001/03/20 00:55:04 1.4
@@ -25,7 +25,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
@@ -72,9 +72,10 @@
import org.apache.velocity.exception.ResourceNotFoundException;
/**
-
+ * A small wrapper around a Jar
+ *
* @author <a href="mailto:daveb@miceda-data.com">Dave Bryson</a>
- * $Revision: 1.3 $
+ * @version $Id: JarHolder.java,v 1.4 2001/03/20 00:55:04 jon Exp $
*/
public class JarHolder
{
1.7 +4 -8 jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
Index: JarResourceLoader.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JarResourceLoader.java 2001/03/05 11:47:02 1.6
+++ JarResourceLoader.java 2001/03/20 00:55:04 1.7
@@ -25,7 +25,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
@@ -55,15 +55,12 @@
*/
import java.io.InputStream;
-//import java.io.FileInputStream;
-//import java.io.BufferedInputStream;
-//import java.io.FileNotFoundException;
-//import java.io.ByteArrayInputStream;
import java.io.IOException;
+
import java.net.JarURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
-//import java.util.ArrayList;
+
import java.util.Enumeration;
import java.util.Iterator;
import java.util.jar.JarEntry;
@@ -82,9 +79,8 @@
/**
* ResourceLoader to load templates from multiple Jar files.
*
- *
* @author <a href="mailto:daveb@miceda-data.com">Dave Bryson</a>
- * $Revision: 1.6 $
+ * @version $Id: JarResourceLoader.java,v 1.7 2001/03/20 00:55:04 jon Exp $
*/
public class JarResourceLoader extends ResourceLoader
{
1.7 +2 -2 jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java
Index: ResourceLoader.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ResourceLoader.java 2001/03/05 11:47:04 1.6
+++ ResourceLoader.java 2001/03/20 00:55:04 1.7
@@ -25,7 +25,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
@@ -68,7 +68,7 @@
* extend.
*
* @autor <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * $Id: ResourceLoader.java,v 1.6 2001/03/05 11:47:04 jvanzyl Exp $
+ * $Id: ResourceLoader.java,v 1.7 2001/03/20 00:55:04 jon Exp $
*/
public abstract class ResourceLoader
{
1.3 +2 -2 jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java
Index: ResourceLoaderFactory.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResourceLoaderFactory.java 2001/03/05 11:47:06 1.2
+++ ResourceLoaderFactory.java 2001/03/20 00:55:05 1.3
@@ -25,7 +25,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
@@ -61,7 +61,7 @@
* Factory to grab a template loader.
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * $Id: ResourceLoaderFactory.java,v 1.2 2001/03/05 11:47:06 jvanzyl Exp $
+ * $Id: ResourceLoaderFactory.java,v 1.3 2001/03/20 00:55:05 jon Exp $
*/
public class ResourceLoaderFactory
{