Small fixes

Author: fabiopavesi

EDI-T/.classpath

@@ -6,6 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="WebContent"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>

EDI-T/.settings/org.eclipse.wst.common.component

@@ -3,6 +3,7 @@
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/WebContent"/>
         <property name="java-output-path" value="/EDI-T/build/classes"/>
         <property name="context-root" value="EDI-T"/>
     </wb-module>

EDI-T/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,11 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <runtime name="Apache Tomcat v7.0"/>
-  <fixed facet="java"/>
-  <fixed facet="jst.web"/>
-  <fixed facet="wst.jsdt.web"/>
-  <installed facet="jst.web" version="3.0"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="jst.jaxrs" version="1.1"/>
-  <installed facet="java" version="1.6"/>
+  <installed facet="cloudfoundry.standalone.app" version="1.0"/>
 </faceted-project>

EDI-T/application.properties

@@ -6,8 +6,12 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
+import java.net.InetSocketAddress;
 import java.net.MalformedURLException;
+import java.net.Socket;
+import java.net.SocketException;
 import java.net.URL;
+import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -83,6 +87,17 @@ public byte[] transform(byte[] xslt, byte[] xml, HashMap<String, String> paramet
 		return outStream.toByteArray();
 	}
 
+	public boolean pingHost(String host, int port, int timeout) {
+	    try (Socket socket = new Socket()) {
+	    	InetSocketAddress address = new InetSocketAddress(host, port);
+	    	log.info("pinging " + address.getAddress().getHostAddress());
+	        socket.connect(address, timeout);
+	        return true;
+	    } catch (IOException e) {
+	        return false; // Either timeout or unreachable or failed DNS lookup.
+	    }
+	}
+	
 	/*
 	 * @param xslt URL of XSLT file or XSLT text
 	 * @param xml URL of XML file or XML text
@@ -102,8 +117,16 @@ public byte[] transform(String xslt, String xml, HashMap<String, String> paramet
 		try {
 			// if it qualifies as a URL open a URL stream
 			URL xsltUrl = new URL(xslt);
+			if ( pingHost(xsltUrl.getHost(), 80, 100) ) {
+				log.info("PING succeeded");
+			} else {
+				log.severe("PING FAILED");
+			}
+			log.info("xslt URL '" + xsltUrl.toExternalForm() + "'");
+			URLConnection conn = xsltUrl.openConnection();
+			conn.connect();
+			log.info("xslt contains: " + conn.getContent());
 			xsltStream = xsltUrl.openStream();
-			log.info("xslt from " + xslt);
 		} catch(MalformedURLException e) {
 			// otherwise treat it as a byte array
 			xsltStream = new ByteArrayInputStream(xslt.getBytes());

EDI-T/demo/application.properties

@@ -180,13 +180,17 @@ public ResponseEntity<PostMetadataResponse> postMetadataNG(HttpServletRequest re
 				   log.info("xsltChain is correctly defined in EDIML");
 				   String xmlTemp = new String(document.xmlUTF8String(xmlDoc), "utf-8");
 				   for ( XsltUrl xslt : elementList.getXsltChain() ) {
-					   if ( xslt.getXslt() != null ) {
-						   log.info("xmlTemp: ");
-						   log.info(xmlTemp);
+					   if ( xslt != null ) {
+						   if ( xslt.getXslt() != null ) {
+							   log.severe("Transforming result with " + xslt.getXslt());
+							   log.info("xmlTemp: ");
+							   log.info(xmlTemp);
 
-						   log.info("Transforming result with " + xslt.getXslt());
-							byte[] result = xsltService.transform(xslt.getXslt(), xmlTemp , (HashMap<String, String>) null);
-							xmlTemp = new String(result, "utf-8");
+								byte[] result = xsltService.transform(xslt.getXslt(), xmlTemp , (HashMap<String, String>) null);
+								xmlTemp = new String(result, "utf-8");
+						   }
+					   } else {
+						   log.severe("XSLT is NULL!!!");
 					   }
 				   }
 				   document.setOutput(service.loadXMLFromString(xmlTemp));

EDI-T/demo/edi.jar

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