You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jm...@apache.org on 2001/10/28 20:52:05 UTC
cvs commit: jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/model Field.java Group.java
jmcnally 01/10/28 11:52:05
Modified: . default.properties
src/services/java/org/apache/fulcrum/intake Intake.java
src/services/java/org/apache/fulcrum/intake/model Field.java
Group.java
Added: src/services/java/org/apache/fulcrum/intake Retrievable.java
Log:
moved the Retrievable interface from torque to intake where it is used.
added flag to properties to turn on use of Retrievable in the security classes
Revision Changes Path
1.3 +1 -0 jakarta-turbine-fulcrum/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/default.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.properties 2001/09/27 17:50:29 1.2
+++ default.properties 2001/10/28 19:52:05 1.3
@@ -60,6 +60,7 @@
addSaveMethod=true
addGetByNameMethod=true
complexObjectModel=true
+addIntakeRetrievable=true
basePrefix=Base
templatePath = ${torque.dir}/src/templates
1.7 +1 -2 jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/Intake.java
Index: Intake.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/Intake.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Intake.java 2001/10/18 21:08:30 1.6
+++ Intake.java 2001/10/28 19:52:05 1.7
@@ -61,7 +61,6 @@
import java.util.List;
import java.util.Map;
import org.apache.fulcrum.pool.Recyclable;
-import org.apache.torque.om.Retrievable;
import org.apache.fulcrum.util.parser.ValueParser;
import org.apache.fulcrum.intake.model.Group;
import org.apache.fulcrum.intake.TurbineIntake;
@@ -71,7 +70,7 @@
* The main class through which Intake is accessed.
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
- * @version $Id: Intake.java,v 1.6 2001/10/18 21:08:30 jmcnally Exp $
+ * @version $Id: Intake.java,v 1.7 2001/10/28 19:52:05 jmcnally Exp $
*/
public class Intake
implements Recyclable
1.1 jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/Retrievable.java
Index: Retrievable.java
===================================================================
package org.apache.fulcrum.intake;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Turbine" 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.
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
/**
* This interface specifies methods for uniquely identifying an object.
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
* @version $Id: Retrievable.java,v 1.1 2001/10/28 19:52:05 jmcnally Exp $
*/
public interface Retrievable
{
/**
* get an id that differentiates this object from others
* of its class.
*/
String getQueryKey();
/**
* set an id that differentiates this object from others
* of its class.
*/
void setQueryKey(String key) throws Exception;
}
1.4 +2 -2 jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/model/Field.java
Index: Field.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/model/Field.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Field.java 2001/08/31 08:04:59 1.3
+++ Field.java 2001/10/28 19:52:05 1.4
@@ -58,7 +58,7 @@
import java.lang.reflect.Method;
import org.apache.regexp.RE;
import org.apache.fulcrum.util.parser.ValueParser;
-import org.apache.torque.om.Retrievable;
+import org.apache.fulcrum.intake.Retrievable;
import org.apache.fulcrum.intake.TurbineIntake;
import org.apache.fulcrum.intake.xmlmodel.Rule;
import org.apache.fulcrum.intake.xmlmodel.XmlField;
@@ -73,7 +73,7 @@
* Base class for Intake generated input processing classes.
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: Field.java,v 1.3 2001/08/31 08:04:59 jvanzyl Exp $
+ * @version $Id: Field.java,v 1.4 2001/10/28 19:52:05 jmcnally Exp $
*/
public abstract class Field
{
1.5 +1 -1 jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/model/Group.java
Index: Group.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/model/Group.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Group.java 2001/10/04 01:12:34 1.4
+++ Group.java 2001/10/28 19:52:05 1.5
@@ -60,7 +60,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.torque.om.Retrievable;
+import org.apache.fulcrum.intake.Retrievable;
import org.apache.fulcrum.intake.TurbineIntake;
import org.apache.fulcrum.intake.xmlmodel.XmlField;
import org.apache.fulcrum.intake.xmlmodel.XmlGroup;
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>