Merge c79ac99 into 6e8bcd4

lyncode · Nov 30, 2014 · a8f8a18 · a8f8a18
2 parents 6e8bcd4 + c79ac99
commit a8f8a18
Show file tree

Hide file tree

Showing 368 changed files with 1,732 additions and 1,763 deletions.
diff --git a/jtwig-core/pom.xml b/jtwig-core/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.lyncode</groupId>
-        <artifactId>jtwig</artifactId>
+        <groupId>org.jtwig</groupId>
+        <artifactId>jtwig-parent</artifactId>
         <version>4.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -13,17 +13,16 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.lyncode</groupId>
+            <groupId>org.jtwig</groupId>
             <artifactId>jtwig-functions</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>com.lyncode</groupId>
-            <artifactId>builder-commons</artifactId>
-            <version>${lyncode.builder.commons.version}</version>
+            <groupId>org.parboiled</groupId>
+            <artifactId>parboiled-core</artifactId>
+            <version>${parboiled.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.parboiled</groupId>
             <artifactId>parboiled-java</artifactId>
@@ -102,12 +101,12 @@
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <configuration>
                     <excludes>
-                        <exclude>com/lyncode/jtwig/parser/parboiled/**</exclude>
-                        <exclude>com/lyncode/jtwig/addons/AddonParser*</exclude>
-                        <exclude>com/lyncode/jtwig/addons/**/*Parser*</exclude>
+                        <exclude>org/jtwig/parser/parboiled/**</exclude>
+                        <exclude>org/jtwig/addons/AddonParser*</exclude>
+                        <exclude>org/jtwig/addons/**/*Parser*</exclude>
                     </excludes>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/...java/com/lyncode/jtwig/JtwigModelMap.java → ...rc/main/java/org/jtwig/JtwigModelMap.java b/...java/com/lyncode/jtwig/JtwigModelMap.java → ...rc/main/java/org/jtwig/JtwigModelMap.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.lyncode.jtwig;
+package org.jtwig;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...java/com/lyncode/jtwig/JtwigTemplate.java → ...rc/main/java/org/jtwig/JtwigTemplate.java b/...java/com/lyncode/jtwig/JtwigTemplate.java → ...rc/main/java/org/jtwig/JtwigTemplate.java
@@ -12,19 +12,19 @@
  * limitations under the License.
  */
 
-package com.lyncode.jtwig;
+package org.jtwig;
 
-import com.lyncode.jtwig.compile.CompileContext;
-import com.lyncode.jtwig.configuration.JtwigConfiguration;
-import com.lyncode.jtwig.content.api.Renderable;
-import com.lyncode.jtwig.exception.CompileException;
-import com.lyncode.jtwig.exception.ParseException;
-import com.lyncode.jtwig.exception.RenderException;
-import com.lyncode.jtwig.parser.JtwigParser;
-import com.lyncode.jtwig.render.RenderContext;
-import com.lyncode.jtwig.resource.FileJtwigResource;
-import com.lyncode.jtwig.resource.JtwigResource;
-import com.lyncode.jtwig.resource.StringJtwigResource;
+import org.jtwig.compile.CompileContext;
+import org.jtwig.configuration.JtwigConfiguration;
+import org.jtwig.content.api.Renderable;
+import org.jtwig.exception.CompileException;
+import org.jtwig.exception.ParseException;
+import org.jtwig.exception.RenderException;
+import org.jtwig.parser.JtwigParser;
+import org.jtwig.render.RenderContext;
+import org.jtwig.resource.FileJtwigResource;
+import org.jtwig.resource.JtwigResource;
+import org.jtwig.resource.StringJtwigResource;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;

diff --git a/.../java/com/lyncode/jtwig/addons/Addon.java → ...src/main/java/org/jtwig/addons/Addon.java b/.../java/com/lyncode/jtwig/addons/Addon.java → ...src/main/java/org/jtwig/addons/Addon.java
@@ -12,14 +12,14 @@
  * limitations under the License.
  */
 
-package com.lyncode.jtwig.addons;
-
-import com.lyncode.jtwig.parser.config.ParserConfiguration;
-import com.lyncode.jtwig.parser.parboiled.JtwigBaseParser;
-import com.lyncode.jtwig.parser.parboiled.JtwigBasicParser;
-import com.lyncode.jtwig.parser.parboiled.JtwigExpressionParser;
-import com.lyncode.jtwig.parser.parboiled.JtwigTagPropertyParser;
-import com.lyncode.jtwig.resource.JtwigResource;
+package org.jtwig.addons;
+
+import org.jtwig.parser.config.ParserConfiguration;
+import org.jtwig.parser.parboiled.JtwigBaseParser;
+import org.jtwig.parser.parboiled.JtwigBasicParser;
+import org.jtwig.parser.parboiled.JtwigExpressionParser;
+import org.jtwig.parser.parboiled.JtwigTagPropertyParser;
+import org.jtwig.resource.JtwigResource;
 import org.parboiled.Parboiled;
 import org.parboiled.Rule;
 

diff --git a/.../com/lyncode/jtwig/addons/AddonModel.java → ...ain/java/org/jtwig/addons/AddonModel.java b/.../com/lyncode/jtwig/addons/AddonModel.java → ...ain/java/org/jtwig/addons/AddonModel.java
@@ -12,9 +12,9 @@
  * limitations under the License.
  */
 
-package com.lyncode.jtwig.addons;
+package org.jtwig.addons;
 
-import com.lyncode.jtwig.content.model.compilable.Content;
+import org.jtwig.content.model.compilable.Content;
 
 public abstract class AddonModel<T extends AddonModel> extends Content<T> {
 }
diff --git a/...e/jtwig/addons/concurrent/Concurrent.java → ...g/jtwig/addons/concurrent/Concurrent.java b/...e/jtwig/addons/concurrent/Concurrent.java → ...g/jtwig/addons/concurrent/Concurrent.java
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package com.lyncode.jtwig.addons.concurrent;
-
-import com.lyncode.jtwig.addons.AddonModel;
-import com.lyncode.jtwig.compile.CompileContext;
-import com.lyncode.jtwig.content.api.Renderable;
-import com.lyncode.jtwig.exception.CompileException;
-import com.lyncode.jtwig.exception.RenderException;
-import com.lyncode.jtwig.render.RenderContext;
+package org.jtwig.addons.concurrent;
+
+import org.jtwig.addons.AddonModel;
+import org.jtwig.compile.CompileContext;
+import org.jtwig.content.api.Renderable;
+import org.jtwig.exception.CompileException;
+import org.jtwig.exception.RenderException;
+import org.jtwig.render.RenderContext;
 
 import java.io.IOException;
 

diff --git a/...ig/addons/concurrent/ConcurrentAddon.java → ...ig/addons/concurrent/ConcurrentAddon.java b/...ig/addons/concurrent/ConcurrentAddon.java → ...ig/addons/concurrent/ConcurrentAddon.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package com.lyncode.jtwig.addons.concurrent;
+package org.jtwig.addons.concurrent;
 
-import com.lyncode.jtwig.addons.Addon;
-import com.lyncode.jtwig.addons.AddonModel;
-import com.lyncode.jtwig.parser.config.ParserConfiguration;
-import com.lyncode.jtwig.resource.JtwigResource;
+import org.jtwig.addons.Addon;
+import org.jtwig.addons.AddonModel;
+import org.jtwig.parser.config.ParserConfiguration;
+import org.jtwig.resource.JtwigResource;
 
 public class ConcurrentAddon extends Addon {
 

diff --git a/...m/lyncode/jtwig/addons/filter/Filter.java → .../java/org/jtwig/addons/filter/Filter.java b/...m/lyncode/jtwig/addons/filter/Filter.java → .../java/org/jtwig/addons/filter/Filter.java
@@ -12,21 +12,21 @@
  * limitations under the License.
  */
 
-package com.lyncode.jtwig.addons.filter;
+package org.jtwig.addons.filter;
 
 import com.google.common.base.Function;
-import com.lyncode.jtwig.addons.AddonModel;
-import com.lyncode.jtwig.compile.CompileContext;
-import com.lyncode.jtwig.content.api.Renderable;
-import com.lyncode.jtwig.exception.CalculateException;
-import com.lyncode.jtwig.exception.CompileException;
-import com.lyncode.jtwig.exception.RenderException;
-import com.lyncode.jtwig.expressions.api.CompilableExpression;
-import com.lyncode.jtwig.expressions.api.Expression;
-import com.lyncode.jtwig.expressions.model.FunctionElement;
-import com.lyncode.jtwig.expressions.model.OperationBinary;
-import com.lyncode.jtwig.parser.model.JtwigPosition;
-import com.lyncode.jtwig.render.RenderContext;
+import org.jtwig.addons.AddonModel;
+import org.jtwig.compile.CompileContext;
+import org.jtwig.content.api.Renderable;
+import org.jtwig.exception.CalculateException;
+import org.jtwig.exception.CompileException;
+import org.jtwig.exception.RenderException;
+import org.jtwig.expressions.api.CompilableExpression;
+import org.jtwig.expressions.api.Expression;
+import org.jtwig.expressions.model.FunctionElement;
+import org.jtwig.expressions.model.OperationBinary;
+import org.jtwig.parser.model.JtwigPosition;
+import org.jtwig.render.RenderContext;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/...code/jtwig/addons/filter/FilterAddon.java → .../org/jtwig/addons/filter/FilterAddon.java b/...code/jtwig/addons/filter/FilterAddon.java → .../org/jtwig/addons/filter/FilterAddon.java
@@ -12,14 +12,14 @@
  * limitations under the License.
  */
 
-package com.lyncode.jtwig.addons.filter;
+package org.jtwig.addons.filter;
 
-import com.lyncode.jtwig.addons.Addon;
-import com.lyncode.jtwig.addons.AddonModel;
-import com.lyncode.jtwig.exception.ParseException;
-import com.lyncode.jtwig.expressions.model.Operator;
-import com.lyncode.jtwig.parser.config.ParserConfiguration;
-import com.lyncode.jtwig.resource.JtwigResource;
+import org.jtwig.addons.Addon;
+import org.jtwig.addons.AddonModel;
+import org.jtwig.exception.ParseException;
+import org.jtwig.expressions.model.Operator;
+import org.jtwig.parser.config.ParserConfiguration;
+import org.jtwig.resource.JtwigResource;
 import org.parboiled.Rule;
 
 public class FilterAddon extends Addon {

diff --git a/...twig/addons/spaceless/SpacelessAddon.java → ...twig/addons/spaceless/SpacelessAddon.java b/...twig/addons/spaceless/SpacelessAddon.java → ...twig/addons/spaceless/SpacelessAddon.java
@@ -12,12 +12,12 @@
  * limitations under the License.
  */
 
-package com.lyncode.jtwig.addons.spaceless;
+package org.jtwig.addons.spaceless;
 
 import com.google.common.base.Function;
-import com.lyncode.jtwig.addons.tag.TagAddon;
-import com.lyncode.jtwig.parser.config.ParserConfiguration;
-import com.lyncode.jtwig.resource.JtwigResource;
+import org.jtwig.addons.tag.TagAddon;
+import org.jtwig.parser.config.ParserConfiguration;
+import org.jtwig.resource.JtwigResource;
 
 public class SpacelessAddon extends TagAddon {
     public SpacelessAddon(JtwigResource resource, ParserConfiguration configuration) {

diff --git a/...ava/com/lyncode/jtwig/addons/tag/Tag.java → ...c/main/java/org/jtwig/addons/tag/Tag.java b/...ava/com/lyncode/jtwig/addons/tag/Tag.java → ...c/main/java/org/jtwig/addons/tag/Tag.java
@@ -1,12 +1,12 @@
-package com.lyncode.jtwig.addons.tag;
+package org.jtwig.addons.tag;
 
 import com.google.common.base.Function;
-import com.lyncode.jtwig.addons.AddonModel;
-import com.lyncode.jtwig.compile.CompileContext;
-import com.lyncode.jtwig.content.api.Renderable;
-import com.lyncode.jtwig.exception.CompileException;
-import com.lyncode.jtwig.exception.RenderException;
-import com.lyncode.jtwig.render.RenderContext;
+import org.jtwig.addons.AddonModel;
+import org.jtwig.compile.CompileContext;
+import org.jtwig.content.api.Renderable;
+import org.jtwig.exception.CompileException;
+import org.jtwig.exception.RenderException;
+import org.jtwig.render.RenderContext;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/...om/lyncode/jtwig/addons/tag/TagAddon.java → ...n/java/org/jtwig/addons/tag/TagAddon.java b/...om/lyncode/jtwig/addons/tag/TagAddon.java → ...n/java/org/jtwig/addons/tag/TagAddon.java
@@ -1,10 +1,10 @@
-package com.lyncode.jtwig.addons.tag;
+package org.jtwig.addons.tag;
 
 import com.google.common.base.Function;
-import com.lyncode.jtwig.addons.Addon;
-import com.lyncode.jtwig.addons.AddonModel;
-import com.lyncode.jtwig.parser.config.ParserConfiguration;
-import com.lyncode.jtwig.resource.JtwigResource;
+import org.jtwig.addons.Addon;
+import org.jtwig.addons.AddonModel;
+import org.jtwig.parser.config.ParserConfiguration;
+import org.jtwig.resource.JtwigResource;
 
 public abstract class TagAddon extends Addon {
     public TagAddon(JtwigResource resource, ParserConfiguration configuration) {

diff --git a/...lyncode/jtwig/compile/CompileContext.java → ...ava/org/jtwig/compile/CompileContext.java b/...lyncode/jtwig/compile/CompileContext.java → ...ava/org/jtwig/compile/CompileContext.java
@@ -12,18 +12,18 @@
  * limitations under the License.
  */
 
-package com.lyncode.jtwig.compile;
-
-import com.lyncode.jtwig.compile.config.CompileConfiguration;
-import com.lyncode.jtwig.content.api.Compilable;
-import com.lyncode.jtwig.content.api.Renderable;
-import com.lyncode.jtwig.content.model.compilable.Macro;
-import com.lyncode.jtwig.content.model.compilable.Sequence;
-import com.lyncode.jtwig.content.model.renderable.Replacement;
-import com.lyncode.jtwig.exception.ParseException;
-import com.lyncode.jtwig.exception.ResourceException;
-import com.lyncode.jtwig.parser.JtwigParser;
-import com.lyncode.jtwig.resource.JtwigResource;
+package org.jtwig.compile;
+
+import org.jtwig.compile.config.CompileConfiguration;
+import org.jtwig.content.api.Compilable;
+import org.jtwig.content.api.Renderable;
+import org.jtwig.content.model.compilable.Macro;
+import org.jtwig.content.model.compilable.Sequence;
+import org.jtwig.content.model.renderable.Replacement;
+import org.jtwig.exception.ParseException;
+import org.jtwig.exception.ResourceException;
+import org.jtwig.parser.JtwigParser;
+import org.jtwig.resource.JtwigResource;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/.../compile/config/CompileConfiguration.java → .../compile/config/CompileConfiguration.java b/.../compile/config/CompileConfiguration.java → .../compile/config/CompileConfiguration.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.lyncode.jtwig.compile.config;
+package org.jtwig.compile.config;
 
 public class CompileConfiguration {
 }
diff --git a/...wig/configuration/JtwigConfiguration.java → ...wig/configuration/JtwigConfiguration.java b/...wig/configuration/JtwigConfiguration.java → ...wig/configuration/JtwigConfiguration.java
@@ -12,11 +12,11 @@
  * limitations under the License.
  */
 
-package com.lyncode.jtwig.configuration;
+package org.jtwig.configuration;
 
-import com.lyncode.jtwig.compile.config.CompileConfiguration;
-import com.lyncode.jtwig.parser.config.ParserConfiguration;
-import com.lyncode.jtwig.render.config.RenderConfiguration;
+import org.jtwig.compile.config.CompileConfiguration;
+import org.jtwig.parser.config.ParserConfiguration;
+import org.jtwig.render.config.RenderConfiguration;
 
 public class JtwigConfiguration {
     private ParserConfiguration parserConfiguration = new ParserConfiguration();

diff --git a/...lyncode/jtwig/content/api/Compilable.java → ...ava/org/jtwig/content/api/Compilable.java b/...lyncode/jtwig/content/api/Compilable.java → ...ava/org/jtwig/content/api/Compilable.java
@@ -12,10 +12,10 @@
  * limitations under the License.
  */
 
-package com.lyncode.jtwig.content.api;
+package org.jtwig.content.api;
 
-import com.lyncode.jtwig.compile.CompileContext;
-import com.lyncode.jtwig.exception.CompileException;
+import org.jtwig.compile.CompileContext;
+import org.jtwig.exception.CompileException;
 
 public interface Compilable {
     Renderable compile(CompileContext context) throws CompileException;

diff --git a/...lyncode/jtwig/content/api/Renderable.java → ...ava/org/jtwig/content/api/Renderable.java b/...lyncode/jtwig/content/api/Renderable.java → ...ava/org/jtwig/content/api/Renderable.java
@@ -12,10 +12,10 @@
  * limitations under the License.
  */
 
-package com.lyncode.jtwig.content.api;
+package org.jtwig.content.api;
 
-import com.lyncode.jtwig.exception.RenderException;
-import com.lyncode.jtwig.render.RenderContext;
+import org.jtwig.exception.RenderException;
+import org.jtwig.render.RenderContext;
 
 public interface Renderable {
     public static final Renderable NOOP = new Renderable() {

diff --git a/...va/com/lyncode/jtwig/content/api/Tag.java → .../main/java/org/jtwig/content/api/Tag.java b/...va/com/lyncode/jtwig/content/api/Tag.java → .../main/java/org/jtwig/content/api/Tag.java
@@ -12,9 +12,9 @@
  * limitations under the License.
  */
 
-package com.lyncode.jtwig.content.api;
+package org.jtwig.content.api;
 
-import com.lyncode.jtwig.content.model.tag.TagInformation;
+import org.jtwig.content.model.tag.TagInformation;
 
 public interface Tag {
     TagInformation tag();

diff --git a/...ent/model/compilable/AbstractElement.java → ...ent/model/compilable/AbstractElement.java b/...ent/model/compilable/AbstractElement.java → ...ent/model/compilable/AbstractElement.java
@@ -12,11 +12,11 @@
  * limitations under the License.
  */
 
-package com.lyncode.jtwig.content.model.compilable;
+package org.jtwig.content.model.compilable;
 
-import com.lyncode.jtwig.content.api.Compilable;
-import com.lyncode.jtwig.content.api.Tag;
-import com.lyncode.jtwig.content.model.tag.TagInformation;
+import org.jtwig.content.api.Compilable;
+import org.jtwig.content.api.Tag;
+import org.jtwig.content.model.tag.TagInformation;
 
 public abstract class AbstractElement implements Compilable, Tag {
     private TagInformation tagInformation = new TagInformation();