Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dpdncs updt 2017 08 #31

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions openjpa-sample/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@

<groupId>org.wisdom-framework.jdbc</groupId>
<artifactId>openjpa-sample</artifactId>
<version>0.10.0-SNAPSHOT</version>

<packaging>wisdom</packaging>

Expand Down Expand Up @@ -94,7 +93,7 @@
<dependency>
<groupId>org.wisdom-framework</groupId>
<artifactId>h2</artifactId>
<version>1.4.191_1-SNAPSHOT</version>
<version>${wisdom.h2.version}</version>
</dependency>

<!-- Other applications -->
Expand Down
19 changes: 19 additions & 0 deletions openjpa-sample/src/main/java/todo/controllers/HomeController.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* #%L
* Wisdom-Framework
* %%
* Copyright (C) 2013 - 2016 Wisdom Framework
* %%
* Licensed 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.
* #L%
*/
package todo.controllers;

import org.wisdom.api.DefaultController;
Expand Down
19 changes: 19 additions & 0 deletions openjpa-sample/src/main/java/todo/controllers/TodoController.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* #%L
* Wisdom-Framework
* %%
* Copyright (C) 2013 - 2016 Wisdom Framework
* %%
* Licensed 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.
* #L%
*/
package todo.controllers;

import com.google.common.collect.Iterables;
Expand Down
19 changes: 19 additions & 0 deletions openjpa-sample/src/main/java/todo/models/Todo.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* #%L
* Wisdom-Framework
* %%
* Copyright (C) 2013 - 2016 Wisdom Framework
* %%
* Licensed 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.
* #L%
*/
package todo.models;

import javax.persistence.Entity;
Expand Down
19 changes: 19 additions & 0 deletions openjpa-sample/src/main/java/todo/models/TodoList.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* #%L
* Wisdom-Framework
* %%
* Copyright (C) 2013 - 2016 Wisdom Framework
* %%
* Licensed 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.
* #L%
*/
package todo.models;

import javax.persistence.*;
Expand Down
19 changes: 19 additions & 0 deletions openjpa-sample/src/main/resources/META-INF/persistence.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
<!--
#%L
Wisdom-Framework
%%
Copyright (C) 2013 - 2016 Wisdom Framework
%%
Licensed 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.
#L%
-->
<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"
Expand Down
19 changes: 19 additions & 0 deletions openjpa-sample/src/main/resources/assets/app/render/RactiveRenderService.js
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* #%L
* Wisdom-Framework
* %%
* Copyright (C) 2013 - 2016 Wisdom Framework
* %%
* Licensed 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.
* #L%
*/
/**
* The RactiveRenderService provides the two way binding capabilities of the [Ractive]{@link http://ractivejs.org} framework
* in addition to the @{link RenderService} functionalities.
Expand Down
19 changes: 19 additions & 0 deletions openjpa-sample/src/main/resources/assets/app/render/RenderService.js
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* #%L
* Wisdom-Framework
* %%
* Copyright (C) 2013 - 2016 Wisdom Framework
* %%
* Licensed 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.
* #L%
*/
/**
* Specification of the RenderService, which allows to render a view from a js template and an associated model.
* Futhermore this service allows for the synchronisation of the model with the view and two way bindings if
Expand Down
19 changes: 19 additions & 0 deletions openjpa-sample/src/main/resources/assets/app/render/comp/RactiveRender.js
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* #%L
* Wisdom-Framework
* %%
* Copyright (C) 2013 - 2016 Wisdom Framework
* %%
* Licensed 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.
* #L%
*/
/* global Ractive, HUBU */

//Initialize Ractive.templates
Expand Down
19 changes: 19 additions & 0 deletions openjpa-sample/src/main/resources/assets/libs/h-ubu-1.0.1-SNAPSHOT.js
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* #%L
* Wisdom-Framework
* %%
* Copyright (C) 2013 - 2016 Wisdom Framework
* %%
* Licensed 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.
* #L%
*/
// Generated by CoffeeScript 1.7.1

