incubator-imperius-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From daw...@apache.org
Subject svn commit: r823652 [4/5] - in /incubator/imperius/trunk: ./ cimspl-samples/src/main/java/org/apache/imperius/cimspl/client/ imperius-cimsplclientsideprovider/src/main/java/org/apache/imperius/cimspl/client/ imperius-cimsplclientsideprovider/src/test/j...
Date Fri, 09 Oct 2009 18:23:51 GMT
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Mod.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Mod.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Mod.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Mod.java Fri Oct  9 18:23:43 2009
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.DoubleArgumentExpression;
 import org.apache.imperius.spl.parser.expressions.NumericExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/NotEqual.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/NotEqual.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/NotEqual.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/NotEqual.java Fri Oct  9 18:23:43 2009
@@ -27,12 +27,12 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.BooleanExpression;
 import org.apache.imperius.spl.parser.expressions.DoubleArgumentExpression;
 import org.apache.imperius.spl.parser.util.ExpressionUtility;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Power.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Power.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Power.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Power.java Fri Oct  9 18:23:43 2009
@@ -28,11 +28,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.DoubleArgumentExpression;
 import org.apache.imperius.spl.parser.expressions.NumericExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Product.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Product.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Product.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Product.java Fri Oct  9 18:23:43 2009
@@ -29,12 +29,12 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.DoubleArgumentExpression;
 import org.apache.imperius.spl.parser.expressions.NumericExpression;
 import org.apache.imperius.spl.parser.util.ExpressionUtility;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ReplaceSubstring.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ReplaceSubstring.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ReplaceSubstring.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ReplaceSubstring.java Fri Oct  9 18:23:43 2009
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.StringExpression;
 import org.apache.imperius.spl.parser.expressions.TripleArgumentExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ReturnValues.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ReturnValues.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ReturnValues.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ReturnValues.java Fri Oct  9 18:23:43 2009
@@ -30,8 +30,8 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.evaluator.impl.ReturnObjectStore;
-import org.apache.imperius.spl.external.Expression;
+import org.apache.imperius.spl.core.Expression;
+import org.apache.imperius.spl.evaluator.internal.impl.ReturnObjectStore;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.MultipleArgumentExpression;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/RightSubstring.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/RightSubstring.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/RightSubstring.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/RightSubstring.java Fri Oct  9 18:23:43 2009
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.StringExpression;
 import org.apache.imperius.spl.parser.expressions.TripleArgumentExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Rint.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Rint.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Rint.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Rint.java Fri Oct  9 18:23:43 2009
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.NumericExpression;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Round.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Round.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Round.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Round.java Fri Oct  9 18:23:43 2009
@@ -28,12 +28,12 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.IllegalExpressionTypeException;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.NumericExpression;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SdInCollection.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SdInCollection.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SdInCollection.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SdInCollection.java Fri Oct  9 18:23:43 2009
@@ -29,8 +29,8 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Expression;
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.Expression;
+import org.apache.imperius.spl.core.TypeConstants;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
 import org.apache.imperius.spl.parser.util.ExpressionUtility;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ShortConstant.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ShortConstant.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ShortConstant.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ShortConstant.java Fri Oct  9 18:23:43 2009
@@ -26,11 +26,12 @@
 
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.ConstantExpression;
 import org.apache.imperius.spl.parser.expressions.NumericExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
+import org.apache.imperius.spl.parser.util.TypeInfoImpl;
 import org.apache.imperius.util.SPLLogger;
 
 
@@ -40,7 +41,7 @@
     
     private short _shortValue;
     
-    private TypeInfo _dataType=new TypeInfo();
+    private TypeInfo _dataType=new TypeInfoImpl();
     
     private static Logger logger = SPLLogger.getSPLLogger().getLogger();
     private static final String sourceClass="ShortConstant";

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SquareRoot.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SquareRoot.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SquareRoot.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SquareRoot.java Fri Oct  9 18:23:43 2009
@@ -28,11 +28,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.NumericExpression;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StartsWith.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StartsWith.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StartsWith.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StartsWith.java Fri Oct  9 18:23:43 2009
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.DoubleArgumentExpression;
 import org.apache.imperius.spl.parser.expressions.StringExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StringConstant.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StringConstant.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StringConstant.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StringConstant.java Fri Oct  9 18:23:43 2009
