Author: etnu
Date: Thu Jan 15 19:06:12 2009
New Revision: 734900
URL: http://svn.apache.org/viewvc?rev=734900&view=rev
Log:
Moved expressions into common in order to allow basic expressions to be re-used
in other contexts, such as configuration.
Added:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ElException.java
- copied, changed from r734890,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/ElException.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expression.java
- copied, changed from r734890,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/Expression.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ExpressionContext.java
- copied, changed from r734890,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/ExpressionContext.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java
- copied, changed from r734890,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/Expressions.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/ExpressionsTest.java
- copied, changed from r734890,
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/expressions/ExpressionsTest.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetExpressionContext.java
- copied, changed from r734890,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/GadgetExpressionContext.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetExpressionContextTest.java
- copied, changed from r734890,
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/expressions/GadgetExpressionContextTest.java
Removed:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/expressions/
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/PipelinedData.java
Copied:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ElException.java
(from r734890,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/ElException.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ElException.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ElException.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/ElException.java&r1=734890&r2=734900&rev=734900&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/ElException.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ElException.java
Thu Jan 15 19:06:12 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.gadgets.expressions;
+package org.apache.shindig.expressions;
/**
* Exceptions thrown while evaluating expressions.
Copied:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expression.java
(from r734890,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/Expression.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expression.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expression.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/Expression.java&r1=734890&r2=734900&rev=734900&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/Expression.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expression.java
Thu Jan 15 19:06:12 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.gadgets.expressions;
+package org.apache.shindig.expressions;
/**
* A single expression.
Copied:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ExpressionContext.java
(from r734890,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/ExpressionContext.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ExpressionContext.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ExpressionContext.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/ExpressionContext.java&r1=734890&r2=734900&rev=734900&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/ExpressionContext.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ExpressionContext.java
Thu Jan 15 19:06:12 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.gadgets.expressions;
+package org.apache.shindig.expressions;
/**
* Context
Copied:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java
(from r734890,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/Expressions.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/Expressions.java&r1=734890&r2=734900&rev=734900&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/Expressions.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java
Thu Jan 15 19:06:12 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.gadgets.expressions;
+package org.apache.shindig.expressions;
import java.util.List;
import java.util.Map;
Copied:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/ExpressionsTest.java
(from r734890,
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/expressions/ExpressionsTest.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/ExpressionsTest.java?p2=incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/ExpressionsTest.java&p1=incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/expressions/ExpressionsTest.java&r1=734890&r2=734900&rev=734900&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/expressions/ExpressionsTest.java
(original)
+++
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/ExpressionsTest.java
Thu Jan 15 19:06:12 2009
@@ -16,13 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.gadgets.expressions;
+package org.apache.shindig.expressions;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import java.util.Map;
+import org.apache.shindig.expressions.ElException;
+import org.apache.shindig.expressions.Expression;
+import org.apache.shindig.expressions.ExpressionContext;
+import org.apache.shindig.expressions.Expressions;
import org.json.JSONObject;
import org.junit.Before;
import org.junit.Test;
Copied:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetExpressionContext.java
(from r734890,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/GadgetExpressionContext.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetExpressionContext.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetExpressionContext.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/GadgetExpressionContext.java&r1=734890&r2=734900&rev=734900&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/expressions/GadgetExpressionContext.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetExpressionContext.java
Thu Jan 15 19:06:12 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.gadgets.expressions;
+package org.apache.shindig.gadgets;
-import org.apache.shindig.gadgets.GadgetContext;
+import org.apache.shindig.expressions.ExpressionContext;
import java.util.logging.Logger;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/PipelinedData.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/PipelinedData.java?rev=734900&r1=734899&r2=734900&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/PipelinedData.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/PipelinedData.java
Thu Jan 15 19:06:12 2009
@@ -19,13 +19,13 @@
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.xml.XmlException;
+import org.apache.shindig.expressions.ElException;
+import org.apache.shindig.expressions.Expression;
+import org.apache.shindig.expressions.ExpressionContext;
+import org.apache.shindig.expressions.Expressions;
import org.apache.shindig.gadgets.AuthType;
import org.apache.shindig.gadgets.GadgetContext;
-import org.apache.shindig.gadgets.expressions.ElException;
-import org.apache.shindig.gadgets.expressions.Expression;
-import org.apache.shindig.gadgets.expressions.ExpressionContext;
-import org.apache.shindig.gadgets.expressions.Expressions;
-import org.apache.shindig.gadgets.expressions.GadgetExpressionContext;
+import org.apache.shindig.gadgets.GadgetExpressionContext;
import org.apache.shindig.gadgets.variables.Substitutions;
import java.util.Collections;
Copied:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetExpressionContextTest.java
(from r734890,
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/expressions/GadgetExpressionContextTest.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetExpressionContextTest.java?p2=incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetExpressionContextTest.java&p1=incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/expressions/GadgetExpressionContextTest.java&r1=734890&r2=734900&rev=734900&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/expressions/GadgetExpressionContextTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetExpressionContextTest.java
Thu Jan 15 19:06:12 2009
@@ -16,12 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.gadgets.expressions;
+package org.apache.shindig.gadgets;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
+import org.apache.shindig.expressions.ElException;
+import org.apache.shindig.expressions.Expression;
+import org.apache.shindig.expressions.Expressions;
import org.apache.shindig.gadgets.GadgetContext;
+import org.apache.shindig.gadgets.GadgetExpressionContext;
import org.apache.shindig.gadgets.UserPrefs;
import org.junit.Before;
