User: janb
Date: 02/02/19 22:27:02
Modified: jetty/src/main/org/apache/jasper CommandLineContext.java
EmbededServletOptions.java JasperException.java
JspC.java JspCompilationContext.java
JspEngineContext.java Options.java
Log:
Added new org.mortbay classes, updating apache.
Revision Changes Path
1.3 +29 -5 contrib/jetty/src/main/org/apache/jasper/CommandLineContext.java
Index: CommandLineContext.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/CommandLineContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CommandLineContext.java 10 Feb 2002 17:57:39 -0000 1.2
+++ CommandLineContext.java 20 Feb 2002 06:27:02 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/CommandLineContext.java,v 1.2
2002/02/10 17:57:39 olegnitz Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/10 17:57:39 $
+ * $Header:
/cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/CommandLineContext.java,v 1.3
2002/02/20 06:27:02 janb Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/20 06:27:02 $
*
* ====================================================================
*
@@ -216,9 +216,33 @@
* The package name for the generated class.
*/
public String getServletPackageName() {
- return servletPackageName;
+ //get the path to the jsp file
+ int indexOfSlash = getJspFile().lastIndexOf(File.separatorChar);
+ String pathName;
+ if (indexOfSlash != -1) {
+ pathName = getJspFile().substring(0, indexOfSlash);
+ } else {
+ pathName = File.separator;
+ }
+ //Assemble the package name from the base package name speced on
+ //the command line and the package name derived from the path to
+ //the jsp file
+ String packageName = "";
+ if (servletPackageName != null && !servletPackageName.equals("")) {
+ packageName = servletPackageName;
+ }
+ if (packageName.equals("")) {
+ packageName = pathName.replace(File.separatorChar, '.');
+ } else {
+ packageName += pathName.replace(File.separatorChar, '.');
+ }
+ //strip off any leading '.' in the package name
+ if (!packageName.equals("") && packageName.charAt(0) == '.') {
+ packageName = packageName.substring(1);
+ }
+ return packageName;
}
-
+
/**
* Full path name of the Java file into which the servlet is being
* generated.
1.3 +0 -0
contrib/jetty/src/main/org/apache/jasper/EmbededServletOptions.java
Index: EmbededServletOptions.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/EmbededServletOptions.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EmbededServletOptions.java 10 Feb 2002 17:57:39 -0000 1.2
+++ EmbededServletOptions.java 20 Feb 2002 06:27:02 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/EmbededServletOptions.java,v
1.2 2002/02/10 17:57:39 olegnitz Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/10 17:57:39 $
+ * $Header:
/cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/EmbededServletOptions.java,v
1.3 2002/02/20 06:27:02 janb Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/20 06:27:02 $
*
* ====================================================================
*
1.3 +0 -0 contrib/jetty/src/main/org/apache/jasper/JasperException.java
Index: JasperException.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/JasperException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JasperException.java 10 Feb 2002 17:57:39 -0000 1.2
+++ JasperException.java 20 Feb 2002 06:27:02 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/JasperException.java,v 1.2
2002/02/10 17:57:39 olegnitz Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/10 17:57:39 $
+ * $Header:
/cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/JasperException.java,v 1.3
2002/02/20 06:27:02 janb Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/20 06:27:02 $
*
* ====================================================================
*
1.3 +0 -0 contrib/jetty/src/main/org/apache/jasper/JspC.java
Index: JspC.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/JspC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspC.java 10 Feb 2002 17:57:39 -0000 1.2
+++ JspC.java 20 Feb 2002 06:27:02 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/JspC.java,v 1.2
2002/02/10 17:57:39 olegnitz Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/10 17:57:39 $
+ * $Header: /cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/JspC.java,v 1.3
2002/02/20 06:27:02 janb Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/20 06:27:02 $
*
* ====================================================================
*
1.3 +0 -0
contrib/jetty/src/main/org/apache/jasper/JspCompilationContext.java
Index: JspCompilationContext.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/JspCompilationContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspCompilationContext.java 10 Feb 2002 17:57:39 -0000 1.2
+++ JspCompilationContext.java 20 Feb 2002 06:27:02 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/JspCompilationContext.java,v
1.2 2002/02/10 17:57:39 olegnitz Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/10 17:57:39 $
+ * $Header:
/cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/JspCompilationContext.java,v
1.3 2002/02/20 06:27:02 janb Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/20 06:27:02 $
*
* ====================================================================
*
1.3 +0 -0 contrib/jetty/src/main/org/apache/jasper/JspEngineContext.java
Index: JspEngineContext.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/JspEngineContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspEngineContext.java 10 Feb 2002 17:57:39 -0000 1.2
+++ JspEngineContext.java 20 Feb 2002 06:27:02 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/JspEngineContext.java,v 1.2
2002/02/10 17:57:39 olegnitz Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/10 17:57:39 $
+ * $Header:
/cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/JspEngineContext.java,v 1.3
2002/02/20 06:27:02 janb Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/20 06:27:02 $
*
* ====================================================================
*
1.3 +0 -0 contrib/jetty/src/main/org/apache/jasper/Options.java
Index: Options.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/Options.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Options.java 10 Feb 2002 17:57:39 -0000 1.2
+++ Options.java 20 Feb 2002 06:27:02 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/Options.java,v
1.2 2002/02/10 17:57:39 olegnitz Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/10 17:57:39 $
+ * $Header: /cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/Options.java,v
1.3 2002/02/20 06:27:02 janb Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/20 06:27:02 $
*
* ====================================================================
*
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