@@ -26,11 +26,12 @@
 
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.ConstantExpression;
 import org.apache.imperius.spl.parser.expressions.StringExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
+import org.apache.imperius.spl.parser.util.TypeInfoImpl;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;
 
@@ -41,7 +42,7 @@
     
     private String stringValue;
     
-    public TypeInfo _dataType = new TypeInfo();
+    public TypeInfo _dataType = new TypeInfoImpl();
     
     private static Logger logger = SPLLogger.getSPLLogger().getLogger();
     private static final String sourceClass="StringConstant";

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StringLength.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StringLength.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StringLength.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/StringLength.java Fri Oct  9 18:23:43 2009
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.NumericExpression;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SubCollection.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SubCollection.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SubCollection.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/SubCollection.java Fri Oct  9 18:23:43 2009
@@ -28,8 +28,8 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Expression;
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.Expression;
+import org.apache.imperius.spl.core.TypeConstants;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.BooleanExpression;
 import org.apache.imperius.spl.parser.expressions.DoubleArgumentExpression;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Substring.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Substring.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Substring.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Substring.java Fri Oct  9 18:23:43 2009
@@ -28,11 +28,12 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Expression;
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.Expression;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.StringExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
+import org.apache.imperius.spl.parser.util.TypeInfoImpl;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;
@@ -49,7 +50,7 @@
     
     private Expression _rhsExp;
     
-    private TypeInfo _dataType= new TypeInfo();;
+    private TypeInfo _dataType= new TypeInfoImpl();;
     
     private boolean _isArray = false;
     

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Subtraction.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Subtraction.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Subtraction.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Subtraction.java Fri Oct  9 18:23:43 2009
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.DoubleArgumentExpression;
 import org.apache.imperius.spl.parser.expressions.NumericExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Sum.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Sum.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Sum.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Sum.java Fri Oct  9 18:23:43 2009
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Expression;
+import org.apache.imperius.spl.core.Expression;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
 import org.apache.imperius.spl.parser.util.ExpressionUtility;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToBoolean.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToBoolean.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToBoolean.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToBoolean.java Fri Oct  9 18:23:43 2009
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.BooleanExpression;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToLower.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToLower.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToLower.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToLower.java Fri Oct  9 18:23:43 2009
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
 import org.apache.imperius.spl.parser.expressions.StringExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToMilliseconds.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToMilliseconds.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToMilliseconds.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToMilliseconds.java Fri Oct  9 18:23:43 2009
@@ -28,11 +28,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.NumericExpression;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToREAL32.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToREAL32.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToREAL32.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToREAL32.java Fri Oct  9 18:23:43 2009
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.NumericExpression;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToREAL64.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToREAL64.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToREAL64.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToREAL64.java Fri Oct  9 18:23:43 2009
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.NumericExpression;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT16.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT16.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT16.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT16.java Fri Oct  9 18:23:43 2009
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.NumericExpression;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT32.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT32.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT32.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT32.java Fri Oct  9 18:23:43 2009
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.NumericExpression;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT64.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT64.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT64.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT64.java Fri Oct  9 18:23:43 2009
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.NumericExpression;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT8.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT8.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT8.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToSINT8.java Fri Oct  9 18:23:43 2009
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.NumericExpression;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToString.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToString.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToString.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToString.java Fri Oct  9 18:23:43 2009
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
 import org.apache.imperius.spl.parser.expressions.StringExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToUpper.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToUpper.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToUpper.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/ToUpper.java Fri Oct  9 18:23:43 2009
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
 import org.apache.imperius.spl.parser.expressions.StringExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryMinusExpression.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryMinusExpression.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryMinusExpression.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryMinusExpression.java Fri Oct  9 18:23:43 2009
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.NumericExpression;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryNotExpression.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryNotExpression.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryNotExpression.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryNotExpression.java Fri Oct  9 18:23:43 2009
@@ -27,10 +27,10 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Expression;
+import org.apache.imperius.spl.core.Expression;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryPlusExpression.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryPlusExpression.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryPlusExpression.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/UnaryPlusExpression.java Fri Oct  9 18:23:43 2009
@@ -30,7 +30,7 @@
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.NumericExpression;
 import org.apache.imperius.spl.parser.expressions.SingleArgumentExpression;
