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.

Sign up for GitHub

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

Jump to bottom

Apiman 182 #46

Merged
merged 3 commits into from
Dec 29, 2014
Merged

Apiman 182 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e29d68
added generated ddl, driver and sample datasource
ruromero Dec 26, 2014
34aca33
set GeneratedValue strategy to IDENTITY
ruromero Dec 26, 2014
6efff5b
add indexes and give proper names to constraints
ruromero Dec 27, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
410 changes: 410 additions & 0 deletions distro/wildfly8/src/main/resources/overlay/apiman/ddls/apiman_postgresql.ddl
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions distro/wildfly8/src/main/resources/overlay/apiman/sample-configs/apiman-ds_postgresql.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<datasources xmlns="http://www.jboss.org/ironjacamar/schema">
<datasource jndi-name="jdbc/ApiManagerDS" pool-name="apiman-manager-api" enabled="true" use-java-context="true">
<connection-url>jdbc:postgresql://POSTGRESQLSERVER:5432/apiman</connection-url>
<driver>postgresql-9.3-1102.jdbc41.jar_org.postgresql.Driver_9_3</driver>
<pool>
<max-pool-size>30</max-pool-size>
</pool>
<security>
<user-name>DBUSER</user-name>
<password>DBPASS</password>
</security>
</datasource>
</datasources>
3 changes: 2 additions & 1 deletion manager/api/beans/src/main/java/io/apiman/manager/api/beans/apps/ApplicationVersionBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
Expand Down Expand Up @@ -51,7 +52,7 @@ public class ApplicationVersionBean implements Serializable {

private static final long serialVersionUID = -2218697175049442690L;

@Id @GeneratedValue
@Id @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@ManyToOne
@JoinColumns({
Expand Down
3 changes: 2 additions & 1 deletion manager/api/beans/src/main/java/io/apiman/manager/api/beans/audit/AuditEntryBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Lob;
import javax.persistence.Table;
Expand Down Expand Up @@ -50,7 +51,7 @@ public class AuditEntryBean implements Serializable {

private static final long serialVersionUID = -2523995385388505492L;

@Id @GeneratedValue
@Id @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@Column(updatable=false, nullable=false)
private String who;
Expand Down
3 changes: 2 additions & 1 deletion manager/api/beans/src/main/java/io/apiman/manager/api/beans/contracts/ContractBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
Expand All @@ -51,7 +52,7 @@ public class ContractBean implements Serializable {

private static final long serialVersionUID = -8534463608508756791L;

@Id @GeneratedValue
@Id @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@ManyToOne
@JoinColumns({
Expand Down
3 changes: 2 additions & 1 deletion manager/api/beans/src/main/java/io/apiman/manager/api/beans/idm/RoleMembershipBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
Expand Down Expand Up @@ -52,7 +53,7 @@ public static final RoleMembershipBean create(String userId, String roleId, Stri
return bean;
}

@Id @GeneratedValue
@Id @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@Column(name="user_id")
private String userId;
Expand Down
3 changes: 2 additions & 1 deletion manager/api/beans/src/main/java/io/apiman/manager/api/beans/plans/PlanVersionBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
Expand All @@ -49,7 +50,7 @@ public class PlanVersionBean implements Serializable {

private static final long serialVersionUID = -2218697175049442690L;

@Id @GeneratedValue
@Id @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@ManyToOne
@JoinColumns({
Expand Down
3 changes: 2 additions & 1 deletion manager/api/beans/src/main/java/io/apiman/manager/api/beans/policies/PolicyBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import javax.persistence.Enumerated;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
Expand All @@ -48,7 +49,7 @@ public class PolicyBean implements Serializable {

private static final long serialVersionUID = -8534463608508756791L;

@Id @GeneratedValue
@Id @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@Column(updatable=false, nullable=false)
@Enumerated(EnumType.STRING)
Expand Down
3 changes: 2 additions & 1 deletion manager/api/beans/src/main/java/io/apiman/manager/api/beans/services/ServiceVersionBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import javax.persistence.Enumerated;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
Expand Down Expand Up @@ -55,7 +56,7 @@ public class ServiceVersionBean implements Serializable {

private static final long serialVersionUID = -2218697175049442690L;

@Id @GeneratedValue
@Id @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@ManyToOne
@JoinColumns({
Expand Down
2 changes: 2 additions & 0 deletions tools/server-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@
overwrite="true" />
<copy file="${apiman.resources.dir}/wildfly8/deployments/mysql-connector-java-5.1.33-bin.jar"
todir="${apiman.wildfly.webapps}" overwrite="true" />
<copy file="${apiman.resources.dir}/wildfly8/deployments/postgresql-9.3-1102.jdbc41.jar"
todir="${apiman.wildfly.webapps}" overwrite="true" />
<copy
file="../../distro/wildfly8/src/main/resources/overlay/standalone/configuration/standalone-apiman.xml"
tofile="${apiman.wildfly.home}/standalone/configuration/standalone.xml" overwrite="true" />
Expand Down
Binary file added tools/server-all/src/main/resources/wildfly8/deployments/postgresql-9.3-1102.jdbc41.jar
View file
Open in desktop
Binary file not shown.