Author: epugh
Date: Mon Nov 28 14:59:36 2005
New Revision: 349544
URL: http://svn.apache.org/viewcvs?rev=349544&view=rev
Log:
Intake no longer requires Turbine 2.3.1! Depend on all Fulcrum components.
Modified:
jakarta/turbine/fulcrum/trunk/intake/project.xml
jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Field.java
jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FileItemField.java
jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java
Modified: jakarta/turbine/fulcrum/trunk/intake/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/intake/project.xml?rev=349544&r1=349543&r2=349544&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/intake/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/intake/project.xml Mon Nov 28 14:59:36 2005
@@ -6,11 +6,7 @@
<currentVersion>1.0.4-dev</currentVersion>
<dependencies>
- <dependency>
- <groupId>turbine</groupId>
- <artifactId>turbine</artifactId>
- <version>2.3.1</version>
- </dependency>
+
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-localization</artifactId>
@@ -21,7 +17,22 @@
<groupId>fulcrum</groupId>
<artifactId>fulcrum-factory</artifactId>
<version>1.0.3</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-pool</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-parser</artifactId>
+ <version>1.0.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-upload</artifactId>
+ <version>1.0.3</version>
+ </dependency>
<dependency>
<groupId>commons-fileupload</groupId>
Modified:
jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Field.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Field.java?rev=349544&r1=349543&r2=349544&view=diff
==============================================================================
---
jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Field.java
(original)
+++
jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Field.java
Mon Nov 28 14:59:36 2005
@@ -18,29 +18,23 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-
import java.util.Locale;
import org.apache.commons.lang.StringUtils;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import org.apache.fulcrum.intake.Retrievable;
-
import org.apache.fulcrum.intake.IntakeError;
import org.apache.fulcrum.intake.IntakeException;
import org.apache.fulcrum.intake.IntakeServiceFacade;
+import org.apache.fulcrum.intake.Retrievable;
import org.apache.fulcrum.intake.validator.DefaultValidator;
import org.apache.fulcrum.intake.validator.InitableByConstraintMap;
import org.apache.fulcrum.intake.validator.ValidationException;
import org.apache.fulcrum.intake.validator.Validator;
import org.apache.fulcrum.intake.xmlmodel.Rule;
import org.apache.fulcrum.intake.xmlmodel.XmlField;
-
-
-import org.apache.turbine.util.parser.ParameterParser;
-import org.apache.turbine.util.parser.ValueParser;
+import org.apache.fulcrum.parser.ParameterParser;
+import org.apache.fulcrum.parser.ValueParser;
/**
* Base class for Intake generated input processing classes.
Modified:
jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FileItemField.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FileItemField.java?rev=349544&r1=349543&r2=349544&view=diff
==============================================================================
---
jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FileItemField.java
(original)
+++
jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/FileItemField.java
Mon Nov 28 14:59:36 2005
@@ -17,14 +17,13 @@
*/
import org.apache.commons.fileupload.FileItem;
-
import org.apache.fulcrum.intake.IntakeException;
import org.apache.fulcrum.intake.IntakeRuntimeException;
import org.apache.fulcrum.intake.validator.FileValidator;
import org.apache.fulcrum.intake.validator.ValidationException;
import org.apache.fulcrum.intake.xmlmodel.XmlField;
-import org.apache.turbine.util.parser.ParameterParser;
-import org.apache.turbine.util.parser.ValueParser;
+import org.apache.fulcrum.parser.ParameterParser;
+import org.apache.fulcrum.parser.ValueParser;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">John McNally</a>
Modified:
jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java?rev=349544&r1=349543&r2=349544&view=diff
==============================================================================
---
jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java
(original)
+++
jakarta/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java
Mon Nov 28 14:59:36 2005
@@ -31,7 +31,7 @@
import org.apache.fulcrum.intake.xmlmodel.AppData;
import org.apache.fulcrum.intake.xmlmodel.XmlField;
import org.apache.fulcrum.intake.xmlmodel.XmlGroup;
-import org.apache.turbine.util.parser.ValueParser;
+import org.apache.fulcrum.parser.ValueParser;
/**
* Holds a group of Fields
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
