summaryrefslogtreecommitdiff
path: root/BKUOnline
diff options
context:
space:
mode:
authorclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-11-24 18:48:00 (GMT)
committerclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-11-24 18:48:00 (GMT)
commit5af9b75dccc1b52d1382fe0f2df30affd509f5b9 (patch)
tree8640f3e4f0446e85cbe34f2d87916e187f5b40ad /BKUOnline
parent650732adaff82503b19a41b6c53d4299be9a1533 (diff)
downloadmocca-5af9b75dccc1b52d1382fe0f2df30affd509f5b9.zip
mocca-5af9b75dccc1b52d1382fe0f2df30affd509f5b9.tar.gz
mocca-5af9b75dccc1b52d1382fe0f2df30affd509f5b9.tar.bz2
Filenames derived from reference URI
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@553 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'BKUOnline')
-rw-r--r--BKUOnline/pom.xml2
-rw-r--r--BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java1
-rw-r--r--BKUOnline/src/main/webapp/META-INF/context.xml2
-rw-r--r--BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd1
-rw-r--r--BKUOnline/src/main/wsdl/stal-service.xsd1
-rw-r--r--BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java21
6 files changed, 26 insertions, 2 deletions
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index ed7f228..c7c4098 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 eab9bed..c8ab280 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 f38215a..2a2da79 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 2389e04..a420035 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 870e2db..177b9e7 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 a1f3864..741974e 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);