Menu
▾
▴
[Unicore-cvs-commits] SF.net SVN: unicore:[14255] distributed-storage/dsms-common/trunk
|
From: <tre...@us...> - 2012-09-15 11:56:37
|
Revision: 14255
http://unicore.svn.sourceforge.net/unicore/?rev=14255&view=rev
Author: trekawek
Date: 2012-09-15 11:56:31 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
removed List and AddCreatedSms operations,
added Catalogue DN to RP
Modified Paths:
--------------
distributed-storage/dsms-common/trunk/src/main/java/pl/edu/icm/dsms/catalogue/Catalogue.java
distributed-storage/dsms-common/trunk/src/main/java/pl/edu/icm/dsms/catalogue/CatalogueClient.java
distributed-storage/dsms-common/trunk/src/main/schema/Catalogue.xsd
Property Changed:
----------------
distributed-storage/dsms-common/trunk/
Property changes on: distributed-storage/dsms-common/trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /distributed-storage/dsms-common/branches/branch-for-6.5.0:13926-14245
Modified: distributed-storage/dsms-common/trunk/src/main/java/pl/edu/icm/dsms/catalogue/Catalogue.java
===================================================================
--- distributed-storage/dsms-common/trunk/src/main/java/pl/edu/icm/dsms/catalogue/Catalogue.java 2012-09-14 15:15:38 UTC (rev 14254)
+++ distributed-storage/dsms-common/trunk/src/main/java/pl/edu/icm/dsms/catalogue/Catalogue.java 2012-09-15 11:56:31 UTC (rev 14255)
@@ -21,8 +21,6 @@
import pl.edu.icm.dsms.catalogue.exception.NoSmsFault;
import pl.edu.icm.dsms.catalogue.exception.NotADirectoryFault;
import pl.edu.icm.dsms.catalogue.exception.UnauthorizedAccessFault;
-import pl.edu.icm.x2010.x10.services.catalogue.AddCreatedSmsDocument;
-import pl.edu.icm.x2010.x10.services.catalogue.AddCreatedSmsResponseDocument;
import pl.edu.icm.x2010.x10.services.catalogue.AddDirectoryDocument;
import pl.edu.icm.x2010.x10.services.catalogue.AddDirectoryResponseDocument;
import pl.edu.icm.x2010.x10.services.catalogue.AddDocument;
@@ -34,8 +32,6 @@
import pl.edu.icm.x2010.x10.services.catalogue.CreateSmsResponseDocument;
import pl.edu.icm.x2010.x10.services.catalogue.IsDirectoryDocument;
import pl.edu.icm.x2010.x10.services.catalogue.IsDirectoryResponseDocument;
-import pl.edu.icm.x2010.x10.services.catalogue.ListDocument;
-import pl.edu.icm.x2010.x10.services.catalogue.ListResponseDocument;
import pl.edu.icm.x2010.x10.services.catalogue.LookupDirDocument;
import pl.edu.icm.x2010.x10.services.catalogue.LookupDirResponseDocument;
import pl.edu.icm.x2010.x10.services.catalogue.LookupDocument;
@@ -78,18 +74,10 @@
public AddDirectoryResponseDocument AddDirectory(AddDirectoryDocument in) throws FileExistsFault,
InvalidPathFault, InvalidDSmsIdFault, UnauthorizedAccessFault;
- @WebMethod(action = "http://icm.edu.pl/2010/11/services/catalogue/AddCreatedSms")
- public AddCreatedSmsResponseDocument AddCreatedSms(AddCreatedSmsDocument in) throws InvalidDSmsIdFault,
- UnauthorizedAccessFault;
-
@WebMethod(action = "http://icm.edu.pl/2010/10/services/catalogue/IsDirectory")
public IsDirectoryResponseDocument IsDirectory(IsDirectoryDocument in) throws FileNotExistsFault,
InvalidDSmsIdFault, InvalidPathFault, UnauthorizedAccessFault;
- @WebMethod(action = "http://icm.edu.pl/2010/10/services/catalogue/List")
- public ListResponseDocument List(ListDocument in) throws InvalidPathFault, InvalidDSmsIdFault,
- FileNotExistsFault, UnauthorizedAccessFault;
-
@WebMethod(action = "http://icm.edu.pl/2010/10/services/catalogue/Lookup")
public LookupResponseDocument Lookup(LookupDocument in) throws FileNotExistsFault, InvalidDSmsIdFault,
InvalidPathFault, IsADirectoryFault, UnauthorizedAccessFault;
Modified: distributed-storage/dsms-common/trunk/src/main/java/pl/edu/icm/dsms/catalogue/CatalogueClient.java
===================================================================
--- distributed-storage/dsms-common/trunk/src/main/java/pl/edu/icm/dsms/catalogue/CatalogueClient.java 2012-09-14 15:15:38 UTC (rev 14254)
+++ distributed-storage/dsms-common/trunk/src/main/java/pl/edu/icm/dsms/catalogue/CatalogueClient.java 2012-09-15 11:56:31 UTC (rev 14255)
@@ -17,7 +17,6 @@
import pl.edu.icm.dsms.catalogue.model.Lda;
import pl.edu.icm.dsms.catalogue.model.LogicalFilename;
-import pl.edu.icm.x2010.x10.services.catalogue.AddCreatedSmsDocument;
import pl.edu.icm.x2010.x10.services.catalogue.AddDirectoryDocument;
import pl.edu.icm.x2010.x10.services.catalogue.AddDocument;
import pl.edu.icm.x2010.x10.services.catalogue.AddToSmsDocument;
@@ -29,15 +28,12 @@
import pl.edu.icm.x2010.x10.services.catalogue.IsDirectoryDocument;
import pl.edu.icm.x2010.x10.services.catalogue.LdaArray;
import pl.edu.icm.x2010.x10.services.catalogue.LdaType;
-import pl.edu.icm.x2010.x10.services.catalogue.ListDocument;
-import pl.edu.icm.x2010.x10.services.catalogue.ListResponseDocument;
import pl.edu.icm.x2010.x10.services.catalogue.LookupDirDocument;
import pl.edu.icm.x2010.x10.services.catalogue.LookupDocument;
import pl.edu.icm.x2010.x10.services.catalogue.RemoveDirDocument;
import pl.edu.icm.x2010.x10.services.catalogue.RemoveDirResponseDocument;
import pl.edu.icm.x2010.x10.services.catalogue.RemoveDocument;
import pl.edu.icm.x2010.x10.services.catalogue.RemoveSmsDocument;
-import pl.edu.icm.x2010.x10.services.catalogue.AddCreatedSmsDocument.AddCreatedSms;
import pl.edu.icm.x2010.x10.services.catalogue.AddResponseDocument.AddResponse;
import pl.edu.icm.x2010.x10.services.catalogue.AddToSmsDocument.AddToSms;
import pl.edu.icm.x2010.x10.services.catalogue.RemoveSmsResponseDocument.RemoveSmsResponse;
@@ -71,7 +67,7 @@
* @param DSmsId
* @return Location-dependent address of the file or factory to create new SMS for that file
*/
- public LdaOrFactory add(String logicalFileName, String DSmsId) throws Exception {
+ public Lda add(String logicalFileName, String DSmsId) throws Exception {
logger.trace("Calling catalogue service at: " + getEPR().getAddress().getStringValue());
Catalogue cat = makeProxy(Catalogue.class);
@@ -79,37 +75,10 @@
in.setAdd(new LogicalFilename(logicalFileName, DSmsId).getLogicalFilename());
AddResponse resp = cat.Add(in).getAddResponse();
- LdaOrFactory ldaOrFactory = null;
- if (resp.isSetLda())
- ldaOrFactory = new LdaOrFactory(new Lda(resp.getLda()));
- else if (resp.isSetFactory())
- ldaOrFactory = new LdaOrFactory(resp.getFactory().getFactoryReference(), resp.getFactory()
- .getPhysicalFileName(), resp.getFactory().getStorageType());
- return ldaOrFactory;
+ return new Lda(resp.getLda());
}
/**
- * Register new SMS created for given dSMS.
- *
- * @param smsEpr
- * @param factoryEpr
- * @param dSmsId
- * @throws Exception
- */
- public void registerCreatedSms(EndpointReferenceType smsEpr, EndpointReferenceType factoryEpr,
- String dSmsId) throws Exception {
- logger.trace("Calling catalogue service at: " + getEPR().getAddress().getStringValue());
- Catalogue cat = makeProxy(Catalogue.class);
-
- AddCreatedSmsDocument doc = AddCreatedSmsDocument.Factory.newInstance();
- AddCreatedSms in = doc.addNewAddCreatedSms();
- in.setFactoryReference(factoryEpr);
- in.setSmsReference(smsEpr);
- in.setDSmsId(dSmsId);
- cat.AddCreatedSms(doc);
- }
-
- /**
* Adds new file to the Catalogue in the given sms.
*
* @param logicalFileName
@@ -181,28 +150,6 @@
}
/**
- * List all files in the given directory.
- *
- * @param logicalFileName
- * @param DSmsId
- * @return
- */
- public List<Lda> list(String logicalFileName, String DSmsId) throws Exception {
- logger.trace("Calling catalogue service at: " + getEPR().getAddress().getStringValue());
- Catalogue cat = makeProxy(Catalogue.class);
-
- ListDocument in = ListDocument.Factory.newInstance();
- in.setList(new LogicalFilename(logicalFileName, DSmsId).getLogicalFilename());
-
- List<Lda> list = new ArrayList<Lda>();
- ListResponseDocument doc = cat.List(in);
- LdaType[] ldas = doc.getListResponse().getLdaArray();
- for (LdaType ldaType : ldas)
- list.add(new Lda(ldaType));
- return list;
- }
-
- /**
* Get @see Lda of the given file.
*
* @param logicalFileName
@@ -327,47 +274,4 @@
return eprs;
}
}
-
- public class LdaOrFactory {
- private Lda lda;
-
- private EndpointReferenceType factory;
-
- private String storageType;
-
- private String physicalFilename;
-
- private LdaOrFactory(EndpointReferenceType factory, String physicalFilename, String storageType) {
- this.factory = factory;
- this.physicalFilename = physicalFilename;
- this.lda = null;
- this.storageType = storageType;
- }
-
- private LdaOrFactory(Lda lda) {
- this.factory = null;
- this.physicalFilename = null;
- this.lda = lda;
- }
-
- public boolean isFactory() {
- return this.lda == null;
- }
-
- public Lda getLda() {
- return lda;
- }
-
- public EndpointReferenceType getFactory() {
- return factory;
- }
-
- public String getPhysicalFilename() {
- return physicalFilename;
- }
-
- public String getStorageType() {
- return storageType;
- }
- }
}
Modified: distributed-storage/dsms-common/trunk/src/main/schema/Catalogue.xsd
===================================================================
--- distributed-storage/dsms-common/trunk/src/main/schema/Catalogue.xsd 2012-09-14 15:15:38 UTC (rev 14254)
+++ distributed-storage/dsms-common/trunk/src/main/schema/Catalogue.xsd 2012-09-15 11:56:31 UTC (rev 14255)
@@ -24,6 +24,7 @@
<xsd:element name="GlobalDsmsId" type="xsd:string" />
<xsd:element name="GlobalDsmsRoot" type="xsd:string" />
<xsd:element name="FreeSpace" type="xsd:long" />
+ <xsd:element name="CatalogueDn" type="xsd:string" />
</xsd:sequence>
</xsd:complexType>
@@ -33,8 +34,6 @@
<xsd:sequence>
<xsd:element name="lda" type="cat:LdaType" minOccurs="0"
maxOccurs="1" />
- <xsd:element name="factory" type="cat:FactoryType"
- minOccurs="0" maxOccurs="1" />
</xsd:sequence>
</xsd:complexType>
</xsd:element>
@@ -51,20 +50,6 @@
</xsd:element>
<xsd:element name="AddToSmsResponse" type="cat:LdaType" />
- <xsd:element name="AddCreatedSms">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="factoryReference" type="wsa:EndpointReferenceType"
- minOccurs="1" maxOccurs="1" />
- <xsd:element name="smsReference" type="wsa:EndpointReferenceType"
- minOccurs="1" maxOccurs="1" />
- <xsd:element name="dSmsId" type="xsd:string" minOccurs="1"
- maxOccurs="1" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="AddCreatedSmsResponse" />
-
<xsd:element name="Lookup" type="cat:LogicalFilename" />
<xsd:element name="LookupResponse" type="cat:LdaType" />
@@ -91,9 +76,6 @@
</xsd:element>
<xsd:element name="RenameResponse" />
- <xsd:element name="List" type="cat:LogicalFilename" />
- <xsd:element name="ListResponse" type="cat:LdaArray" />
-
<xsd:element name="IsDirectory" type="cat:LogicalFilename" />
<xsd:element name="IsDirectoryResponse" type="xsd:boolean" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|