[airavata] branch staging updated: Adding maven enhancer for registry models

[dimuthuupe]

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/staging by this push:
     new 0fbe1b1  Adding maven enhancer for registry models
     new 4f490eb  Merge branch 'staging' of https://github.com/apache/airavata 
into staging
0fbe1b1 is described below

commit 0fbe1b1274c29338b992eb228836d18df71c4b52
Author: Dimuthu Wannipurage <dimuthu.upeks...@gmail.com>
AuthorDate: Mon Dec 10 11:18:36 2018 +0530

    Adding maven enhancer for registry models
---
 modules/registry/registry-core/pom.xml             | 26 ++++++++++++++++++++++
 .../app/catalog/model/DataStorageResource.java     | 16 ++++++-------
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/modules/registry/registry-core/pom.xml 
b/modules/registry/registry-core/pom.xml
index da2cf34..a685b94 100644
--- a/modules/registry/registry-core/pom.xml
+++ b/modules/registry/registry-core/pom.xml
@@ -136,6 +136,32 @@
                 <!--</executions>-->
             <!--</plugin>-->
             <plugin>
+                <groupId>org.apache.openjpa</groupId>
+                <artifactId>openjpa-maven-plugin</artifactId>
+                <version>2.2.0</version>
+                <configuration>
+                    <includes>**/model/*.class</includes>
+                    <addDefaultConstructor>true</addDefaultConstructor>
+                    
<enforcePropertyRestrictions>true</enforcePropertyRestrictions>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>enhancer</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>enhance</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.openjpa</groupId>
+                        <artifactId>openjpa</artifactId>
+                        <version>2.2.0</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${surefire.version}</version>
diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStorageResource.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStorageResource.java
index 5deec7c..4d3856e 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStorageResource.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStorageResource.java
@@ -30,7 +30,7 @@ public class DataStorageResource implements Serializable {
        
        @Id
        @Column(name = "STORAGE_RESOURCE_ID")
-       private String computeResourceId;
+       private String storageResourceId;
        
        @ManyToOne(cascade= CascadeType.MERGE)
        @JoinColumn(name = "COMPUTE_RESOURCE_ID")
@@ -69,10 +69,10 @@ public class DataStorageResource implements Serializable {
     }
 
 
-    public String getComputeResourceId() {
-               return computeResourceId;
+       public String getStorageResourceId() {
+               return storageResourceId;
        }
-       
+
        public ComputeResource getComputeResource() {
                return computeResource;
        }
@@ -88,11 +88,11 @@ public class DataStorageResource implements Serializable {
        public int getPriorityOrder() {
                return priorityOrder;
        }
-       
-       public void setComputeResourceId(String computeResourceId) {
-               this.computeResourceId=computeResourceId;
+
+       public void setStorageResourceId(String storageResourceId) {
+               this.storageResourceId = storageResourceId;
        }
-       
+
        public void setComputeResource(ComputeResource computeResource) {
                this.computeResource=computeResource;
        }