svn commit: r1857889 - in /velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model: ./ context/ old/

Sat, 20 Apr 2019 20:30:06 -0700 

Author: cbrisson
Date: Sun Apr 21 03:29:25 2019
New Revision: 1857889

URL: http://svn.apache.org/viewvc?rev=1857889&view=rev
Log:
[tools/model] move context objects in a separate package

Added:
    
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/
    
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/ActiveInstanceReference.java
      - copied, changed from r1857888, 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ActiveInstanceReference.java
    
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/EntityReference.java
      - copied, changed from r1857888, 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/EntityReference.java
    
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/InstanceReference.java
      - copied, changed from r1857888, 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/InstanceReference.java
    
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/ModelTool.java
      - copied, changed from r1857888, 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ModelTool.java
    
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/ModelUberspector.java
      - copied, changed from r1857888, 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ModelUberspector.java
Removed:
    
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ActiveInstanceReference.java
    
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/EntityReference.java
    
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/InstanceReference.java
    
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ModelTool.java
    
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ModelUberspector.java
Modified:
    
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/Action.java
    
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/Attribute.java
    
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/RowAttribute.java
    
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/RowsetAttribute.java
    
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ScalarAttribute.java
    
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/old/VelosurfTool.java

Modified: 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/Action.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/Action.java?rev=1857889&r1=1857888&r2=1857889&view=diff
==============================================================================
--- 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/Action.java
 (original)
+++ 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/Action.java
 Sun Apr 21 03:29:25 2019
@@ -52,7 +52,7 @@ public class Action extends Attribute
     }
 
     @Override
-    protected String getQueryMethodName()
+    public String getQueryMethodName()
     {
         return "perform";
     }

Modified: 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/Attribute.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/Attribute.java?rev=1857889&r1=1857888&r2=1857889&view=diff
==============================================================================
--- 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/Attribute.java
 (original)
+++ 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/Attribute.java
 Sun Apr 21 03:29:25 2019
@@ -29,5 +29,5 @@ public abstract class Attribute extends
         super(name, parent);
     }
 
-    protected abstract String getQueryMethodName();
+    public abstract String getQueryMethodName();
 }

Modified: 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/RowAttribute.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/RowAttribute.java?rev=1857889&r1=1857888&r2=1857889&view=diff
==============================================================================
--- 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/RowAttribute.java
 (original)
+++ 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/RowAttribute.java
 Sun Apr 21 03:29:25 2019
@@ -75,7 +75,7 @@ public class RowAttribute extends Attrib
         return instance;
     }
 
-    protected String getQueryMethodName()
+    public String getQueryMethodName()
     {
         return "retrieve";
     }

Modified: 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/RowsetAttribute.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/RowsetAttribute.java?rev=1857889&r1=1857888&r2=1857889&view=diff
==============================================================================
--- 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/RowsetAttribute.java
 (original)
+++ 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/RowsetAttribute.java
 Sun Apr 21 03:29:25 2019
@@ -77,7 +77,7 @@ public class RowsetAttribute extends Att
         return iterator;
     }
 
-    protected String getQueryMethodName()
+    public String getQueryMethodName()
     {
         return "query";
     }

Modified: 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ScalarAttribute.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ScalarAttribute.java?rev=1857889&r1=1857888&r2=1857889&view=diff
==============================================================================
--- 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ScalarAttribute.java
 (original)
+++ 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ScalarAttribute.java
 Sun Apr 21 03:29:25 2019
@@ -79,7 +79,7 @@ public class ScalarAttribute extends Att
         return value;
     }
 
-    protected String getQueryMethodName()
+    public String getQueryMethodName()
     {
         return "evaluate";
     }

Copied: 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/ActiveInstanceReference.java
 (from r1857888, 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ActiveInstanceReference.java)
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/ActiveInstanceReference.java?p2=velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/ActiveInstanceReference.java&p1=velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ActiveInstanceReference.java&r1=1857888&r2=1857889&rev=1857889&view=diff
==============================================================================
--- 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ActiveInstanceReference.java
 (original)
+++ 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/ActiveInstanceReference.java
 Sun Apr 21 03:29:25 2019
@@ -1,8 +1,11 @@
-package org.apache.velocity.tools.model;
+package org.apache.velocity.tools.model.context;
 
 import java.io.Serializable;
 import java.util.Map;
 
