You are viewing a plain text version of this content. The canonical link for it is here.
Posted to imperius-commits@incubator.apache.org by da...@apache.org on 2009/10/09 18:23:51 UTC
svn commit: r823652 [5/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...
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/TypeResolver.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/TypeResolver.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/TypeResolver.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/spl/parser/util/TypeResolver.java Fri Oct 9 18:23:43 2009
@@ -29,8 +29,9 @@
import java.util.List;
-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.IllegalExpressionTypeException;
import org.apache.imperius.spl.parser.exceptions.IllegalParameterTypeException;
import org.apache.imperius.spl.parser.exceptions.SPLException;
@@ -156,7 +157,7 @@
* @throws java.lang.NullPointerException
* if there is null operand
*/
- public static TypeInfo binaryNumericPromotionResolver(TypeInfo ltOperand,
+ public static TypeInfoImpl binaryNumericPromotionResolver(TypeInfo ltOperand,
TypeInfo rtOperand) throws SPLException
{
int leftOperand = ltOperand.getType();
@@ -168,27 +169,27 @@
{
- return new TypeInfo(TypeConstants.doubleType);
+ return new TypeInfoImpl(TypeConstants.doubleType);
}
else if (leftOperand == TypeConstants.floatType
|| rightOperand == TypeConstants.floatType)
{
- return new TypeInfo(TypeConstants.floatType);
+ return new TypeInfoImpl(TypeConstants.floatType);
}
else if (leftOperand == TypeConstants.longType
|| rightOperand == TypeConstants.longType)
{
- return new TypeInfo(TypeConstants.longType);
+ return new TypeInfoImpl(TypeConstants.longType);
}
else
{
- return new TypeInfo(TypeConstants.intType,null,false);
+ return new TypeInfoImpl(TypeConstants.intType,null,false);
}
}
@@ -476,7 +477,7 @@
throws NullPointerException
{
int type = te.getType();
- TypeInfo retType = new TypeInfo();
+ TypeInfo retType = new TypeInfoImpl();
if (type == TypeConstants.doubleType)
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/util/SPLAuditLoggerClass.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/util/SPLAuditLoggerClass.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/util/SPLAuditLoggerClass.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/util/SPLAuditLoggerClass.java Fri Oct 9 18:23:43 2009
@@ -29,7 +29,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-public class SPLAuditLoggerClass extends Logger
+class SPLAuditLoggerClass extends Logger
{
private Logger internalLogger=null;
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/util/SPLLogger2.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/util/SPLLogger2.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/util/SPLLogger2.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/util/SPLLogger2.java Fri Oct 9 18:23:43 2009
@@ -30,7 +30,7 @@
import java.util.logging.Logger;
import java.util.logging.SimpleFormatter;
-public class SPLLogger2
+class SPLLogger2
{
private static SPLLogger2 splLogger;
Modified: incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/util/SPLLoggerClass.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/util/SPLLoggerClass.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/util/SPLLoggerClass.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/main/java/org/apache/imperius/util/SPLLoggerClass.java Fri Oct 9 18:23:43 2009
@@ -28,7 +28,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-public class SPLLoggerClass extends Logger
+class SPLLoggerClass extends Logger
{
private static SPLLoggerClass singletonObj = null;
Modified: incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/BooleanExpressionTest.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/BooleanExpressionTest.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/BooleanExpressionTest.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/BooleanExpressionTest.java Fri Oct 9 18:23:43 2009
@@ -26,13 +26,18 @@
package org.apache.imperius.spl.tests;
+import java.util.ArrayList;
import java.util.Calendar;
-import java.util.Vector;
import java.util.List;
-import java.util.ArrayList;
+import java.util.Vector;
import java.util.logging.Logger;
-import org.apache.imperius.spl.external.Expression;
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.imperius.spl.core.Expression;
import org.apache.imperius.spl.parser.exceptions.SPLException;
import org.apache.imperius.spl.parser.expressions.impl.BooleanConstant;
import org.apache.imperius.spl.parser.expressions.impl.DateTimeConstant;
@@ -55,11 +60,6 @@
import org.apache.imperius.spl.parser.expressions.impl.ToBoolean;
import org.apache.imperius.util.SPLLogger;
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
public class BooleanExpressionTest extends TestCase {
Modified: incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/CalendarExpressionTest.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/CalendarExpressionTest.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/CalendarExpressionTest.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/CalendarExpressionTest.java Fri Oct 9 18:23:43 2009
@@ -32,10 +32,13 @@
import java.util.GregorianCalendar;
import java.util.Vector;
-import org.apache.imperius.spl.external.Expression;
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.imperius.spl.core.Expression;
import org.apache.imperius.spl.parser.exceptions.SPLException;
-import org.apache.imperius.spl.parser.expressions.TimeZoneExpression;
-import org.apache.imperius.spl.parser.expressions.impl.DateTime;
import org.apache.imperius.spl.parser.expressions.impl.DateTimeConstant;
import org.apache.imperius.spl.parser.expressions.impl.GetDayOfMonth;
import org.apache.imperius.spl.parser.expressions.impl.GetDayOfWeek;
@@ -53,14 +56,7 @@
import org.apache.imperius.spl.parser.expressions.impl.IsAfter;
import org.apache.imperius.spl.parser.expressions.impl.IsBefore;
import org.apache.imperius.spl.parser.expressions.impl.IsWithin;
-import org.apache.imperius.spl.parser.expressions.impl.StringConstant;
import org.apache.imperius.spl.parser.expressions.impl.ToMilliseconds;
-import org.apache.imperius.spl.parser.util.ExpressionUtility;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
//import org.apache.imperius.spl.parser.expressions.impl.TimeConstant;
Modified: incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/CollectionExpressionsTest.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/CollectionExpressionsTest.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/CollectionExpressionsTest.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/CollectionExpressionsTest.java Fri Oct 9 18:23:43 2009
@@ -28,7 +28,12 @@
import java.util.List;
import java.util.Vector;
-import org.apache.imperius.spl.external.Expression;
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.imperius.spl.core.Expression;
import org.apache.imperius.spl.parser.exceptions.SPLException;
import org.apache.imperius.spl.parser.expression.primary.BasicCollectionExpression;
import org.apache.imperius.spl.parser.expressions.impl.AllInCollection;
@@ -50,11 +55,6 @@
import org.apache.imperius.spl.parser.expressions.impl.Sum;
import org.apache.imperius.spl.parser.expressions.impl.Union;
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
Modified: incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/NewExpressionTest.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/NewExpressionTest.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/NewExpressionTest.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/NewExpressionTest.java Fri Oct 9 18:23:43 2009
@@ -30,18 +30,31 @@
import java.util.List;
import java.util.Vector;
-import org.apache.imperius.spl.external.Expression;
-import org.apache.imperius.spl.external.TypeConstants;
-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.BasicCollectionExpression;
-import org.apache.imperius.spl.parser.expressions.impl.*;
-
import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.imperius.spl.core.Expression;
+import org.apache.imperius.spl.core.TypeConstants;
+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.BasicCollectionExpression;
+import org.apache.imperius.spl.parser.expressions.impl.BooleanConstant;
+import org.apache.imperius.spl.parser.expressions.impl.CharConstant;
+import org.apache.imperius.spl.parser.expressions.impl.ContainsOnlyDigits;
+import org.apache.imperius.spl.parser.expressions.impl.ContainsOnlyLetters;
+import org.apache.imperius.spl.parser.expressions.impl.ContainsOnlyLettersOrDigits;
+import org.apache.imperius.spl.parser.expressions.impl.DateTimeConstant;
+import org.apache.imperius.spl.parser.expressions.impl.DoubleConstant;
+import org.apache.imperius.spl.parser.expressions.impl.FloatConstant;
+import org.apache.imperius.spl.parser.expressions.impl.IntegerConstant;
+import org.apache.imperius.spl.parser.expressions.impl.LongConstant;
+import org.apache.imperius.spl.parser.expressions.impl.MatchesRegExp;
+import org.apache.imperius.spl.parser.expressions.impl.ShortConstant;
+import org.apache.imperius.spl.parser.expressions.impl.StringConstant;
+import org.apache.imperius.spl.parser.expressions.impl.Substring;
+
public class NewExpressionTest extends TestCase {
Modified: incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/NumericExpressionTest.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/NumericExpressionTest.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/NumericExpressionTest.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/NumericExpressionTest.java Fri Oct 9 18:23:43 2009
@@ -29,15 +29,44 @@
import java.util.Vector;
-import org.apache.imperius.spl.external.Expression;
-import org.apache.imperius.spl.parser.exceptions.SPLException;
-import org.apache.imperius.spl.parser.expressions.impl.*;
-
import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.imperius.spl.core.Expression;
+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;
+import org.apache.imperius.spl.parser.expressions.impl.ByteConstant;
+import org.apache.imperius.spl.parser.expressions.impl.Ceiling;
+import org.apache.imperius.spl.parser.expressions.impl.Division;
+import org.apache.imperius.spl.parser.expressions.impl.DoubleConstant;
+import org.apache.imperius.spl.parser.expressions.impl.Exp;
+import org.apache.imperius.spl.parser.expressions.impl.FloatConstant;
+import org.apache.imperius.spl.parser.expressions.impl.Floor;
+import org.apache.imperius.spl.parser.expressions.impl.IntegerConstant;
+import org.apache.imperius.spl.parser.expressions.impl.Ln;
+import org.apache.imperius.spl.parser.expressions.impl.Log10;
+import org.apache.imperius.spl.parser.expressions.impl.LongConstant;
+import org.apache.imperius.spl.parser.expressions.impl.Max;
+import org.apache.imperius.spl.parser.expressions.impl.Min;
+import org.apache.imperius.spl.parser.expressions.impl.Mod;
+import org.apache.imperius.spl.parser.expressions.impl.Power;
+import org.apache.imperius.spl.parser.expressions.impl.Product;
+import org.apache.imperius.spl.parser.expressions.impl.Rint;
+import org.apache.imperius.spl.parser.expressions.impl.Round;
+import org.apache.imperius.spl.parser.expressions.impl.ShortConstant;
+import org.apache.imperius.spl.parser.expressions.impl.SquareRoot;
+import org.apache.imperius.spl.parser.expressions.impl.StringConstant;
+import org.apache.imperius.spl.parser.expressions.impl.Subtraction;
+import org.apache.imperius.spl.parser.expressions.impl.ToREAL32;
+import org.apache.imperius.spl.parser.expressions.impl.ToREAL64;
+import org.apache.imperius.spl.parser.expressions.impl.ToSINT16;
+import org.apache.imperius.spl.parser.expressions.impl.ToSINT32;
+import org.apache.imperius.spl.parser.expressions.impl.ToSINT64;
+import org.apache.imperius.spl.parser.expressions.impl.ToSINT8;
+
Modified: incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/StringExpressionTest.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/StringExpressionTest.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/StringExpressionTest.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/StringExpressionTest.java Fri Oct 9 18:23:43 2009
@@ -28,7 +28,12 @@
import java.util.Vector;
-import org.apache.imperius.spl.external.Expression;
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.imperius.spl.core.Expression;
import org.apache.imperius.spl.parser.exceptions.SPLException;
import org.apache.imperius.spl.parser.expressions.impl.BooleanConstant;
import org.apache.imperius.spl.parser.expressions.impl.Concatenate;
@@ -47,11 +52,6 @@
import org.apache.imperius.spl.parser.expressions.impl.ToUpper;
import org.apache.imperius.spl.parser.expressions.impl.Word;
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
Modified: incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/TestMain.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/TestMain.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/TestMain.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/TestMain.java Fri Oct 9 18:23:43 2009
@@ -28,12 +28,12 @@
import java.util.Enumeration;
import java.util.logging.Logger;
-import org.apache.imperius.util.SPLLogger;
-
import junit.framework.TestFailure;
import junit.framework.TestResult;
import junit.framework.TestSuite;
+import org.apache.imperius.util.SPLLogger;
+
public class TestMain {
private static Logger logger = SPLLogger.getSPLLogger().getLogger();
Modified: incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/UtilityTest.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/UtilityTest.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/UtilityTest.java (original)
+++ incubator/imperius/trunk/imperius-splcore/src/test/java/org/apache/imperius/spl/tests/UtilityTest.java Fri Oct 9 18:23:43 2009
@@ -29,19 +29,24 @@
import java.util.Calendar;
import java.util.TimeZone;
-import org.apache.imperius.spl.external.Expression;
-import org.apache.imperius.spl.external.TypeConstants;
-import org.apache.imperius.spl.parser.exceptions.SPLException;
-import org.apache.imperius.spl.parser.expressions.impl.*;
-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 junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+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.impl.ByteConstant;
+import org.apache.imperius.spl.parser.expressions.impl.DateTimeConstant;
+import org.apache.imperius.spl.parser.expressions.impl.FloatConstant;
+import org.apache.imperius.spl.parser.expressions.impl.IntegerConstant;
+import org.apache.imperius.spl.parser.expressions.impl.LongConstant;
+import org.apache.imperius.spl.parser.util.ExpressionUtility;
+import org.apache.imperius.spl.parser.util.TypeInfoImpl;
+import org.apache.imperius.spl.parser.util.TypeResolver;
+
@@ -181,23 +186,23 @@
passedParams.add(n3);
passedParams.add(n4);
ArrayList formalParams=new ArrayList();
- formalParams.add(new TypeInfo(TypeConstants.byteType));
- formalParams.add(new TypeInfo(TypeConstants.floatType));
- formalParams.add(new TypeInfo(TypeConstants.intType));
- formalParams.add(new TypeInfo(TypeConstants.longType));
+ formalParams.add(new TypeInfoImpl(TypeConstants.byteType));
+ formalParams.add(new TypeInfoImpl(TypeConstants.floatType));
+ formalParams.add(new TypeInfoImpl(TypeConstants.intType));
+ formalParams.add(new TypeInfoImpl(TypeConstants.longType));
try {
- TypeInfo flt = new TypeInfo(TypeConstants.floatType);
- TypeInfo dbl = new TypeInfo(TypeConstants.doubleType);
- TypeInfo intt = new TypeInfo(TypeConstants.intType);
- TypeInfo lg = new TypeInfo(TypeConstants.longType);
- TypeInfo str = new TypeInfo(TypeConstants.stringType);
- TypeInfo bo = new TypeInfo(TypeConstants.booleanType);
- TypeInfo cal = new TypeInfo(TypeConstants.dateTime);
- TypeInfo bt = new TypeInfo(TypeConstants.byteType);
+ TypeInfo flt = new TypeInfoImpl(TypeConstants.floatType);
+ TypeInfo dbl = new TypeInfoImpl(TypeConstants.doubleType);
+ TypeInfo intt = new TypeInfoImpl(TypeConstants.intType);
+ TypeInfo lg = new TypeInfoImpl(TypeConstants.longType);
+ TypeInfo str = new TypeInfoImpl(TypeConstants.stringType);
+ TypeInfo bo = new TypeInfoImpl(TypeConstants.booleanType);
+ TypeInfo cal = new TypeInfoImpl(TypeConstants.dateTime);
+ TypeInfo bt = new TypeInfoImpl(TypeConstants.byteType);
//System.out.println("TypeResolver.resolveType(flt, dbl).getType()="+TypeResolver.resolveType(flt, dbl).getType());
//System.out.println("TypeConstants.doubleType="+TypeConstants.doubleType);
Modified: incubator/imperius/trunk/javaspl-samples/src/main/java/org/apache/imperius/javaspl/samples/bugfix/RunBugFixTest.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/javaspl-samples/src/main/java/org/apache/imperius/javaspl/samples/bugfix/RunBugFixTest.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/javaspl-samples/src/main/java/org/apache/imperius/javaspl/samples/bugfix/RunBugFixTest.java (original)
+++ incubator/imperius/trunk/javaspl-samples/src/main/java/org/apache/imperius/javaspl/samples/bugfix/RunBugFixTest.java Fri Oct 9 18:23:43 2009
@@ -28,7 +28,6 @@
import java.util.Properties;
import org.apache.imperius.javaspl.Java_SPLPolicyRuleProvider;
-import org.apache.imperius.javaspl.samples.bugfix.Bar;
import org.apache.imperius.spl.parser.exceptions.SPLException;
/**
Modified: incubator/imperius/trunk/javaspl-samples/src/main/java/org/apache/imperius/javaspl/samples/userdefinedmethods/CommandLineExecution.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/javaspl-samples/src/main/java/org/apache/imperius/javaspl/samples/userdefinedmethods/CommandLineExecution.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/javaspl-samples/src/main/java/org/apache/imperius/javaspl/samples/userdefinedmethods/CommandLineExecution.java (original)
+++ incubator/imperius/trunk/javaspl-samples/src/main/java/org/apache/imperius/javaspl/samples/userdefinedmethods/CommandLineExecution.java Fri Oct 9 18:23:43 2009
@@ -29,10 +29,11 @@
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.util.TypeInfo;
+import org.apache.imperius.spl.parser.util.TypeInfoImpl;
import org.apache.imperius.util.SPLLogger;
@@ -82,7 +83,7 @@
public TypeInfo getType() throws SPLException {
// TODO Auto-generated method stub
- return new TypeInfo(TypeConstants.booleanType,null,false);
+ return new TypeInfoImpl(TypeConstants.booleanType,null,false);
}
public boolean isArray() {
Modified: incubator/imperius/trunk/javaspl-samples/src/main/java/org/apache/imperius/javaspl/samples/userdefinedmethods/SendMail.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/javaspl-samples/src/main/java/org/apache/imperius/javaspl/samples/userdefinedmethods/SendMail.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/javaspl-samples/src/main/java/org/apache/imperius/javaspl/samples/userdefinedmethods/SendMail.java (original)
+++ incubator/imperius/trunk/javaspl-samples/src/main/java/org/apache/imperius/javaspl/samples/userdefinedmethods/SendMail.java Fri Oct 9 18:23:43 2009
@@ -28,6 +28,7 @@
import java.util.List;
import java.util.Properties;
import java.util.logging.Logger;
+
import javax.mail.Authenticator;
import javax.mail.Message;
import javax.mail.MessagingException;
@@ -37,14 +38,14 @@
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
-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.util.TypeInfo;
+import org.apache.imperius.spl.parser.util.TypeInfoImpl;
import org.apache.imperius.util.SPLLogger;
-
public class SendMail implements Expression
{
@@ -165,7 +166,7 @@
public TypeInfo getType() throws SPLException {
// TODO Auto-generated method stub
- return new TypeInfo(TypeConstants.booleanType,null,false);
+ return new TypeInfoImpl(TypeConstants.booleanType,null,false);
}
public boolean isArray() {
Modified: incubator/imperius/trunk/javaspl-samples/src/main/java/org/apache/imperius/javaspl/samples/windowscomputersystem/WindowsSystemManager.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/javaspl-samples/src/main/java/org/apache/imperius/javaspl/samples/windowscomputersystem/WindowsSystemManager.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/javaspl-samples/src/main/java/org/apache/imperius/javaspl/samples/windowscomputersystem/WindowsSystemManager.java (original)
+++ incubator/imperius/trunk/javaspl-samples/src/main/java/org/apache/imperius/javaspl/samples/windowscomputersystem/WindowsSystemManager.java Fri Oct 9 18:23:43 2009
@@ -29,13 +29,10 @@
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Hashtable;
-import java.util.List;
import java.util.Map;
import org.apache.imperius.javaspl.Java_SPLPolicyRuleProvider;
-import org.apache.imperius.spl.external.InstanceInfo;
import org.apache.imperius.spl.parser.exceptions.SPLException;
public class WindowsSystemManager
Modified: incubator/imperius/trunk/javaspl-samples/src/test/java/org/apache/imperius/javaspl/samples/simplepolicies/TestSimplePolicies.java
URL: http://svn.apache.org/viewvc/incubator/imperius/trunk/javaspl-samples/src/test/java/org/apache/imperius/javaspl/samples/simplepolicies/TestSimplePolicies.java?rev=823652&r1=823651&r2=823652&view=diff
==============================================================================
--- incubator/imperius/trunk/javaspl-samples/src/test/java/org/apache/imperius/javaspl/samples/simplepolicies/TestSimplePolicies.java (original)
+++ incubator/imperius/trunk/javaspl-samples/src/test/java/org/apache/imperius/javaspl/samples/simplepolicies/TestSimplePolicies.java Fri Oct 9 18:23:43 2009
@@ -18,13 +18,14 @@
*/
package org.apache.imperius.javaspl.samples.simplepolicies;
-import org.apache.imperius.javaspl.samples.bugfix.RunBugFixTest;
-
import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.imperius.javaspl.samples.bugfix.RunBugFixTest;
+import org.apache.imperius.javaspl.samples.simplepolicies.RunSamples;
+
public class TestSimplePolicies extends TestCase
{