Filenames derived from reference URI

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@553 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

6 files changed, 26 insertions, 2 deletions

diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index ed7f228c..c7c40982 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -263,7 +263,7 @@
                 <bindingFile>staltypes-custom.xml</bindingFile>
                 <bindingFile>cardchannel-custom.xml</bindingFile>
               </bindingFiles>
-              <wsdlDirectory>${basedir}/src/main/webapp/WEB-INF/wsdl</wsdlDirectory>
+              <!-- wsdlDirectory>${basedir}/src/main/webapp/WEB-INF/wsdl</wsdlDirectory-->
               <wsdlDirectory>${basedir}/src/main/wsdl</wsdlDirectory>
               <wsdlFiles>
                 <wsdlFile>stal-service.wsdl</wsdlFile>
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
index eab9bed5..c8ab280f 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
@@ -267,6 +267,7 @@ public class STALServiceImpl implements STALPortType {
             ref.setID(reqRefId);
             ref.setMimeType(reqHdi.getMimeType());
             ref.setEncoding(reqHdi.getEncoding());
+            ref.setFilename(reqHdi.getFilename());
             ref.setValue(baos.toByteArray());
             response.getReference().add(ref);
           } catch (IOException ex) {
diff --git a/BKUOnline/src/main/webapp/META-INF/context.xml b/BKUOnline/src/main/webapp/META-INF/context.xml
index f38215a1..2a2da79e 100644
--- a/BKUOnline/src/main/webapp/META-INF/context.xml
+++ b/BKUOnline/src/main/webapp/META-INF/context.xml
@@ -16,4 +16,4 @@
   limitations under the License.
 -->
 <!--Context path="/bkuonline"/-->
-<Context path=""/>
+<Context path="/bkuonline"/>
diff --git a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
index 2389e043..a420035f 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
+++ b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
@@ -151,6 +151,7 @@
               <attribute name="ID" type="string"/>
               <attribute name="MimeType" type="string" use="optional"/>
               <attribute name="Encoding" type="string" use="optional"/>
+              <attribute name="Filename" type="string" use="optional"/>
             </extension>
           </simpleContent>
         </complexType>
diff --git a/BKUOnline/src/main/wsdl/stal-service.xsd b/BKUOnline/src/main/wsdl/stal-service.xsd
index 870e2db6..177b9e7f 100644
--- a/BKUOnline/src/main/wsdl/stal-service.xsd
+++ b/BKUOnline/src/main/wsdl/stal-service.xsd
@@ -166,6 +166,7 @@
               <attribute name="ID" type="string"/>
               <attribute name="MimeType" type="string" use="optional"/>
               <attribute name="Encoding" type="string" use="optional"/>
+              <attribute name="Filename" type="string" use="optional"/>
             </extension>
           </simpleContent>
         </complexType>
diff --git a/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java b/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java
index a1f3864e..741974eb 100644
--- a/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java
+++ b/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java
@@ -126,6 +126,12 @@ public class STALRequestBrokerTest {
             public String getEncoding() {
               return "UTF-8";
             }
+
+
+            @Override
+            public String getFilename() {
+                return "file.txt";
+            }
         };
         r1.setHashDataInput(Collections.singletonList(hdi));
         requests.add(r1);
@@ -172,6 +178,11 @@ public class STALRequestBrokerTest {
             public String getEncoding() {
               return "UTF-8";
             }
+
+            @Override
+            public String getFilename() {
+                return "file.txt";
+            }
         };
         r1.setHashDataInput(Collections.singletonList(hdi));
         requests.add(r1);
@@ -231,6 +242,11 @@ public class STALRequestBrokerTest {
             public String getEncoding() {
               return "UTF-8";
             }
+
+            @Override
+            public String getFilename() {
+                return "file.txt";
+            }
         };
         r1.setHashDataInput(Collections.singletonList(hdi));
         requests.add(r1);
@@ -259,6 +275,11 @@ public class STALRequestBrokerTest {
             public String getEncoding() {
               return "UTF-8";
             }
+
+            @Override
+            public String getFilename() {
+                return "file.xml";
+            }
         };
         r2.setHashDataInput(Collections.singletonList(hdi2));
         requests2.add(r2);