svn commit: r1857916 - in /velocity/tools/branches/model/velocity-tools-model: ./ src/main/resources/org/apache/velocity/tools/model/ src/test/java/org/apache/velocity/tools/model/

[cbrisson]

Author: cbrisson
Date: Sun Apr 21 15:07:04 2019
New Revision: 1857916

URL: http://svn.apache.org/viewvc?rev=1857916&view=rev
Log:
[tools/model] Fix testcases for package change

Modified:
    velocity/tools/branches/model/velocity-tools-model/pom.xml
    
velocity/tools/branches/model/velocity-tools-model/src/main/resources/org/apache/velocity/tools/model/tools.xml
    
velocity/tools/branches/model/velocity-tools-model/src/main/resources/org/apache/velocity/tools/model/velocity.properties
    
velocity/tools/branches/model/velocity-tools-model/src/test/java/org/apache/velocity/tools/model/BasicModelToolTests.java

Modified: velocity/tools/branches/model/velocity-tools-model/pom.xml
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/pom.xml?rev=1857916&r1=1857915&r2=1857916&view=diff
==============================================================================
--- velocity/tools/branches/model/velocity-tools-model/pom.xml (original)
+++ velocity/tools/branches/model/velocity-tools-model/pom.xml Sun Apr 21 
15:07:04 2019
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>velocity-tools-parent</artifactId>
         <groupId>org.apache.velocity.tools</groupId>
-        <version>3.1-SNAPSHOT</version>
+        <version>3.1-model-SNAPSHOT</version>
     </parent>
 
     <artifactId>velocity-tools-model</artifactId>

Modified: 
velocity/tools/branches/model/velocity-tools-model/src/main/resources/org/apache/velocity/tools/model/tools.xml
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/src/main/resources/org/apache/velocity/tools/model/tools.xml?rev=1857916&r1=1857915&r2=1857916&view=diff
==============================================================================
--- 
velocity/tools/branches/model/velocity-tools-model/src/main/resources/org/apache/velocity/tools/model/tools.xml
 (original)
+++ 
velocity/tools/branches/model/velocity-tools-model/src/main/resources/org/apache/velocity/tools/model/tools.xml
 Sun Apr 21 15:07:04 2019
@@ -22,6 +22,6 @@
 <tools>
     <data type="boolean" key="MODEL_TOOL_AVAILABLE" value="true"/>
     <toolbox scope="application">
-        <tool class="org.apache.velocity.tools.model.ModelTool"/>
+        <tool class="org.apache.velocity.tools.model.context.ModelTool"/>
     </toolbox>
 </tools>

Modified: 
velocity/tools/branches/model/velocity-tools-model/src/main/resources/org/apache/velocity/tools/model/velocity.properties
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/src/main/resources/org/apache/velocity/tools/model/velocity.properties?rev=1857916&r1=1857915&r2=1857916&view=diff
==============================================================================
--- 
velocity/tools/branches/model/velocity-tools-model/src/main/resources/org/apache/velocity/tools/model/velocity.properties
 (original)
+++ 
velocity/tools/branches/model/velocity-tools-model/src/main/resources/org/apache/velocity/tools/model/velocity.properties
 Sun Apr 21 15:07:04 2019
@@ -16,8 +16,8 @@
 # under the License.
 
 # use model uberspector
-#TODO runtime.introspector.uberspect = 
org.apache.velocity.tools.model.ModelUberspector,org.apache.velocity.util.introspection.UberspectImpl,org.apache.velocity.tools.view.WebappUberspector
-runtime.introspector.uberspect = 
org.apache.velocity.tools.model.ModelUberspector,org.apache.velocity.util.introspection.UberspectImpl
+#TODO runtime.introspector.uberspect = 
org.apache.velocity.tools.model.context.ModelUberspector,org.apache.velocity.util.introspection.UberspectImpl,org.apache.velocity.tools.view.WebappUberspector
+runtime.introspector.uberspect = 
org.apache.velocity.tools.model.context.ModelUberspector,org.apache.velocity.util.introspection.UberspectImpl
 
 # default values for model tool
 model.write = java

Modified: 
velocity/tools/branches/model/velocity-tools-model/src/test/java/org/apache/velocity/tools/model/BasicModelToolTests.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/model/velocity-tools-model/src/test/java/org/apache/velocity/tools/model/BasicModelToolTests.java?rev=1857916&r1=1857915&r2=1857916&view=diff
==============================================================================
--- 
velocity/tools/branches/model/velocity-tools-model/src/test/java/org/apache/velocity/tools/model/BasicModelToolTests.java
 (original)
+++ 
velocity/tools/branches/model/velocity-tools-model/src/test/java/org/apache/velocity/tools/model/BasicModelToolTests.java
 Sun Apr 21 15:07:04 2019
@@ -245,7 +245,7 @@ public class BasicModelToolTests extends
     {
         DataSource dataSource = initDataSource();
         Properties velProps = new Properties();
-        velProps.put("introspector.uberspect.class", 
"org.apache.velocity.tools.model.ModelUberspector, 
org.apache.velocity.util.introspection.UberspectImpl");
+        velProps.put("introspector.uberspect.class", 
"org.apache.velocity.tools.model.context.ModelUberspector, 
org.apache.velocity.util.introspection.UberspectImpl");
         VelocityEngine engine = createVelocityEngine(velProps);
         ModelTool model = new ModelTool();
         Map<String, Object> props = new HashMap<>();
@@ -269,7 +269,7 @@ public class BasicModelToolTests extends
     {
         DataSource dataSource = initDataSource();
         Properties velProps = new Properties();
-        velProps.put("introspector.uberspect.class", 
"org.apache.velocity.tools.model.ModelUberspector,org.apache.velocity.util.introspection.UberspectImpl");
+        velProps.put("introspector.uberspect.class", 
"org.apache.velocity.tools.model.context.ModelUberspector,org.apache.velocity.util.introspection.UberspectImpl");
         velProps.put("model.datasource", dataSource);
         velProps.put("model.reverse", "extended");
         velProps.put("model.identifiers.mapping", "lowercase");
@@ -297,7 +297,7 @@ public class BasicModelToolTests extends
     {
         DataSource dataSource = initDataSource();
         Properties velProps = new Properties();
-        velProps.put("introspector.uberspect.class", 
"org.apache.velocity.tools.model.ModelUberspector,org.apache.velocity.util.introspection.UberspectImpl");
+        velProps.put("introspector.uberspect.class", 
"org.apache.velocity.tools.model.context.ModelUberspector,org.apache.velocity.util.introspection.UberspectImpl");
         velProps.put("model.datasource", dataSource);
         velProps.put("model.reverse", "extended");
         velProps.put("model.identifiers.mapping", "lowercase");