Changed default deployment mode to Spring Boot JAR

Author: fabiopavesi

EDI-T/WebContent/META-INF/MANIFEST.MF

@@ -1,3 +1,4 @@
 Manifest-Version: 1.0
 Class-Path: 
-
+Main-Class: org.springframework.boot.loader.JarLauncher
+Start-Class: it.cnr.irea.ediT.Application

EDI-T/application.properties

@@ -0,0 +1,22 @@
+spring.datasource.url=jdbc:h2:mem:AZ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+spring.datasource.driverClassName=org.h2.Driver
+spring.datasource.username=sa
+spring.datasource.password=
+spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
+
+# spring.datasource.url=jdbc:postgresql://pg_edi/edi
+# spring.datasource.username=postgres
+# spring.datasource.password=ritmare2013
+# spring.datasource.driverClassName=org.postgresql.Driver
+
+# spring.datasource.testOnBorrow=true
+# spring.datasource.validationQuery=SELECT 1
+# spring.jpa.properties.hibernate.globally_quoted_identifiers=true
+# spring.jpa.hibernate.naming-strategy=org.hibernate.cfg.EJB3NamingStrategy
+# spring.jpa.hibernate.ddl-auto=update
+# spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
+
+spring.data.rest.baseUri=edi
+spring.data.rest.base-uri=edi
+
+server.port=8080

EDI-T/pom.xml

@@ -10,7 +10,7 @@
 	    <version>1.2.4.RELEASE</version>
 	</parent>
 
-  <packaging>war</packaging>
+  <packaging>jar</packaging>
   <dependencies>
       	<dependency>
             <groupId>org.springframework.boot</groupId>
@@ -34,12 +34,10 @@
 			<artifactId>postgresql</artifactId>
 			<version>9.4-1201-jdbc4</version>
 		</dependency>
-		<!-- 
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
         </dependency>
-         -->
         <dependency>
         	<groupId>org.springframework.data</groupId>
         	<artifactId>spring-data-neo4j</artifactId>
@@ -87,7 +85,7 @@
  		<dependency>
 			<groupId>net.sf.saxon</groupId>
 			<artifactId>Saxon-HE</artifactId>
-			<version>9.4</version>
+			<version>9.7.0-7</version>
 		</dependency>
 		<!-- 
 		<dependency>
@@ -106,7 +104,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
+        <version>2.5.1</version>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
@@ -120,6 +118,26 @@
           <failOnMissingWebXml>false</failOnMissingWebXml>
         </configuration>
       </plugin>
+      <plugin>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+      <!-- Build an executable JAR -->
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-jar-plugin</artifactId>
+      <version>2.5</version>
+
+      <configuration>
+        <archive>
+          <manifest>
+            <addClasspath>true</addClasspath>
+            <classpathPrefix></classpathPrefix>
+            <mainClass>it.cnr.irea.ediT.Application</mainClass>
+          </manifest>
+        </archive>
+      </configuration>
+    </plugin>
     </plugins>
   </build>
 </project>

EDI-T/src/it/cnr/irea/ediT/PathElement.java

@@ -119,7 +119,7 @@ public static boolean isLastNode(ArrayList<PathElement> pathElements, int i) {
 		}
 		return false;
 	}
-	
+/*	
 	public static void main(String[] args) {
 		// String test = "/sml:PhysicalSystem/sml:characteristics[@name='generalProperties']/sml:CharacteristicList/sml:characteristic[@name='platform_physical_properties']/swe:DataRecord[@definition='platform_physical_properties']/swe:field[@name='Dimensions_and_General_Facts']/swe:DataRecord";
 		String test = "sml:CharacteristicList/sml:characteristic[@name='platform_physical_properties']/swe:DataRecord[@definition='platform_physical_properties']/swe:field/swe:DataRecord";
@@ -132,5 +132,5 @@ public static void main(String[] args) {
 		System.out.println();
 		System.out.println(PathElement.toString(paths));
 	}
-
+*/
 }

EDI-T/src/it/cnr/irea/ediT/service/BaseService.java

@@ -57,7 +57,7 @@ public Document loadXMLFromString(String xml) throws Exception
 	}
 
 	public String getHostName() {
-		return getSetting("starterKitURI", null);		
+		return getSetting("starterKitURI", "noSK");		
 	}
 
 	@Transactional(readOnly = true)
@@ -136,13 +136,18 @@ public ServiceResponse syncMetadata() {
 		    // restTemplate.getMessageConverters().add(new StringHttpMessageConverter());
 
 	// 	    MetadataListDTO result = restTemplate.postForObject(getSetting("md_principal", "http://localhost:8081/registry/metadata"), dto, MetadataListDTO.class);
-		    ServiceResponse result = restTemplate.postForObject(getSetting("md_principal", "http://localhost:8081/registry/metadata"), entity, ServiceResponse.class);
-		    
-		    if ( result.getCode() == 200 ) {
-		    	for ( Metadata m : dto.getMetadata() ) {
-		    		m.setSynchronised(true);
-		    		em.merge(m);
-		    	}
+		    ServiceResponse result = null;
+		    try {
+			    result = restTemplate.postForObject(getSetting("md_principal", "http://localhost:8081/registry/metadata"), entity, ServiceResponse.class);
+			    
+			    if ( result.getCode() == 200 ) {
+			    	for ( Metadata m : dto.getMetadata() ) {
+			    		m.setSynchronised(true);
+			    		em.merge(m);
+			    	}
+			    }
+		    } catch(Exception e) {
+		    	
 		    }
 
 		    return result;

EDI-T/src/main/resources/application.properties

@@ -12,3 +12,5 @@ spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
 
 spring.data.rest.baseUri=edi
 spring.data.rest.base-uri=edi
+
+server.port=8081

EDI-T/src/main/resources/static/META-INF/MANIFEST.MF

@@ -1,3 +1,4 @@
 Manifest-Version: 1.0
 Class-Path: 
-
+Main-Class: org.springframework.boot.loader.JarLauncher
+Start-Class: it.cnr.irea.ediT.Application