-import org.apache.imperius.spl.parser.util.*;
+import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;
 

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Union.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Union.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Union.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Union.java Fri Oct  9 18:23:43 2009
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Expression;
+import org.apache.imperius.spl.core.Expression;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.DoubleArgumentExpression;
 import org.apache.imperius.util.Messages;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Word.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Word.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Word.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/expressions/impl/Word.java Fri Oct  9 18:23:43 2009
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.StringExpression;
 import org.apache.imperius.spl.parser.expressions.TripleArgumentExpression;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ACPLParserMap.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ACPLParserMap.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ACPLParserMap.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ACPLParserMap.java Fri Oct  9 18:23:43 2009
@@ -27,14 +27,10 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Properties;
 import java.util.logging.Logger;
 
-
-import sun.rmi.runtime.Log;
-
-import java.util.List;
-
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.impl.Abs;
 import org.apache.imperius.spl.parser.expressions.impl.Addition;
@@ -131,6 +127,8 @@
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;
 
+import sun.rmi.runtime.Log;
+
 //import org.apache.imperius.spl.parser.expressions.impl.TimeConstant;
 
 

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ActionFactory.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ActionFactory.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ActionFactory.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ActionFactory.java Fri Oct  9 18:23:43 2009
@@ -26,11 +26,10 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Expression;
+import org.apache.imperius.spl.core.Expression;
 import org.apache.imperius.spl.parser.compiler.SPLTreeParserTokenTypes;
 import org.apache.imperius.spl.parser.compiler.symboltable.SPLSymbolTable;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
-import org.apache.imperius.spl.parser.factory.ACPLParserMap;
 import org.apache.imperius.spl.parser.statements.ActionBlock;
 import org.apache.imperius.spl.parser.statements.actions.impl.AnchorMethodInvokeAction;
 import org.apache.imperius.spl.parser.statements.actions.impl.ArrowActionBlock;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/BuitInOperationExpressionFactory.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/BuitInOperationExpressionFactory.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/BuitInOperationExpressionFactory.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/BuitInOperationExpressionFactory.java Fri Oct  9 18:23:43 2009
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Expression;
+import org.apache.imperius.spl.core.Expression;
 import org.apache.imperius.spl.parser.compiler.symboltable.MacroSymbol;
 import org.apache.imperius.spl.parser.compiler.symboltable.MethodSymbol;
 import org.apache.imperius.spl.parser.compiler.symboltable.SPLSymbolTable;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ExpressionFactory.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ExpressionFactory.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ExpressionFactory.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/factory/ExpressionFactory.java Fri Oct  9 18:23:43 2009
@@ -28,8 +28,8 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Expression;
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.Expression;
+import org.apache.imperius.spl.core.TypeConstants;
 import org.apache.imperius.spl.parser.compiler.SPLTreeParserTokenTypes;
 import org.apache.imperius.spl.parser.compiler.symboltable.SPLSymbolTable;
 import org.apache.imperius.spl.parser.exceptions.SPLException;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/ActionBlock.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/ActionBlock.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/ActionBlock.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/ActionBlock.java Fri Oct  9 18:23:43 2009
@@ -25,7 +25,7 @@
 package org.apache.imperius.spl.parser.statements;
 
 
