You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ra...@apache.org on 2016/02/02 04:20:57 UTC
[1/2] incubator-fineract git commit: License text spill overs
Repository: incubator-fineract
Updated Branches:
refs/heads/develop c9afea91f -> 5d7520d3e
License text spill overs
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/ee2819b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/ee2819b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/ee2819b7
Branch: refs/heads/develop
Commit: ee2819b793ca18044bf8c4e525fabea6ba387086
Parents: e409a4f
Author: Adi Narayana Raju <ad...@confluxtechnologies.com>
Authored: Mon Feb 1 16:48:06 2016 +0530
Committer: Adi Narayana Raju <ad...@confluxtechnologies.com>
Committed: Mon Feb 1 16:48:06 2016 +0530
----------------------------------------------------------------------
.../src/main/resources/META-INF/orm.xml | 24 ++++++++++++++-----
.../src/main/resources/META-INF/persistence.xml | 24 ++++++++++++++-----
.../main/resources/META-INF/spring/cache.xml | 24 ++++++++++++++-----
.../main/resources/META-INF/spring/ehcache.xml | 24 ++++++++++++++-----
.../META-INF/spring/infrastructure.xml | 24 ++++++++++++++-----
.../src/main/resources/META-INF/spring/jndi.xml | 21 +++++++++++++---
.../src/main/webapp/META-INF/context.xml | 25 +++++++++++++++++---
.../src/test/resources/META-INF/context.xml | 21 +++++++++++++---
8 files changed, 148 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/ee2819b7/fineract-provider/src/main/resources/META-INF/orm.xml
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/resources/META-INF/orm.xml b/fineract-provider/src/main/resources/META-INF/orm.xml
index b28a1bd..8ca9f61 100644
--- a/fineract-provider/src/main/resources/META-INF/orm.xml
+++ b/fineract-provider/src/main/resources/META-INF/orm.xml
@@ -1,14 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/.
+ 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.
-->
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/ee2819b7/fineract-provider/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/resources/META-INF/persistence.xml b/fineract-provider/src/main/resources/META-INF/persistence.xml
index 0b2352d..65230b7 100644
--- a/fineract-provider/src/main/resources/META-INF/persistence.xml
+++ b/fineract-provider/src/main/resources/META-INF/persistence.xml
@@ -1,14 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/.
+ 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.
-->
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+
<persistence version="2.0"
xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/ee2819b7/fineract-provider/src/main/resources/META-INF/spring/cache.xml
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/resources/META-INF/spring/cache.xml b/fineract-provider/src/main/resources/META-INF/spring/cache.xml
index 460f045..1526df7 100644
--- a/fineract-provider/src/main/resources/META-INF/spring/cache.xml
+++ b/fineract-provider/src/main/resources/META-INF/spring/cache.xml
@@ -1,14 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/.
+ 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.
-->
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p"
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/ee2819b7/fineract-provider/src/main/resources/META-INF/spring/ehcache.xml
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/resources/META-INF/spring/ehcache.xml b/fineract-provider/src/main/resources/META-INF/spring/ehcache.xml
index c4601f9..b991c69 100644
--- a/fineract-provider/src/main/resources/META-INF/spring/ehcache.xml
+++ b/fineract-provider/src/main/resources/META-INF/spring/ehcache.xml
@@ -1,14 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/.
+ 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.
-->
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+
<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ehcache.org/ehcache.xsd">
<defaultCache eternal="true" maxEntriesLocalHeap="100"
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/ee2819b7/fineract-provider/src/main/resources/META-INF/spring/infrastructure.xml
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/resources/META-INF/spring/infrastructure.xml b/fineract-provider/src/main/resources/META-INF/spring/infrastructure.xml
index 95f2831..ad8b418 100644
--- a/fineract-provider/src/main/resources/META-INF/spring/infrastructure.xml
+++ b/fineract-provider/src/main/resources/META-INF/spring/infrastructure.xml
@@ -1,14 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/.
+ 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.
-->
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
xmlns:jee="http://www.springframework.org/schema/jee"
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/ee2819b7/fineract-provider/src/main/resources/META-INF/spring/jndi.xml
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/resources/META-INF/spring/jndi.xml b/fineract-provider/src/main/resources/META-INF/spring/jndi.xml
index 595b28f..ee32ada 100644
--- a/fineract-provider/src/main/resources/META-INF/spring/jndi.xml
+++ b/fineract-provider/src/main/resources/META-INF/spring/jndi.xml
@@ -1,11 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/.
+ 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.
-->
+
+
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
xmlns:jee="http://www.springframework.org/schema/jee"
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/ee2819b7/fineract-provider/src/main/webapp/META-INF/context.xml
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/webapp/META-INF/context.xml b/fineract-provider/src/main/webapp/META-INF/context.xml
index ab9567a..598510a 100644
--- a/fineract-provider/src/main/webapp/META-INF/context.xml
+++ b/fineract-provider/src/main/webapp/META-INF/context.xml
@@ -1,7 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<!--
+
+ 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.
+
+-->
+
+
<Context>
<ResourceLink name="jdbc/mifosplatform-tenants" global="jdbc/mifosplatform-tenants"
type="javax.sql.DataSource" />
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/ee2819b7/fineract-provider/src/test/resources/META-INF/context.xml
----------------------------------------------------------------------
diff --git a/fineract-provider/src/test/resources/META-INF/context.xml b/fineract-provider/src/test/resources/META-INF/context.xml
index e418870..374c715 100644
--- a/fineract-provider/src/test/resources/META-INF/context.xml
+++ b/fineract-provider/src/test/resources/META-INF/context.xml
@@ -1,11 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/.
+ 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.
-->
+
+
<Context>
<Resource type="javax.sql.DataSource" name="jdbc/mifosplatform-tenants"
driverClassName="com.mysql.jdbc.Driver" url="jdbc:mysql://localhost:3306/mifosplatform-tenants"
[2/2] incubator-fineract git commit: Merge branch 'adiLicense' into
develop
Posted by ra...@apache.org.
Merge branch 'adiLicense' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/5d7520d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/5d7520d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/5d7520d3
Branch: refs/heads/develop
Commit: 5d7520d3e08eb3b78331703ba336343b556c2589
Parents: c9afea9 ee2819b
Author: Adi Narayana Raju <ad...@confluxtechnologies.com>
Authored: Tue Feb 2 08:48:33 2016 +0530
Committer: Adi Narayana Raju <ad...@confluxtechnologies.com>
Committed: Tue Feb 2 08:48:33 2016 +0530
----------------------------------------------------------------------
.../src/main/resources/META-INF/orm.xml | 24 ++++++++++++++-----
.../src/main/resources/META-INF/persistence.xml | 24 ++++++++++++++-----
.../main/resources/META-INF/spring/cache.xml | 24 ++++++++++++++-----
.../main/resources/META-INF/spring/ehcache.xml | 24 ++++++++++++++-----
.../META-INF/spring/infrastructure.xml | 24 ++++++++++++++-----
.../src/main/resources/META-INF/spring/jndi.xml | 21 +++++++++++++---
.../src/main/webapp/META-INF/context.xml | 25 +++++++++++++++++---
.../src/test/resources/META-INF/context.xml | 21 +++++++++++++---
8 files changed, 148 insertions(+), 39 deletions(-)
----------------------------------------------------------------------