diff options
author | afinkbein | 2008-05-15 15:26:31 +0000 |
---|---|---|
committer | afinkbein | 2008-05-15 15:26:31 +0000 |
commit | ddf7e178e269f2a276fb232f4a3fb9d48dbaf57d (patch) | |
tree | c9e1a4ce7158aa4929a3b5caf09ecac7da816fa8 | |
parent | bd874baeaba19c0da75524328861c2c173c0924f (diff) | |
download | org.eclipse.osee-ddf7e178e269f2a276fb232f4a3fb9d48dbaf57d.tar.gz org.eclipse.osee-ddf7e178e269f2a276fb232f4a3fb9d48dbaf57d.tar.xz org.eclipse.osee-ddf7e178e269f2a276fb232f4a3fb9d48dbaf57d.zip |
-rw-r--r-- | org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/BranchExporter.java | 6 | ||||
-rw-r--r-- | org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/BranchImporterSaxHandler.java | 4 | ||||
-rw-r--r-- | org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/HttpProcessor.java (renamed from org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/ResourceProcessor.java) | 28 |
3 files changed, 31 insertions, 7 deletions
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/BranchExporter.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/BranchExporter.java index 23c92b45182..d978bc1024e 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/BranchExporter.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/BranchExporter.java @@ -57,8 +57,8 @@ import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.artifact.Branch; import org.eclipse.osee.framework.skynet.core.change.ModificationType; import org.eclipse.osee.framework.skynet.core.linking.HttpUrlBuilder; -import org.eclipse.osee.framework.skynet.core.linking.ResourceProcessor; -import org.eclipse.osee.framework.skynet.core.linking.ResourceProcessor.AcquireResult; +import org.eclipse.osee.framework.skynet.core.linking.HttpProcessor; +import org.eclipse.osee.framework.skynet.core.linking.HttpProcessor.AcquireResult; import org.eclipse.osee.framework.skynet.core.transaction.TransactionIdManager; /** @@ -431,7 +431,7 @@ public class BranchExporter { Map<String, String> parameters = new HashMap<String, String>(); parameters.put("uri", uriTarget); String url = HttpUrlBuilder.getInstance().getOsgiServletServiceUrl("resource", parameters); - AcquireResult acquireResult = ResourceProcessor.acquire(new URL(url)); + AcquireResult acquireResult = HttpProcessor.acquire(new URL(url)); outputStream.write(acquireResult.getData()); toReturn = target.getName(); } finally { diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/BranchImporterSaxHandler.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/BranchImporterSaxHandler.java index a87ee9bfc18..6f2588b258b 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/BranchImporterSaxHandler.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/BranchImporterSaxHandler.java @@ -55,7 +55,7 @@ import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.skynet.core.change.ModificationType; import org.eclipse.osee.framework.skynet.core.change.TxChange; import org.eclipse.osee.framework.skynet.core.linking.HttpUrlBuilder; -import org.eclipse.osee.framework.skynet.core.linking.ResourceProcessor; +import org.eclipse.osee.framework.skynet.core.linking.HttpProcessor; import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager; import org.eclipse.osee.framework.skynet.core.transaction.TransactionId; import org.eclipse.osee.framework.skynet.core.transaction.TransactionIdManager; @@ -312,7 +312,7 @@ public class BranchImporterSaxHandler extends BranchSaxHandler { parameterMap.put("extension", Lib.getExtension(uriValue)); String urlString = HttpUrlBuilder.getInstance().getOsgiServletServiceUrl("resource", parameterMap); URI result = - ResourceProcessor.save(new URL(urlString), inputStream, + HttpProcessor.save(new URL(urlString), inputStream, HttpURLConnection.guessContentTypeFromName(uriValue), "ISO-8859-1"); uriToStore = result.toASCIIString(); } finally { diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/ResourceProcessor.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/HttpProcessor.java index 1f62d5c69b4..bf6f3938e72 100644 --- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/ResourceProcessor.java +++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/linking/HttpProcessor.java @@ -21,9 +21,9 @@ import org.eclipse.osee.framework.jdk.core.util.Lib; /**
* @author Roberto E. Escobar
*/
-public class ResourceProcessor {
+public class HttpProcessor {
- private ResourceProcessor() {
+ private HttpProcessor() {
}
public static URI save(URL url, InputStream inputStream, String contentType, String encoding) throws Exception {
@@ -50,6 +50,30 @@ public class ResourceProcessor { return toReturn;
}
+ public static String post(URL url) throws Exception {
+ String response = null;
+ int code = -1;
+ InputStream inputStream = null;
+ try {
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setRequestMethod("POST");
+ connection.connect();
+ // Wait for response
+ code = connection.getResponseCode();
+ if (code == HttpURLConnection.HTTP_ACCEPTED) {
+ inputStream = (InputStream) connection.getContent();
+ response = Lib.inputStreamToString(inputStream);
+ }
+ } catch (Exception ex) {
+ throw new Exception(String.format("Error during POST [%s] - status code: [%s]", url, code), ex);
+ } finally {
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ }
+ return response;
+ }
+
public static AcquireResult acquire(URL url) throws Exception {
AcquireResult result = new AcquireResult();
int code = -1;
|