-import org.apache.imperius.spl.external.Actuator;
+import org.apache.imperius.spl.core.Actuator;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 
 public interface ActionBlock {

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/PolicyStatement.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/PolicyStatement.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/PolicyStatement.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/PolicyStatement.java Fri Oct  9 18:23:43 2009
@@ -24,8 +24,8 @@
  */
 package org.apache.imperius.spl.parser.statements;
 
-import org.apache.imperius.spl.external.Actuator;
-import org.apache.imperius.spl.external.DataCollector;
+import org.apache.imperius.spl.core.Actuator;
+import org.apache.imperius.spl.core.DataCollector;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 
 

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/AnchorMethodInvokeAction.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/AnchorMethodInvokeAction.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/AnchorMethodInvokeAction.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/AnchorMethodInvokeAction.java Fri Oct  9 18:23:43 2009
@@ -30,10 +30,11 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Actuator;
-import org.apache.imperius.spl.external.Argument;
-import org.apache.imperius.spl.external.Expression;
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.Actuator;
+import org.apache.imperius.spl.core.Argument;
+import org.apache.imperius.spl.core.Expression;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.compiler.IdentPrimaryTuple;
 import org.apache.imperius.spl.parser.compiler.symboltable.MethodSymbol;
 import org.apache.imperius.spl.parser.compiler.symboltable.SPLSymbolTable;
@@ -44,7 +45,7 @@
 import org.apache.imperius.spl.parser.statements.impl.ArgumentImpl;
 import org.apache.imperius.spl.parser.util.ActuatorFactory;
 import org.apache.imperius.spl.parser.util.ExpressionUtility;
-import org.apache.imperius.spl.parser.util.TypeInfo;
+import org.apache.imperius.spl.parser.util.TypeInfoImpl;
 import org.apache.imperius.spl.parser.util.TypeResolver;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;
@@ -82,7 +83,7 @@
         boolean isArray = false;
         if (!_identTupleList.isEmpty()) 
         {
-            TypeInfo returnType = new TypeInfo(TypeConstants.referenceType,
+            TypeInfo returnType = new TypeInfoImpl(TypeConstants.referenceType,
                     _className, isArray);
 
             Iterator identTupleIt = _identTupleList.iterator();
@@ -125,8 +126,8 @@
 //			for (int i = 0; i < argTypeList.size(); i++) {
 //				Expression exp = (Expression)pList.get(i);
 //				Argument arg = (Argument)argTypeList.get(i);
-//				TypeInfo expDataType = exp.getType();
-//				TypeInfo argDataType = arg.getType();
+//				TypeInfoImpl expDataType = exp.getType();
+//				TypeInfoImpl argDataType = arg.getType();
 ////				if (expDataType.getIsArray() != argDataType.getIsArray() ||
 ////						expDataType.getType() != argDataType.getType()) {
 //				if (expDataType.getType() != argDataType.getType()) {
@@ -458,12 +459,12 @@
                     Expression rhsExpression = null;
 
                     AssignmentExpression assignmentExpression = (AssignmentExpression) exp;
-                    if (assignmentExpression.getLHSExpression() instanceof org.apache.imperius.spl.external.Expression) 
+                    if (assignmentExpression.getLHSExpression() instanceof org.apache.imperius.spl.core.Expression) 
                     {
                         lhsExpression = (Expression) assignmentExpression
                                 .getLHSExpression();
                     }
-                    if (assignmentExpression.getRHSExpression() instanceof org.apache.imperius.spl.external.Expression) {
+                    if (assignmentExpression.getRHSExpression() instanceof org.apache.imperius.spl.core.Expression) {
                         rhsExpression = (Expression) assignmentExpression
                                 .getRHSExpression();
                     }
@@ -612,8 +613,8 @@
 //			for (int i = 0; i < argTypeList.size(); i++) {
 //				Expression exp = (Expression)paramList.get(i);
 //				ArgumentImpl arg = (ArgumentImpl)argTypeList.get(i);
-//				TypeInfo expDataType = exp.getType();
-//				TypeInfo argDataType = arg.getType();
+//				TypeInfoImpl expDataType = exp.getType();
+//				TypeInfoImpl argDataType = arg.getType();
 ////				if (expDataType.getIsArray() != argDataType.getIsArray() ||
 ////						expDataType.getType() != argDataType.getType()) {
 //				if (expDataType.getType() != argDataType.getType()) {
@@ -648,12 +649,12 @@
 //                    Expression rhsExpression = null;
 //
 //                    AssignmentExpression assignmentExpression = (AssignmentExpression) exp;
-//                    if (assignmentExpression.getLHSExpression() instanceof org.apache.imperius.spl.external.Expression) 
+//                    if (assignmentExpression.getLHSExpression() instanceof org.apache.imperius.spl.core.Expression) 
 //                    {
 //                        lhsExpression = (Expression) assignmentExpression
 //                                .getLHSExpression();
 //                    }
-//                    if (assignmentExpression.getRHSExpression() instanceof org.apache.imperius.spl.external.Expression) {
+//                    if (assignmentExpression.getRHSExpression() instanceof org.apache.imperius.spl.core.Expression) {
 //                        rhsExpression = (Expression) assignmentExpression
 //                                .getRHSExpression();
 //                    }

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/ArrowActionBlock.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/ArrowActionBlock.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/ArrowActionBlock.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/ArrowActionBlock.java Fri Oct  9 18:23:43 2009
@@ -26,7 +26,7 @@
 
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Actuator;
+import org.apache.imperius.spl.core.Actuator;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.statements.ActionBlock;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/ConcurrentActionBlock.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/ConcurrentActionBlock.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/ConcurrentActionBlock.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/ConcurrentActionBlock.java Fri Oct  9 18:23:43 2009
@@ -27,7 +27,7 @@
 
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Actuator;
+import org.apache.imperius.spl.core.Actuator;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.statements.ActionBlock;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/ExtrinsicMethodInvokeAction.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/ExtrinsicMethodInvokeAction.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/ExtrinsicMethodInvokeAction.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/ExtrinsicMethodInvokeAction.java Fri Oct  9 18:23:43 2009
@@ -27,8 +27,8 @@
 
 import java.util.List;
 
-import org.apache.imperius.spl.external.Actuator;
-import org.apache.imperius.spl.external.Expression;
+import org.apache.imperius.spl.core.Actuator;
+import org.apache.imperius.spl.core.Expression;
 import org.apache.imperius.spl.parser.compiler.symboltable.SPLSymbolTable;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.factory.BuitInOperationExpressionFactory;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/InvokePolicyAction.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/InvokePolicyAction.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/InvokePolicyAction.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/InvokePolicyAction.java Fri Oct  9 18:23:43 2009
@@ -29,14 +29,14 @@
 import java.util.Map;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Actuator;
-import org.apache.imperius.spl.external.Expression;
-import org.apache.imperius.spl.external.InternalClient;
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.Actuator;
+import org.apache.imperius.spl.core.Expression;
+import org.apache.imperius.spl.core.InternalClient;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.statements.BasicActionBlock;
 import org.apache.imperius.spl.parser.util.InternalClientFactory;
-import org.apache.imperius.spl.parser.util.TypeInfo;
 import org.apache.imperius.util.Messages;
 import org.apache.imperius.util.SPLLogger;
 

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/LogicalAndActionBlock.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/LogicalAndActionBlock.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/LogicalAndActionBlock.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/LogicalAndActionBlock.java Fri Oct  9 18:23:43 2009
@@ -27,7 +27,7 @@
 
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Actuator;
+import org.apache.imperius.spl.core.Actuator;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.statements.ActionBlock;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/LogicalOrActionBlock.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/LogicalOrActionBlock.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/LogicalOrActionBlock.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/LogicalOrActionBlock.java Fri Oct  9 18:23:43 2009
@@ -26,7 +26,7 @@
 
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Actuator;
+import org.apache.imperius.spl.core.Actuator;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.statements.ActionBlock;
 import org.apache.imperius.util.SPLLogger;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/SetActionBlock.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/SetActionBlock.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/SetActionBlock.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/actions/impl/SetActionBlock.java Fri Oct  9 18:23:43 2009
@@ -29,8 +29,8 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Actuator;
-import org.apache.imperius.spl.external.Expression;
+import org.apache.imperius.spl.core.Actuator;
+import org.apache.imperius.spl.core.Expression;
 import org.apache.imperius.spl.parser.compiler.symboltable.SPLSymbolTable;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expression.primary.PrimaryExpression;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/ArgumentImpl.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/ArgumentImpl.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/ArgumentImpl.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/ArgumentImpl.java Fri Oct  9 18:23:43 2009
@@ -25,10 +25,11 @@
 package org.apache.imperius.spl.parser.statements.impl;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Argument;
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.Argument;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
-import org.apache.imperius.spl.parser.util.*;
+import org.apache.imperius.spl.parser.util.TypeInfoImpl;
 import org.apache.imperius.util.SPLLogger;
 
 public class ArgumentImpl implements Argument 
@@ -48,7 +49,7 @@
     {
         logger.entering(sourceClass,Thread.currentThread().getName()+" "+ "Argument");
         int tp = TypeConstants.getActualType(type); 
-        _type = new TypeInfo(tp,referenceName,isArray);
+        _type = new TypeInfoImpl(tp,referenceName,isArray);
         _name = name;
        // _isArray = isArray;
        // _referenceName = referenceName;
@@ -61,7 +62,7 @@
     {
         logger.entering(sourceClass,Thread.currentThread().getName()+" "+ "Argument");
         
-        _type = new TypeInfo(type,referenceName,isArray);
+        _type = new TypeInfoImpl(type,referenceName,isArray);
         _name = name;
      //   _isArray = isArray;
      //   _referenceName = referenceName;
@@ -143,7 +144,7 @@
         logger.entering(sourceClass,Thread.currentThread().getName()+" "+ "setType");
         int tp = TypeConstants.getActualType(type);
         
-        this._type = new TypeInfo(tp,null,false);
+        this._type = new TypeInfoImpl(tp,null,false);
         
         logger.exiting(sourceClass,Thread.currentThread().getName()+" "+ "setType");
     }

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/ConstantDefinition.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/ConstantDefinition.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/ConstantDefinition.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/ConstantDefinition.java Fri Oct  9 18:23:43 2009
@@ -26,7 +26,7 @@
 
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Expression;
+import org.apache.imperius.spl.core.Expression;
 import org.apache.imperius.spl.parser.compiler.symboltable.SPLSymbolTable;
 import org.apache.imperius.util.SPLLogger;
 

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/DeclarationStatement.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/DeclarationStatement.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/DeclarationStatement.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/DeclarationStatement.java Fri Oct  9 18:23:43 2009
@@ -28,7 +28,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Expression;
+import org.apache.imperius.spl.core.Expression;
 import org.apache.imperius.spl.parser.compiler.symboltable.PropertySymbol;
 import org.apache.imperius.spl.parser.compiler.symboltable.SPLSymbolTable;
 import org.apache.imperius.spl.parser.exceptions.SPLException;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/ImportStatement.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/ImportStatement.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/ImportStatement.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/ImportStatement.java Fri Oct  9 18:23:43 2009
@@ -25,12 +25,10 @@
 package org.apache.imperius.spl.parser.statements.impl;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Expression;
-import org.apache.imperius.spl.external.InstanceInfo;
+import org.apache.imperius.spl.core.Expression;
 import org.apache.imperius.spl.parser.compiler.symboltable.SPLSymbolTable;
 import org.apache.imperius.util.SPLLogger;
 

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/MacroDefinition.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/MacroDefinition.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/MacroDefinition.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/MacroDefinition.java Fri Oct  9 18:23:43 2009
@@ -28,12 +28,12 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Argument;
-import org.apache.imperius.spl.external.Expression;
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.Argument;
+import org.apache.imperius.spl.core.Expression;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.compiler.symboltable.SPLSymbolTable;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
-import org.apache.imperius.spl.parser.util.*;
 import org.apache.imperius.util.SPLLogger;
 
 

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/PolicyDefinition.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/PolicyDefinition.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/PolicyDefinition.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/PolicyDefinition.java Fri Oct  9 18:23:43 2009
@@ -27,9 +27,9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Actuator;
-import org.apache.imperius.spl.external.DataCollector;
-import org.apache.imperius.spl.external.Expression;
+import org.apache.imperius.spl.core.Actuator;
+import org.apache.imperius.spl.core.DataCollector;
+import org.apache.imperius.spl.core.Expression;
 import org.apache.imperius.spl.parser.compiler.symboltable.SPLSymbolTable;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.statements.ActionBlock;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/PolicyGroup.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/PolicyGroup.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/PolicyGroup.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/PolicyGroup.java Fri Oct  9 18:23:43 2009
@@ -26,8 +26,8 @@
 
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Actuator;
-import org.apache.imperius.spl.external.DataCollector;
+import org.apache.imperius.spl.core.Actuator;
+import org.apache.imperius.spl.core.DataCollector;
 import org.apache.imperius.spl.parser.compiler.symboltable.SPLSymbolTable;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.statements.EvaluationResults;

Copied: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/PolicyInfoImpl.java (from r823583, incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/PolicyInfo.java)
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/PolicyInfoImpl.java?p2=incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/PolicyInfoImpl.java&p1=incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/PolicyInfo.java&r1=823583&r2=823652&rev=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/PolicyInfo.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/PolicyInfoImpl.java Fri Oct  9 18:23:43 2009
@@ -32,22 +32,26 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.apache.imperius.spl.core.PolicyInfo;
 import org.apache.imperius.spl.parser.compiler.symboltable.AnchorData;
 import org.apache.imperius.spl.parser.compiler.symboltable.SPLSymbolTable;
 import org.apache.imperius.util.SPLLogger;
 
-public class PolicyInfo {
+public class PolicyInfoImpl implements PolicyInfo {
 	
 	private List importStmtList=null;
 	private static Logger logger = SPLLogger.getSPLLogger().getLogger();
 
-	private static String sourceClass = "PolicyInfo"; 
+	private static String sourceClass = "PolicyInfoImpl"; 
 
 	
-	public PolicyInfo(List importStmtList){
+	public PolicyInfoImpl(List importStmtList){
 		this.importStmtList=importStmtList;
 	}
 	
+	/* (non-Javadoc)
+	 * @see org.apache.imperius.spl.parser.statements.impl.PolicyInfo#getClassQualifierMap()
+	 */
 	public Map getClassQualifierMap(){
 		logger.entering(sourceClass,Thread.currentThread().getName()+" "+"createInstance"); 
 		

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/SPLPolicy.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/SPLPolicy.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/SPLPolicy.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/statements/impl/SPLPolicy.java Fri Oct  9 18:23:43 2009
@@ -32,9 +32,9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.Actuator;
-import org.apache.imperius.spl.external.DataCollector;
-import org.apache.imperius.spl.external.InstanceInfo;
+import org.apache.imperius.spl.core.Actuator;
+import org.apache.imperius.spl.core.DataCollector;
+import org.apache.imperius.spl.core.InstanceInfo;
 import org.apache.imperius.spl.parser.compiler.symboltable.SPLSymbolTable;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.statements.EvaluationResults;

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/ActuatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/ActuatorFactory.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/ActuatorFactory.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/ActuatorFactory.java Fri Oct  9 18:23:43 2009
@@ -25,7 +25,7 @@
 
 package org.apache.imperius.spl.parser.util;
 
-import org.apache.imperius.spl.external.Actuator;
+import org.apache.imperius.spl.core.Actuator;
 
 public class ActuatorFactory 
 {

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/DataCollectorFactory.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/DataCollectorFactory.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/DataCollectorFactory.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/DataCollectorFactory.java Fri Oct  9 18:23:43 2009
@@ -25,7 +25,7 @@
 
 package org.apache.imperius.spl.parser.util;
 
-import org.apache.imperius.spl.external.DataCollector;
+import org.apache.imperius.spl.core.DataCollector;
 
 public class DataCollectorFactory 
 {

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/ExpressionUtility.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/ExpressionUtility.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/ExpressionUtility.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/ExpressionUtility.java Fri Oct  9 18:23:43 2009
@@ -34,12 +34,11 @@
 import java.util.TimeZone;
 import java.util.logging.Logger;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
 import org.apache.imperius.spl.parser.exceptions.IllegalExpressionTypeException;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.spl.parser.expressions.impl.DateTime;
 import org.apache.imperius.util.Messages;
-import org.apache.imperius.util.PropertiesLoader;
 import org.apache.imperius.util.SPLLogger;
 
 

Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/InternalClientFactory.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/InternalClientFactory.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/InternalClientFactory.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/InternalClientFactory.java Fri Oct  9 18:23:43 2009
@@ -25,7 +25,7 @@
 
 package org.apache.imperius.spl.parser.util;
 
-import org.apache.imperius.spl.external.InternalClient;
+import org.apache.imperius.spl.core.InternalClient;
 
 public class InternalClientFactory 
 {

Copied: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/PropertiesLoader.java (from r823583, incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/util/PropertiesLoader.java)
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/PropertiesLoader.java?p2=incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/PropertiesLoader.java&p1=incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/util/PropertiesLoader.java&r1=823583&r2=823652&rev=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/util/PropertiesLoader.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/PropertiesLoader.java Fri Oct  9 18:23:43 2009
@@ -24,7 +24,7 @@
  */
 
 
-package org.apache.imperius.util;
+package org.apache.imperius.spl.parser.util;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -36,6 +36,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.apache.imperius.util.SPLLogger;
+
 
 
 public class PropertiesLoader 

Copied: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/TypeInfoImpl.java (from r823583, incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/TypeInfo.java)
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/TypeInfoImpl.java?p2=incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/TypeInfoImpl.java&p1=incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/TypeInfo.java&r1=823583&r2=823652&rev=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/TypeInfo.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/TypeInfoImpl.java Fri Oct  9 18:23:43 2009
@@ -25,38 +25,39 @@
 
 package org.apache.imperius.spl.parser.util;
 
-import org.apache.imperius.spl.external.TypeConstants;
+import org.apache.imperius.spl.core.TypeConstants;
+import org.apache.imperius.spl.core.TypeInfo;
 import org.apache.imperius.spl.parser.exceptions.SPLException;
 import org.apache.imperius.util.Messages;
 
 
-public class TypeInfo 
+public class TypeInfoImpl implements TypeInfo 
 {
 	private int _splType = TypeConstants.INVALID;
 	private String _referenceTypeName = null;
 	private boolean _isArray = false;
 	
 	
-	public TypeInfo()
+	public TypeInfoImpl()
 	{
 		
 		
 	}
-	public TypeInfo(int type)
+	public TypeInfoImpl(int type)
 	{
 		_splType = type;
 		_referenceTypeName = null;
 		_isArray = false;
 	}
 	
-	public TypeInfo(TypeInfo type)
+	public TypeInfoImpl(TypeInfo type)
 	{
 		_splType = type.getType();
 		_referenceTypeName = type.getReferenceTypeName();
 		_isArray = type.getIsArray();
 	}
 		
-	public TypeInfo(int splType, String referenceTypeName, boolean isArr) throws SPLException
+	public TypeInfoImpl(int splType, String referenceTypeName, boolean isArr) throws SPLException
 	{
 		if(TypeResolver.isValidType(splType))
 		{	
@@ -71,27 +72,45 @@
 		}
 	}
 
+	/* (non-Javadoc)
+	 * @see org.apache.imperius.spl.parser.util.TypeInfo#getReferenceTypeName()
+	 */
 	public String getReferenceTypeName() {
 		return _referenceTypeName;
 	}
 
+	/* (non-Javadoc)
+	 * @see org.apache.imperius.spl.parser.util.TypeInfo#setReferenceTypeName(java.lang.String)
+	 */
 	public void setReferenceTypeName(String typeName) {
 		_referenceTypeName = typeName;
 	}
 
+	/* (non-Javadoc)
+	 * @see org.apache.imperius.spl.parser.util.TypeInfo#getType()
+	 */
 	public int getType() {
 		return _splType;
 	}
 
+	/* (non-Javadoc)
+	 * @see org.apache.imperius.spl.parser.util.TypeInfo#setType(int)
+	 */
 	public void setType(int type) {
 		_splType = type;
 	}
 	
+	/* (non-Javadoc)
+	 * @see org.apache.imperius.spl.parser.util.TypeInfo#getIsArray()
+	 */
 	public boolean getIsArray() {
 		return _isArray;
 	}
 
 
+	/* (non-Javadoc)
+	 * @see org.apache.imperius.spl.parser.util.TypeInfo#setIsArray(boolean)
+	 */
 	public void setIsArray(boolean array) {
 		_isArray = array;
 	}



Mime
View raw message