henning 2002/06/07 14:22:46
Modified: src/java/org/apache/turbine/modules/actions/sessionvalidator
DefaultSessionValidator.java
src/java/org/apache/turbine/services/assemblerbroker/util/python
PythonActionFactory.java PythonBaseFactory.java
PythonLayoutFactory.java
PythonNavigationFactory.java PythonPageFactory.java
PythonScreenFactory.java
src/java/org/apache/turbine/services/freemarker
AddTemplatesToHeadModel.java DynamicURIModel.java
FreeMarkerService.java InputModel.java
NavigationModel.java SetBodyAttributesModel.java
SetTitleModel.java TextAreaModel.java
TurbineFreeMarkerService.java
src/java/org/apache/turbine/torque/engine/database/transform
XmlToAppData.java
Log:
Removed wildcard imports (from importscrubber run)
Revision Changes Path
1.3 +6 -6
jakarta-turbine-2/src/java/org/apache/turbine/modules/actions/sessionvalidator/DefaultSessionValidator.java
Index: DefaultSessionValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/actions/sessionvalidator/DefaultSessionValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultSessionValidator.java 29 Mar 2002 15:57:04 -0000 1.2
+++ DefaultSessionValidator.java 7 Jun 2002 21:22:45 -0000 1.3
@@ -54,14 +54,14 @@
* <http://www.apache.org/>.
*/
-// Turbine Modules
-//import org.apache.turbine.modules.*;
-
-// Turbine Utility Classes
import org.apache.turbine.TurbineConstants;
-import org.apache.turbine.util.RunData;
+
+import org.apache.turbine.om.security.User;
+
import org.apache.turbine.services.resources.TurbineResources;
+import org.apache.turbine.util.RunData;
+
/**
* The SessionValidator attempts to retrieve the User object from the
* Servlet API session that is associated with the request. If the
@@ -83,7 +83,7 @@
* Turbine servlet.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: DefaultSessionValidator.java,v 1.2 2002/03/29 15:57:04 dobbs Exp $
+ * @version $Id: DefaultSessionValidator.java,v 1.3 2002/06/07 21:22:45 henning Exp
$
*/
public class DefaultSessionValidator extends SessionValidator
{
1.3 +1 -11
jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonActionFactory.java
Index: PythonActionFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonActionFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PythonActionFactory.java 13 Mar 2002 04:46:14 -0000 1.2
+++ PythonActionFactory.java 7 Jun 2002 21:22:45 -0000 1.3
@@ -54,18 +54,8 @@
* <http://www.apache.org/>.
*/
-// JDK Classes
-import java.io.*;
-
// Turbine Utility Classes
-import org.apache.turbine.util.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.modules.screens.*;
-import org.apache.turbine.services.resources.TurbineResources;
-
-// JPython Classes
-import org.python.util.PythonInterpreter;
-import org.python.core.*;
+import org.apache.turbine.modules.Assembler;
/**
* A screen factory that attempts to load a python class in the
1.2 +15 -8
jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java
Index: PythonBaseFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PythonBaseFactory.java 16 Aug 2001 05:08:49 -0000 1.1
+++ PythonBaseFactory.java 7 Jun 2002 21:22:45 -0000 1.2
@@ -55,20 +55,27 @@
*/
// JDK Classes
-import java.io.*;
+import java.io.File;
+
+// Turbine Classes
+import org.apache.turbine.modules.Assembler;
-// Turbine Utility Classes
-import org.apache.turbine.util.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.modules.screens.*;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.resources.TurbineResources;
+
import org.apache.turbine.services.assemblerbroker.AssemblerBrokerService;
-import org.apache.turbine.services.assemblerbroker.util.*;
+
+import org.apache.turbine.services.assemblerbroker.util.AssemblerFactory;
+
+import org.apache.turbine.services.resources.TurbineResources;
+
+import org.apache.turbine.util.Log;
// JPython Classes
+import org.python.core.Py;
+
import org.python.util.PythonInterpreter;
-import org.python.core.*;
+
+
/**
* A screen factory that attempts to load a python class in the
1.3 +1 -11
jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonLayoutFactory.java
Index: PythonLayoutFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonLayoutFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PythonLayoutFactory.java 13 Mar 2002 04:46:14 -0000 1.2
+++ PythonLayoutFactory.java 7 Jun 2002 21:22:45 -0000 1.3
@@ -54,18 +54,8 @@
* <http://www.apache.org/>.
*/
-// JDK Classes
-import java.io.*;
-
// Turbine Utility Classes
-import org.apache.turbine.util.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.modules.screens.*;
-import org.apache.turbine.services.resources.TurbineResources;
-
-// JPython Classes
-import org.python.util.PythonInterpreter;
-import org.python.core.*;
+import org.apache.turbine.modules.Assembler;
/**
* A screen factory that attempts to load a python class in the
1.3 +2 -12
jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonNavigationFactory.java
Index: PythonNavigationFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonNavigationFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PythonNavigationFactory.java 13 Mar 2002 04:46:14 -0000 1.2
+++ PythonNavigationFactory.java 7 Jun 2002 21:22:45 -0000 1.3
@@ -54,18 +54,8 @@
* <http://www.apache.org/>.
*/
-// JDK Classes
-import java.io.*;
-
-// Turbine Utility Classes
-import org.apache.turbine.util.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.modules.screens.*;
-import org.apache.turbine.services.resources.TurbineResources;
-
-// JPython Classes
-import org.python.util.PythonInterpreter;
-import org.python.core.*;
+// Turbine Classes
+import org.apache.turbine.modules.Assembler;
/**
* A screen factory that attempts to load a python class in the
1.3 +2 -12
jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonPageFactory.java
Index: PythonPageFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonPageFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PythonPageFactory.java 13 Mar 2002 04:46:14 -0000 1.2
+++ PythonPageFactory.java 7 Jun 2002 21:22:45 -0000 1.3
@@ -54,18 +54,8 @@
* <http://www.apache.org/>.
*/
-// JDK Classes
-import java.io.*;
-
-// Turbine Utility Classes
-import org.apache.turbine.util.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.modules.screens.*;
-import org.apache.turbine.services.resources.TurbineResources;
-
-// JPython Classes
-import org.python.util.PythonInterpreter;
-import org.python.core.*;
+// Turbine Classes
+import org.apache.turbine.modules.Assembler;
/**
* A screen factory that attempts to load a python class in the
1.3 +2 -13
jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonScreenFactory.java
Index: PythonScreenFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonScreenFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PythonScreenFactory.java 13 Mar 2002 04:46:14 -0000 1.2
+++ PythonScreenFactory.java 7 Jun 2002 21:22:45 -0000 1.3
@@ -54,18 +54,8 @@
* <http://www.apache.org/>.
*/
-// JDK Classes
-import java.io.*;
-
-// Turbine Utility Classes
-import org.apache.turbine.util.*;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.modules.screens.*;
-import org.apache.turbine.services.resources.TurbineResources;
-
-// JPython Classes
-import org.python.util.PythonInterpreter;
-import org.python.core.*;
+// Turbine Classes
+import org.apache.turbine.modules.Assembler;
/**
* A screen factory that attempts to load a python class in the
@@ -75,7 +65,6 @@
*/
public class PythonScreenFactory extends PythonBaseFactory
{
-
public Assembler getAssembler( String name ) throws Exception
{
1.2 +20 -10
jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/AddTemplatesToHeadModel.java
Index: AddTemplatesToHeadModel.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/AddTemplatesToHeadModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AddTemplatesToHeadModel.java 16 Aug 2001 05:08:53 -0000 1.1
+++ AddTemplatesToHeadModel.java 7 Jun 2002 21:22:45 -0000 1.2
@@ -54,25 +54,35 @@
* <http://www.apache.org/>.
*/
+
+// FreeMarker Classes
+import freemarker.template.SimpleHash;
+import freemarker.template.SimpleScalar;
+import freemarker.template.TemplateMethodModel;
+import freemarker.template.TemplateModel;
+import freemarker.template.TemplateModelException;
+
// Java stuff.
-import java.util.*;
-import java.io.*;
+import java.util.List;
+
+import org.apache.ecs.html.Head;
// Turbine Utility Classes
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
-import org.apache.turbine.services.*;
-import org.apache.turbine.services.resources.*;
-import org.apache.ecs.html.*;
+import org.apache.turbine.services.Service;
+import org.apache.turbine.services.TurbineServices;
+
+import org.apache.turbine.services.resources.TurbineResources;
+
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.util.TurbineException;
-// FreeMarker Classes
-import freemarker.template.*;
/**
* Returns output of a Navigation module. Extension of FreeMarker.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: AddTemplatesToHeadModel.java,v 1.1 2001/08/16 05:08:53 jvanzyl Exp
$
+ * @version $Id: AddTemplatesToHeadModel.java,v 1.2 2002/06/07 21:22:45 henning Exp
$
* @deprecated
*/
public class AddTemplatesToHeadModel
1.2 +10 -9
jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/DynamicURIModel.java
Index: DynamicURIModel.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/DynamicURIModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DynamicURIModel.java 16 Aug 2001 05:08:53 -0000 1.1
+++ DynamicURIModel.java 7 Jun 2002 21:22:45 -0000 1.2
@@ -54,24 +54,25 @@
* <http://www.apache.org/>.
*/
+// FreeMarker Classes
+import freemarker.template.SimpleScalar;
+import freemarker.template.TemplateMethodModel;
+import freemarker.template.TemplateModel;
+import freemarker.template.TemplateModelException;
+
+// Java stuff
import java.util.List;
// Turbine Utility Classes
-import org.apache.turbine.util.*;
-import org.apache.ecs.html.*;
-
-// Village Database Classes
-import com.workingdogs.village.*;
-
-// FreeMarker Classes
-import freemarker.template.*;
+import org.apache.turbine.util.DynamicURI;
+import org.apache.turbine.util.RunData;
/**
* Creates a TEXTAREA html tag. The rows, columns, and wrap attribute
* can be passed in through a list. Extension of FreeMarker.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: DynamicURIModel.java,v 1.1 2001/08/16 05:08:53 jvanzyl Exp $
+ * @version $Id: DynamicURIModel.java,v 1.2 2002/06/07 21:22:45 henning Exp $
* @deprecated
*/
public class DynamicURIModel
1.2 +10 -6
jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/FreeMarkerService.java
Index: FreeMarkerService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/FreeMarkerService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FreeMarkerService.java 16 Aug 2001 05:08:54 -0000 1.1
+++ FreeMarkerService.java 7 Jun 2002 21:22:45 -0000 1.2
@@ -54,22 +54,26 @@
* <http://www.apache.org/>.
*/
+// FreeMarker Stuff
+import freemarker.template.SimpleHash;
+import freemarker.template.Template;
+
// Java Classes
-import javax.servlet.*;
-import java.io.*;
+import java.io.IOException;
+
+import javax.servlet.ServletRequest;
// Turbine Stuff
import org.apache.turbine.services.Service;
-import org.apache.turbine.util.*;
-// FreeMarker Stuff
-import freemarker.template.*;
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.util.TurbineException;
/**
* Implementations of the FreeMarkerService interface.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: FreeMarkerService.java,v 1.1 2001/08/16 05:08:54 jvanzyl Exp $
+ * @version $Id: FreeMarkerService.java,v 1.2 2002/06/07 21:22:45 henning Exp $
* @deprecated
*/
public interface FreeMarkerService
1.2 +10 -7
jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/InputModel.java
Index: InputModel.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/InputModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InputModel.java 16 Aug 2001 05:08:54 -0000 1.1
+++ InputModel.java 7 Jun 2002 21:22:45 -0000 1.2
@@ -54,14 +54,17 @@
* <http://www.apache.org/>.
*/
-import java.util.List;
+// FreeMarker Classes
+import freemarker.template.SimpleScalar;
+import freemarker.template.TemplateMethodModel;
+import freemarker.template.TemplateModel;
+import freemarker.template.TemplateModelException;
-// Turbine Utility Classes
-import org.apache.turbine.util.*;
-import org.apache.ecs.html.*;
+// Java stuff.
+import java.util.List;
-// FreeMarker Classes
-import freemarker.template.*;
+// ECS
+import org.apache.ecs.html.Input;
/**
* Creates an input html tag. The size attribute can be passed in
@@ -70,7 +73,7 @@
* accidently be altered by designers.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: InputModel.java,v 1.1 2001/08/16 05:08:54 jvanzyl Exp $
+ * @version $Id: InputModel.java,v 1.2 2002/06/07 21:22:45 henning Exp $
* @deprecated
*/
public class InputModel
1.3 +11 -10
jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/NavigationModel.java
Index: NavigationModel.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/NavigationModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NavigationModel.java 16 Mar 2002 02:59:09 -0000 1.2
+++ NavigationModel.java 7 Jun 2002 21:22:45 -0000 1.3
@@ -54,21 +54,22 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
-import java.io.*;
-import org.apache.turbine.Turbine;
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
-import org.apache.ecs.*;
-import org.apache.turbine.services.*;
-import org.apache.turbine.services.template.*;
-import freemarker.template.*;
+import freemarker.template.SimpleScalar;
+import freemarker.template.TemplateMethodModel;
+import freemarker.template.TemplateModel;
+import freemarker.template.TemplateModelException;
+
+import java.util.List;
+
+import org.apache.turbine.util.RunData;
+
+import org.apache.turbine.util.template.TemplateInfo;
/**
* Returns output of a Navigation module. Extension of FreeMarker.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: NavigationModel.java,v 1.2 2002/03/16 02:59:09 jvanzyl Exp $
+ * @version $Id: NavigationModel.java,v 1.3 2002/06/07 21:22:45 henning Exp $
* @deprecated
*/
public class NavigationModel
1.2 +13 -10
jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/SetBodyAttributesModel.java
Index: SetBodyAttributesModel.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/SetBodyAttributesModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetBodyAttributesModel.java 16 Aug 2001 05:08:54 -0000 1.1
+++ SetBodyAttributesModel.java 7 Jun 2002 21:22:45 -0000 1.2
@@ -54,24 +54,27 @@
* <http://www.apache.org/>.
*/
+// FreeMarker Classes
+import freemarker.template.SimpleScalar;
+import freemarker.template.TemplateMethodModel;
+import freemarker.template.TemplateModel;
+import freemarker.template.TemplateModelException;
+
// Java stuff.
-import java.util.*;
-import java.io.*;
+import java.util.List;
-// Turbine Utility Classes
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
-import org.apache.ecs.html.*;
-import org.apache.ecs.*;
+// ECS
+import org.apache.ecs.html.Body;
+import org.apache.ecs.Attributes;
-// FreeMarker Classes
-import freemarker.template.*;
+// Turbine Utility Classes
+import org.apache.turbine.util.RunData;
/**
* Returns output of a Navigation module. Extension of FreeMarker.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: SetBodyAttributesModel.java,v 1.1 2001/08/16 05:08:54 jvanzyl Exp $
+ * @version $Id: SetBodyAttributesModel.java,v 1.2 2002/06/07 21:22:45 henning Exp $
* @deprecated
*/
public class SetBodyAttributesModel
1.2 +12 -9
jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/SetTitleModel.java
Index: SetTitleModel.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/SetTitleModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetTitleModel.java 16 Aug 2001 05:08:54 -0000 1.1
+++ SetTitleModel.java 7 Jun 2002 21:22:45 -0000 1.2
@@ -54,23 +54,26 @@
* <http://www.apache.org/>.
*/
+// FreeMarker Classes
+import freemarker.template.SimpleScalar;
+import freemarker.template.TemplateMethodModel;
+import freemarker.template.TemplateModel;
+import freemarker.template.TemplateModelException;
+
// Java stuff.
-import java.util.*;
-import java.io.*;
+import java.util.List;
-// Turbine Utility Classes
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
-import org.apache.ecs.html.*;
+// ECS Classes
+import org.apache.ecs.html.Title;
-// FreeMarker Classes
-import freemarker.template.*;
+// Turbine Utility Classes
+import org.apache.turbine.util.RunData;
/**
* Returns output of a Navigation module. Extension of FreeMarker.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: SetTitleModel.java,v 1.1 2001/08/16 05:08:54 jvanzyl Exp $
+ * @version $Id: SetTitleModel.java,v 1.2 2002/06/07 21:22:45 henning Exp $
* @deprecated
*/
public class SetTitleModel
1.2 +9 -6
jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/TextAreaModel.java
Index: TextAreaModel.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/TextAreaModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TextAreaModel.java 16 Aug 2001 05:08:54 -0000 1.1
+++ TextAreaModel.java 7 Jun 2002 21:22:45 -0000 1.2
@@ -54,14 +54,17 @@
* <http://www.apache.org/>.
*/
-import java.util.List;
-
// Turbine Utility Classes
-import org.apache.turbine.util.*;
-import org.apache.ecs.html.*;
+import freemarker.template.SimpleScalar;
+import freemarker.template.TemplateMethodModel;
+import freemarker.template.TemplateModel;
+import freemarker.template.TemplateModelException;
+
+// Java stuff.
+import java.util.List;
// FreeMarker Classes
-import freemarker.template.*;
+import org.apache.ecs.html.TextArea;
/**
* Creates a TEXTAREA html tag. The rows, columns, and wrap attribute
@@ -70,7 +73,7 @@
* accidently be altered by designers.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: TextAreaModel.java,v 1.1 2001/08/16 05:08:54 jvanzyl Exp $
+ * @version $Id: TextAreaModel.java,v 1.2 2002/06/07 21:22:45 henning Exp $
* @deprecated
*/
public class TextAreaModel
1.4 +36 -15
jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/TurbineFreeMarkerService.java
Index: TurbineFreeMarkerService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/freemarker/TurbineFreeMarkerService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineFreeMarkerService.java 16 Apr 2002 22:07:08 -0000 1.3
+++ TurbineFreeMarkerService.java 7 Jun 2002 21:22:45 -0000 1.4
@@ -54,27 +54,48 @@
* <http://www.apache.org/>.
*/
+
+// FreeMarker Stuff
+import freemarker.template.CacheEvent;
+import freemarker.template.CacheListener;
+import freemarker.template.FileTemplateCache;
+import freemarker.template.SimpleHash;
+import freemarker.template.SimpleList;
+import freemarker.template.Template;
+import freemarker.template.TemplateServletUtils;
+
// Java Stuff
-import java.util.*;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
+
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.StringTokenizer;
// Java Servlet Classes
-import javax.servlet.*;
-
-// Turbine Stuff
-import org.apache.turbine.util.*;
-import org.apache.turbine.util.security.*;
-import org.apache.turbine.om.security.*;
-import org.apache.turbine.services.*;
-import org.apache.turbine.services.resources.*;
-import org.apache.turbine.services.servlet.TurbineServlet;
+import javax.servlet.ServletRequest;
import org.apache.commons.configuration.Configuration;
-import org.apache.ecs.StringElement;
+// Turbine Stuff
+import org.apache.turbine.om.security.Permission;
+import org.apache.turbine.om.security.Role;
+import org.apache.turbine.om.security.User;
+
+import org.apache.turbine.services.BaseService;
+import org.apache.turbine.services.InitializationException;
+import org.apache.turbine.services.TurbineBaseService;
-// FreeMarker Stuff
-import freemarker.template.*;
+import org.apache.turbine.services.servlet.TurbineServlet;
+
+import org.apache.turbine.util.DynamicURI;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.util.TurbineException;
/*
@@ -93,7 +114,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: TurbineFreeMarkerService.java,v 1.3 2002/04/16 22:07:08 kschrader
Exp $
+ * @version $Id: TurbineFreeMarkerService.java,v 1.4 2002/06/07 21:22:45 henning
Exp $
* @deprecated
*/
public class TurbineFreeMarkerService
1.5 +29 -7
jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/transform/XmlToAppData.java
Index: XmlToAppData.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/torque/engine/database/transform/XmlToAppData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XmlToAppData.java 26 Feb 2002 22:15:44 -0000 1.4
+++ XmlToAppData.java 7 Jun 2002 21:22:46 -0000 1.5
@@ -54,16 +54,38 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.services.db.TurbineDB;
-import org.apache.turbine.torque.engine.database.model.*;
-import org.xml.sax.*;
-import org.xml.sax.helpers.DefaultHandler;
-
-import javax.xml.parsers.SAXParserFactory;
import java.io.BufferedReader;
import java.io.FileReader;
+import java.io.Reader;
+
import java.util.List;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.apache.turbine.services.db.TurbineDB;
+
+import org.apache.turbine.torque.engine.database.model.AppData;
+import org.apache.turbine.torque.engine.database.model.Column;
+import org.apache.turbine.torque.engine.database.model.Database;
+import org.apache.turbine.torque.engine.database.model.ForeignKey;
+import org.apache.turbine.torque.engine.database.model.IdMethodParameter;
+import org.apache.turbine.torque.engine.database.model.Index;
+import org.apache.turbine.torque.engine.database.model.Inheritance;
+import org.apache.turbine.torque.engine.database.model.Table;
+import org.apache.turbine.torque.engine.database.model.Unique;
+
+import org.xml.sax.AttributeList;
+import org.xml.sax.DocumentHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.Parser;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+import org.xml.sax.helpers.DefaultHandler;
+
/**
* A Class that is used to parse an input
* xml schema file and creates and AppData java structure.
@@ -72,7 +94,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Leon Messerschmidt</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: XmlToAppData.java,v 1.4 2002/02/26 22:15:44 fedor Exp $
+ * @version $Id: XmlToAppData.java,v 1.5 2002/06/07 21:22:46 henning Exp $
* @deprecated use turbine-torque
*/
public class XmlToAppData extends DefaultHandler implements DocumentHandler
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