/*
Expand Down
19 changes: 19 additions & 0 deletions openjpa-sample/src/main/resources/assets/libs/ractive-events-keys.js
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* #%L
* Wisdom-Framework
* %%
* Copyright (C) 2013 - 2016 Wisdom Framework
* %%
* Licensed 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.
* #L%
*/
/*

ractive-events-keys
Expand Down
19 changes: 19 additions & 0 deletions openjpa-sample/src/test/java/todo/models/TodoListIT.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* #%L
* Wisdom-Framework
* %%
* Copyright (C) 2013 - 2016 Wisdom Framework
* %%
* Licensed 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.
* #L%
*/
package todo.models;

import org.apache.commons.io.FileUtils;
Expand Down
20 changes: 19 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,25 @@
<properties>
<!-- should match Wisdom parent -->
<wisdom.version>0.10.0-SNAPSHOT</wisdom.version>
<openjpa.version>2.4.1</openjpa.version>
<wisdom.abstractjdbcdriver.version>${wisdom.version}</wisdom.abstractjdbcdriver.version>
<!-- components -->
<openjpa.version>2.4.2</openjpa.version>
<hikaricp.version>2.6.3</hikaricp.version>
<!-- drivers -->
<derby.version>10.13.1.1</derby.version>
<h2.version>1.4.196</h2.version>
<hsql.version>2.4.0</hsql.version>
<mysql.version>5.1.43</mysql.version>
<postgresql.version>42.1.4</postgresql.version>
<sqlite.version>3.20.0</sqlite.version>
<!-- wisdom drivers modules -->
<wisdom.abstractjdbcdriver.version>0.10.0-SNAPSHOT</wisdom.abstractjdbcdriver.version>
<wisdom.derby.version>${derby.version}_1-SNAPSHOT</wisdom.derby.version>
<wisdom.h2.version>${h2.version}_1-SNAPSHOT</wisdom.h2.version>
<wisdom.hsql.version>${hsql.version}_1-SNAPSHOT</wisdom.hsql.version>
<wisdom.mysql.version>${mysql.version}_1-SNAPSHOT</wisdom.mysql.version>
<wisdom.postgresql.version>${postgresql.version}_1-SNAPSHOT</wisdom.postgresql.version>
<wisdom.sqlite.version>${sqlite.version}_1-SNAPSHOT</wisdom.sqlite.version>
</properties>

<packaging>pom</packaging>
Expand Down
14 changes: 7 additions & 7 deletions wisdom-jdbc-datasources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,48 +35,48 @@
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>2.4.4</version>
<version>${hikaricp.version}</version>
</dependency>

<!-- The JDBC drivers used for IT -->
<dependency>
<groupId>org.wisdom-framework</groupId>
<artifactId>h2</artifactId>
<version>1.4.191_1-SNAPSHOT</version>
<version>${wisdom.h2.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.wisdom-framework</groupId>
<artifactId>derby</artifactId>
<version>10.12.1.1_1-SNAPSHOT</version>
<version>${wisdom.derby.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.wisdom-framework</groupId>
<artifactId>hsqldb</artifactId>
<version>2.3.3_1-SNAPSHOT</version>
<version>${wisdom.hsql.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wisdom-framework</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.8.11.2_1-SNAPSHOT</version>
<version>${wisdom.sqlite.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.wisdom-framework</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.38_1-SNAPSHOT</version>
<version>${wisdom.mysql.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.wisdom-framework</groupId>
<artifactId>postgresql</artifactId>
<version>9.4.1208_1-SNAPSHOT</version>
<version>${wisdom.postgresql.version}</version>
<scope>test</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion wisdom-jdbc-drivers/abstract-jdbc-driver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.8.2.2</version>
<version>${derby.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions wisdom-jdbc-drivers/derby/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</parent>

<artifactId>derby</artifactId>
<version>10.12.1.1_1-SNAPSHOT</version>
<version>${wisdom.derby.version}</version>

<packaging>bundle</packaging>
<properties>
Expand All @@ -20,7 +20,7 @@
<dependency>
<groupId>org.wisdom-framework</groupId>
<artifactId>abstract-jdbc-driver</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>${wisdom.abstractjdbcdriver.version}</version>
</dependency>

<dependency>
Expand All @@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.12.1.1</version>
<version>${derby.version}</version>
<scope>provided</scope>
</dependency>

Expand Down
Loading