+import org.apache.velocity.tools.model.Instance;
+import org.apache.velocity.tools.model.context.InstanceReference;
+
 public class ActiveInstanceReference extends InstanceReference
 {
     public ActiveInstanceReference(Instance instance)

Copied: 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/EntityReference.java
 (from r1857888, 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/EntityReference.java)
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/EntityReference.java?p2=velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/EntityReference.java&p1=velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/EntityReference.java&r1=1857888&r2=1857889&rev=1857889&view=diff
==============================================================================
--- 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/EntityReference.java
 (original)
+++ 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/EntityReference.java
 Sun Apr 21 03:29:25 2019
@@ -1,4 +1,4 @@
-package org.apache.velocity.tools.model;
+package org.apache.velocity.tools.model.context;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,6 +24,13 @@ import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.apache.velocity.tools.model.Attribute;
+import org.apache.velocity.tools.model.Entity;
+import org.apache.velocity.tools.model.Instance;
+import org.apache.velocity.tools.model.RowAttribute;
+import org.apache.velocity.tools.model.RowsetAttribute;
+import org.apache.velocity.tools.model.ScalarAttribute;
+
 public class EntityReference
 {
     public EntityReference(Entity entity)

Copied: 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/InstanceReference.java
 (from r1857888, 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/InstanceReference.java)
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/InstanceReference.java?p2=velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/InstanceReference.java&p1=velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/InstanceReference.java&r1=1857888&r2=1857889&rev=1857889&view=diff
==============================================================================
--- 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/InstanceReference.java
 (original)
+++ 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/InstanceReference.java
 Sun Apr 21 03:29:25 2019
@@ -1,5 +1,6 @@
-package org.apache.velocity.tools.model;
+package org.apache.velocity.tools.model.context;
 
+import org.apache.velocity.tools.model.Instance;
 import org.apache.velocity.tools.model.util.SlotMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Copied: 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/ModelTool.java
 (from r1857888, 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ModelTool.java)
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/ModelTool.java?p2=velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/ModelTool.java&p1=velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ModelTool.java&r1=1857888&r2=1857889&rev=1857889&view=diff
==============================================================================
--- 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ModelTool.java
 (original)
+++ 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/ModelTool.java
 Sun Apr 21 03:29:25 2019
@@ -1,4 +1,4 @@
-package org.apache.velocity.tools.model;
+package org.apache.velocity.tools.model.context;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,6 +24,13 @@ import org.apache.velocity.tools.config.
 import org.apache.velocity.tools.config.ValidScope;
 import org.apache.velocity.tools.generic.SafeConfig;
 import org.apache.velocity.tools.generic.ValueParser;
+import org.apache.velocity.tools.model.Attribute;
+import org.apache.velocity.tools.model.Entity;
+import org.apache.velocity.tools.model.Instance;
+import org.apache.velocity.tools.model.Model;
+import org.apache.velocity.tools.model.RowAttribute;
+import org.apache.velocity.tools.model.RowsetAttribute;
+import org.apache.velocity.tools.model.ScalarAttribute;
 import org.apache.velocity.tools.model.config.ConfigHelper;
 import org.apache.velocity.tools.model.config.Constants;
 

Copied: 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/ModelUberspector.java
 (from r1857888, 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ModelUberspector.java)
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/ModelUberspector.java?p2=velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/ModelUberspector.java&p1=velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ModelUberspector.java&r1=1857888&r2=1857889&rev=1857889&view=diff
==============================================================================
--- 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/ModelUberspector.java
 (original)
+++ 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/context/ModelUberspector.java
 Sun Apr 21 03:29:25 2019
@@ -1,5 +1,6 @@
-package org.apache.velocity.tools.model;
+package org.apache.velocity.tools.model.context;
 
+import org.apache.velocity.tools.model.Attribute;
 import org.apache.velocity.tools.model.impl.AttributeHolder;
 import org.apache.velocity.util.introspection.AbstractChainableUberspector;
 import org.apache.velocity.util.introspection.Info;

Modified: 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/old/VelosurfTool.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/old/VelosurfTool.java?rev=1857889&r1=1857888&r2=1857889&view=diff
==============================================================================
--- 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/old/VelosurfTool.java
 (original)
+++ 
velocity/tools/branches/model/velocity-tools-model/src/main/java/org/apache/velocity/tools/model/old/VelosurfTool.java
 Sun Apr 21 03:29:25 2019
@@ -4,7 +4,7 @@ import org.apache.velocity.tools.XmlUtil
 import org.apache.velocity.tools.config.ConfigurationException;
 import org.apache.velocity.tools.generic.ValueParser;
 import org.apache.velocity.tools.model.Model;
-import org.apache.velocity.tools.model.ModelTool;
+import org.apache.velocity.tools.model.context.ModelTool;
 import org.apache.velocity.tools.model.config.ConfigHelper;
 import org.w3c.dom.Element;
 import org.xml.sax.InputSource;

Reply via email to