killbill-memoizeit
Changes
pom.xml 29(+27 -2)
server/src/main/resources/logback.xml 16(+16 -0)
server/src/main/webapp/WEB-INF/web.xml 16(+16 -0)
server/src/test/resources/overdue.xml 16(+16 -0)
Details
pom.xml 29(+27 -2)
diff --git a/pom.xml b/pom.xml
index c9d75f8..4390161 100644
--- a/pom.xml
+++ b/pom.xml
@@ -618,7 +618,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.7</version>
+ <version>0.8</version>
<executions>
<execution>
<phase>verify</phase>
@@ -626,9 +626,34 @@
<goal>check</goal>
</goals>
<configuration>
+ <licenseFamilies>
+ <licenseFamily implementation="org.apache.rat.license.Apache20LicenseFamily"></licenseFamily>
+ <!-- Hack, rat 0.9 will have org.apache.rat.analysis.license.MITLicense -->
+ <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+ <familyName>The MIT License</familyName>
+ </licenseFamily>
+ </licenseFamilies>
<useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
<useIdeaDefaultExcludes>true</useIdeaDefaultExcludes>
<useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <licenses>
+ <!-- For server/src/main/webapp/javascripts/html5.js -->
+ <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>MIT</licenseFamilyCategory>
+ <licenseFamilyName>The MIT License</licenseFamilyName>
+ <patterns>
+ <pattern>MIT/GPL2 Licensed</pattern>
+ </patterns>
+ </license>
+ <!-- For server/src/main/webapp/javascripts/jquery.min.js -->
+ <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>MIT</licenseFamilyCategory>
+ <licenseFamilyName>The MIT License</licenseFamilyName>
+ <patterns>
+ <pattern>jquery.org/license</pattern>
+ </patterns>
+ </license>
+ </licenses>
<excludes>
<!-- For some reason, useIdeaDefaultExcludes
doesn't pick up .idea directory -->
@@ -647,7 +672,7 @@
<exclude>release-script</exclude>
<exclude>doc/**</exclude>
<exclude>src/site/**</exclude>
- <exclude>*.log</exclude>
+ <exclude>**/*.log</exclude>
<exclude>README.*</exclude>
<exclude>TODO</exclude>
<exclude>logs/**</exclude>
diff --git a/server/src/main/jetty-config/contexts/root.xml b/server/src/main/jetty-config/contexts/root.xml
index cdf71e1..52c9c0f 100755
--- a/server/src/main/jetty-config/contexts/root.xml
+++ b/server/src/main/jetty-config/contexts/root.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2010-2013 Ning, Inc.
+ ~
+ ~ Ning 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.
+ -->
+
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/</Set>
diff --git a/server/src/main/jetty-config/etc/webdefault.xml b/server/src/main/jetty-config/etc/webdefault.xml
index 3c677f3..1eebc9b 100755
--- a/server/src/main/jetty-config/etc/webdefault.xml
+++ b/server/src/main/jetty-config/etc/webdefault.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ Copyright 2010-2013 Ning, Inc.
+ ~
+ ~ Ning 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.
+ -->
+
<web-app
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/server/src/main/jetty-config/ning-jetty-conf.xml b/server/src/main/jetty-config/ning-jetty-conf.xml
index 60764c5..3423b27 100644
--- a/server/src/main/jetty-config/ning-jetty-conf.xml
+++ b/server/src/main/jetty-config/ning-jetty-conf.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2010-2013 Ning, Inc.
+ ~
+ ~ Ning 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.
+ -->
+
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
diff --git a/server/src/main/resources/killbill-server.properties b/server/src/main/resources/killbill-server.properties
index 0e388af..b157c51 100644
--- a/server/src/main/resources/killbill-server.properties
+++ b/server/src/main/resources/killbill-server.properties
@@ -1,3 +1,19 @@
+#
+# Copyright 2010-2013 Ning, Inc.
+#
+# Ning 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.
+#
+
# Use skeleton properties for server and configure killbill database
com.ning.jetty.jdbi.url=jdbc:mysql://127.0.0.1:3306/killbill
com.ning.jetty.jdbi.user=root
server/src/main/resources/logback.xml 16(+16 -0)
diff --git a/server/src/main/resources/logback.xml b/server/src/main/resources/logback.xml
index 3087885..0cb11ef 100644
--- a/server/src/main/resources/logback.xml
+++ b/server/src/main/resources/logback.xml
@@ -1,3 +1,19 @@
+<!--
+ ~ Copyright 2010-2013 Ning, Inc.
+ ~
+ ~ Ning 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.
+ -->
+
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<!-- encoders are assigned the type
diff --git a/server/src/main/webapp/stylesheets/killbill.css b/server/src/main/webapp/stylesheets/killbill.css
index b1b9ffc..a5f7cca 100644
--- a/server/src/main/webapp/stylesheets/killbill.css
+++ b/server/src/main/webapp/stylesheets/killbill.css
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2010-2013 Ning, Inc.
+ *
+ * Ning 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.
+ */
+
body {
padding-top: 60px;
}
server/src/main/webapp/WEB-INF/web.xml 16(+16 -0)
diff --git a/server/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml
index dfe356d..13d7694 100644
--- a/server/src/main/webapp/WEB-INF/web.xml
+++ b/server/src/main/webapp/WEB-INF/web.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2010-2013 Ning, Inc.
+ ~
+ ~ Ning 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.
+ -->
+
<web-app
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://java.sun.com/xml/ns/javaee"
diff --git a/server/src/test/resources/killbill.properties b/server/src/test/resources/killbill.properties
index 1148c07..bbbb8c1 100644
--- a/server/src/test/resources/killbill.properties
+++ b/server/src/test/resources/killbill.properties
@@ -1,3 +1,19 @@
+#
+# Copyright 2010-2013 Ning, Inc.
+#
+# Ning 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.
+#
+
# Use killbill util test properties (DbiProvider/MysqltestingHelper) on the test side configured with killbill
com.ning.billing.dbi.jdbc.url=jdbc:mysql://127.0.0.1:3306/killbill
server/src/test/resources/overdue.xml 16(+16 -0)
diff --git a/server/src/test/resources/overdue.xml b/server/src/test/resources/overdue.xml
index bd13ebe..3e24e14 100644
--- a/server/src/test/resources/overdue.xml
+++ b/server/src/test/resources/overdue.xml
@@ -1,3 +1,19 @@
+<!--
+ ~ Copyright 2010-2013 Ning, Inc.
+ ~
+ ~ Ning 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.
+ -->
+
<overdueConfig>
<bundleOverdueStates>
<state name="OD3">