Repository: incubator-freemarker-online-tester Updated Branches: refs/heads/master 9e169f478 -> 5dab33069
added the license references in the LICENSE file and removed the created by signature in the code Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/commit/2cfbd7dc Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/tree/2cfbd7dc Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/diff/2cfbd7dc Branch: refs/heads/master Commit: 2cfbd7dc8c4c1254f17dbb60b9d9bd2dc75527c4 Parents: 9e169f4 Author: Pradeep Murugesan <[email protected]> Authored: Thu Apr 6 10:20:54 2017 +0200 Committer: Pradeep Murugesan <[email protected]> Committed: Thu Apr 6 10:24:47 2017 +0200 ---------------------------------------------------------------------- .gitignore | 1 + LICENSE | 46 +++++++++++++++++++- gradle/wrapper/gradle-wrapper.properties | 18 +++++++- gradlew | 17 ++++++++ gradlew.bat | 17 ++++++++ .../dropwizard/ApplicationStartup.java | 5 --- .../resources/FreeMarkerOnlineResource.java | 6 --- .../freemarker/view/FreeMarkerOnlineView.java | 3 -- .../platform/DropWizardServiceTest.java | 6 --- .../platform/YamlPropertiesPersister.java | 6 --- .../resources/FreeMarkerOnlineResourceTest.java | 6 --- .../FreeMarkerServiceResponseBuilderTest.java | 6 --- .../services/FreeMarkerServiceTest.java | 6 --- .../view/FreeMarkerOnlineViewTest.java | 7 +-- 14 files changed, 98 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/2cfbd7dc/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 01bde3f..3d6b9a5 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,5 @@ build/ freemarker-online.iml freemarker-online.ipr freemarker-online.iws +**/.DS_Store http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/2cfbd7dc/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index f7089da..c763eaa 100644 --- a/LICENSE +++ b/LICENSE @@ -210,4 +210,48 @@ src/main/resources/banner.txt - ========================================================================= \ No newline at end of file + ========================================================================= + + src/main/resources/assets/js/autosize.min.js + src/main/resources/assets/js/jquery.autosize.min.js + + The MIT License (MIT) + + Copyright (c) 2015 Jack Moore + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice + shall be included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + ========================================================================= + + src/main/resources/assets/js/jquery.blockUI.js + Copyright © 2007-2013 M. Alsup. + + The BlockUI plugin is dual licensed under the MIT and GPL licenses. + + You may use either license. The MIT license is recommended for most + projects because it is simple and easy to understand and it places almost + no restrictions on what you can do with the plugin. + + If the GPL suits your project better you are also free to use the plugin + under that license. + + You do not have to do anything special to choose one license or the other + and you don't have to notify anyone which license you are using. You are + free to use the BlockUI plugin in commercial projects as long as the + copyright header is left intact. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/2cfbd7dc/gradle/wrapper/gradle-wrapper.properties ---------------------------------------------------------------------- diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 72f43b6..9e12388 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,20 @@ -#Tue Sep 10 11:20:58 IST 2013 +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/2cfbd7dc/gradlew ---------------------------------------------------------------------- diff --git a/gradlew b/gradlew index 91a7e26..5e6eedf 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,22 @@ #!/usr/bin/env bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + ############################################################################## ## ## Gradle start up script for UN*X http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/2cfbd7dc/gradlew.bat ---------------------------------------------------------------------- diff --git a/gradlew.bat b/gradlew.bat index 8a0b282..a88b52d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/2cfbd7dc/src/main/java/com/kenshoo/freemarker/dropwizard/ApplicationStartup.java ---------------------------------------------------------------------- diff --git a/src/main/java/com/kenshoo/freemarker/dropwizard/ApplicationStartup.java b/src/main/java/com/kenshoo/freemarker/dropwizard/ApplicationStartup.java index 39c0d47..9378e33 100644 --- a/src/main/java/com/kenshoo/freemarker/dropwizard/ApplicationStartup.java +++ b/src/main/java/com/kenshoo/freemarker/dropwizard/ApplicationStartup.java @@ -25,11 +25,6 @@ import com.yammer.dropwizard.assets.AssetsBundle; import com.yammer.dropwizard.config.Bootstrap; import com.yammer.dropwizard.views.ViewBundle; -/** - * User: dekely - * Date: 3/17/13 - * Time: 10:39 AM - */ public class ApplicationStartup extends SpringService<SpringConfiguration> { public static void main(String[] args) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/2cfbd7dc/src/main/java/com/kenshoo/freemarker/resources/FreeMarkerOnlineResource.java ---------------------------------------------------------------------- diff --git a/src/main/java/com/kenshoo/freemarker/resources/FreeMarkerOnlineResource.java b/src/main/java/com/kenshoo/freemarker/resources/FreeMarkerOnlineResource.java index 45e850d..e612c8c 100644 --- a/src/main/java/com/kenshoo/freemarker/resources/FreeMarkerOnlineResource.java +++ b/src/main/java/com/kenshoo/freemarker/resources/FreeMarkerOnlineResource.java @@ -31,12 +31,6 @@ import org.springframework.stereotype.Component; import com.kenshoo.freemarker.view.FreeMarkerOnlineView; -/** - * Created with IntelliJ IDEA. - * User: shlomis - * Date: 9/1/13 - * Time: 4:35 PM - */ @Path("/") @Component public class FreeMarkerOnlineResource { http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/2cfbd7dc/src/main/java/com/kenshoo/freemarker/view/FreeMarkerOnlineView.java ---------------------------------------------------------------------- diff --git a/src/main/java/com/kenshoo/freemarker/view/FreeMarkerOnlineView.java b/src/main/java/com/kenshoo/freemarker/view/FreeMarkerOnlineView.java index 53d771b..fb256f1 100644 --- a/src/main/java/com/kenshoo/freemarker/view/FreeMarkerOnlineView.java +++ b/src/main/java/com/kenshoo/freemarker/view/FreeMarkerOnlineView.java @@ -34,9 +34,6 @@ import com.yammer.dropwizard.views.View; import freemarker.template.Configuration; -/** - * Created with IntelliJ IDEA. User: nir Date: 4/11/14 Time: 12:23 PM - */ public class FreeMarkerOnlineView extends View { private static final List<SelectionOption> LOCALE_SELECTION_OPTIONS = toLocaleSelectionOptions(AllowedSettingValuesMaps.LOCALE_MAP); http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/2cfbd7dc/src/test/java/com/kenshoo/freemarker/platform/DropWizardServiceTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/com/kenshoo/freemarker/platform/DropWizardServiceTest.java b/src/test/java/com/kenshoo/freemarker/platform/DropWizardServiceTest.java index 62dd648..312ed0b 100644 --- a/src/test/java/com/kenshoo/freemarker/platform/DropWizardServiceTest.java +++ b/src/test/java/com/kenshoo/freemarker/platform/DropWizardServiceTest.java @@ -23,12 +23,6 @@ import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TestRule; -/** - * Created with IntelliJ IDEA. - * User: shlomis - * Date: 9/9/13 - * Time: 10:43 AM - */ public class DropWizardServiceTest { @ClassRule public static TestRule testRule = new DropwizardServiceRule<>(ApplicationStartup.class, http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/2cfbd7dc/src/test/java/com/kenshoo/freemarker/platform/YamlPropertiesPersister.java ---------------------------------------------------------------------- diff --git a/src/test/java/com/kenshoo/freemarker/platform/YamlPropertiesPersister.java b/src/test/java/com/kenshoo/freemarker/platform/YamlPropertiesPersister.java index 390136d..1299581 100644 --- a/src/test/java/com/kenshoo/freemarker/platform/YamlPropertiesPersister.java +++ b/src/test/java/com/kenshoo/freemarker/platform/YamlPropertiesPersister.java @@ -27,12 +27,6 @@ import java.io.*; import java.util.Map; import java.util.Properties; -/** - * Created with IntelliJ IDEA. - * User: shlomis - * Date: 9/8/13 - * Time: 10:50 PM - */ public class YamlPropertiesPersister implements PropertiesPersister { @Override public void load(Properties props, InputStream is) throws IOException { http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/2cfbd7dc/src/test/java/com/kenshoo/freemarker/resources/FreeMarkerOnlineResourceTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/com/kenshoo/freemarker/resources/FreeMarkerOnlineResourceTest.java b/src/test/java/com/kenshoo/freemarker/resources/FreeMarkerOnlineResourceTest.java index f7225c1..6b3df76 100644 --- a/src/test/java/com/kenshoo/freemarker/resources/FreeMarkerOnlineResourceTest.java +++ b/src/test/java/com/kenshoo/freemarker/resources/FreeMarkerOnlineResourceTest.java @@ -39,12 +39,6 @@ import com.kenshoo.freemarker.view.FreeMarkerOnlineView; import freemarker.core.OutputFormat; -/** - * Created with IntelliJ IDEA. - * User: nir - * Date: 4/12/14 - * Time: 11:23 PM - */ @RunWith(MockitoJUnitRunner.class) public class FreeMarkerOnlineResourceTest { http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/2cfbd7dc/src/test/java/com/kenshoo/freemarker/services/FreeMarkerServiceResponseBuilderTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/com/kenshoo/freemarker/services/FreeMarkerServiceResponseBuilderTest.java b/src/test/java/com/kenshoo/freemarker/services/FreeMarkerServiceResponseBuilderTest.java index f970c91..caf5ca4 100644 --- a/src/test/java/com/kenshoo/freemarker/services/FreeMarkerServiceResponseBuilderTest.java +++ b/src/test/java/com/kenshoo/freemarker/services/FreeMarkerServiceResponseBuilderTest.java @@ -24,12 +24,6 @@ import static org.junit.Assert.*; import org.junit.Test; -/** - * Created with IntelliJ IDEA. - * User: nir - * Date: 4/13/14 - * Time: 7:30 AM - */ public class FreeMarkerServiceResponseBuilderTest { private static final String RESULT = "Result"; http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/2cfbd7dc/src/test/java/com/kenshoo/freemarker/services/FreeMarkerServiceTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/com/kenshoo/freemarker/services/FreeMarkerServiceTest.java b/src/test/java/com/kenshoo/freemarker/services/FreeMarkerServiceTest.java index c7147f4..6608d52 100644 --- a/src/test/java/com/kenshoo/freemarker/services/FreeMarkerServiceTest.java +++ b/src/test/java/com/kenshoo/freemarker/services/FreeMarkerServiceTest.java @@ -58,12 +58,6 @@ import freemarker.template.TemplateDirectiveModel; import freemarker.template.TemplateException; import freemarker.template.TemplateModel; -/** - * Created with IntelliJ IDEA. - * User: nir - * Date: 4/12/14 - * Time: 11:15 AM - */ @RunWith(MockitoJUnitRunner.class) public class FreeMarkerServiceTest { http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/2cfbd7dc/src/test/java/com/kenshoo/freemarker/view/FreeMarkerOnlineViewTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/com/kenshoo/freemarker/view/FreeMarkerOnlineViewTest.java b/src/test/java/com/kenshoo/freemarker/view/FreeMarkerOnlineViewTest.java index 2aa5ea8..c67b44c 100644 --- a/src/test/java/com/kenshoo/freemarker/view/FreeMarkerOnlineViewTest.java +++ b/src/test/java/com/kenshoo/freemarker/view/FreeMarkerOnlineViewTest.java @@ -30,12 +30,7 @@ import com.kenshoo.freemarker.services.AllowedSettingValuesMaps; import freemarker.core.HTMLOutputFormat; -/** - * Created with IntelliJ IDEA. - * User: nir - * Date: 4/12/14 - * Time: 11:13 PM - */ + public class FreeMarkerOnlineViewTest { private static final String TEMPLATE = "Template";
