[evolvis-commits] r17022: Use absolute URLS for services discovery and description.
mirabilos at evolvis.org
mirabilos at evolvis.org
Tue Mar 1 01:57:13 CET 2011
Author: mirabilos
Date: 2011-03-01 01:57:13 +0100 (Tue, 01 Mar 2011)
New Revision: 17022
Modified:
trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-cm-service-document.phtml
trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-cm-service-document.xml.phtml
trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog-project.json.phtml
trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog-project.phtml
trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog-project.xml.phtml
trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog.json.phtml
trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog.phtml
trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog.xml.phtml
trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/read-resource-collection.phtml
Log:
Use absolute URLS for services discovery and description.
Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-cm-service-document.phtml
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-cm-service-document.phtml 2011-03-01 00:57:10 UTC (rev 17021)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-cm-service-document.phtml 2011-03-01 00:57:13 UTC (rev 17022)
@@ -48,10 +48,9 @@
<h1>OSLC-CM V1 Service Description document</h1>
<pre>
<?php
- $xml = project_to_service_description($this->baseUrl(), $this->project, $this->tracker);
+ $xml = project_to_service_description($this->serverUrl() . $this->baseUrl(), $this->project, $this->tracker);
$text = str_replace('>', '>', str_replace('<', '<', $xml));
- $text = add_links($text, "http");
- $text = add_links($text, $this->baseUrl());
+ $text = add_links($text, $this->serverUrl().$this->baseUrl());
echo $text;?>
</pre>
</body>
Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-cm-service-document.xml.phtml
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-cm-service-document.xml.phtml 2011-03-01 00:57:10 UTC (rev 17021)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-cm-service-document.xml.phtml 2011-03-01 00:57:13 UTC (rev 17022)
@@ -27,4 +27,4 @@
require('_service-document_xml.php');
-print project_to_service_description($this->baseUrl(), $this->project, $this->tracker);
\ No newline at end of file
+print project_to_service_description($this->serverUrl().$this->baseUrl(), $this->project, $this->tracker);
\ No newline at end of file
Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog-project.json.phtml
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog-project.json.phtml 2011-03-01 00:57:10 UTC (rev 17021)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog-project.json.phtml 2011-03-01 00:57:13 UTC (rev 17022)
@@ -5,7 +5,7 @@
$service["oslc_disc:entry"]["oslc_disc:ServiceProvider"]["dc:identifier"] = $tracker["id"];
$service["oslc_disc:entry"]["oslc_disc:ServiceProvider"]["dc:title"] = $tracker["name"];
$service["oslc_disc:entry"]["oslc_disc:ServiceProvider"]["dc:descrption"] = $tracker["description"];
- $service["oslc_disc:entry"]["oslc_disc:ServiceProvider"]["oslc_disc:services"]["rdf:ressource"] = $this->base_url.'/cm/oslc-cm-service/'.$tracker['group_id'].'/tracker/'.$tracker['id'];
+ $service["oslc_disc:entry"]["oslc_disc:ServiceProvider"]["oslc_disc:services"]["rdf:ressource"] = $this->serverUrl() . util_make_uri($this->base_url().'/cm/oslc-cm-service/'.$tracker['group_id'].'/tracker/'.$tracker['id']);
$catalog[] = $service;
}
$json["rdf:about"] = "";
Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog-project.phtml
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog-project.phtml 2011-03-01 00:57:10 UTC (rev 17021)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog-project.phtml 2011-03-01 00:57:13 UTC (rev 17022)
@@ -30,11 +30,9 @@
<h1>OSLC-CM V1 Service Catalog document</h1>
<pre>
<?php
- $xml = project_trackers_to_service_catalog($this->baseUrl(), $this->trackers, $this->project);
- //print $xml;
+ $xml = project_trackers_to_service_catalog($this->serverUrl() . $this->baseUrl(), $this->trackers, $this->project);
$text = str_replace('>', '>', str_replace('<', '<', $xml));
- $text = add_links($text, "http");
- $text = add_links($text, $this->baseUrl());
+ $text = add_links($text, $this->serverUrl().$this->baseUrl());
echo $text;
?>
</pre>
Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog-project.xml.phtml
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog-project.xml.phtml 2011-03-01 00:57:10 UTC (rev 17021)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog-project.xml.phtml 2011-03-01 00:57:13 UTC (rev 17022)
@@ -24,4 +24,4 @@
require_once('_service-catalog_xml.php');
-print project_trackers_to_service_catalog($this->baseUrl(), $this->trackers, $this->project);
+print project_trackers_to_service_catalog($this->serverUrl().$this->baseUrl(), $this->trackers, $this->project);
Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog.json.phtml
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog.json.phtml 2011-03-01 00:57:10 UTC (rev 17021)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog.json.phtml 2011-03-01 00:57:13 UTC (rev 17022)
@@ -4,7 +4,7 @@
foreach ($this->projects as $proj)
{
$service["oslc_disc:entry"]["oslc_disc:ServiceProvider"]["dc:title"] = $proj["name"];
- $service["oslc_disc:entry"]["oslc_disc:ServiceProvider"]["oslc_disc:services"] = $this->baseUrl().'/cm/oslc-cm-service/'.$proj['id'];
+ $service["oslc_disc:entry"]["oslc_disc:ServiceProvider"]["oslc_disc:services"] = $this->serverUrl().util_make_uri($this->baseUrl().'/cm/oslc-cm-service/'.$proj['id']);
$catalog[] = $service;
}
Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog.phtml
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog.phtml 2011-03-01 00:57:10 UTC (rev 17021)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog.phtml 2011-03-01 00:57:13 UTC (rev 17022)
@@ -47,11 +47,9 @@
<h1>OSLC-CM V1 Service Catalog document</h1>
<pre>
<?php
- $xml = projects_to_service_catalog($this->baseUrl(), $this->projects);
- //print $xml;
+ $xml = projects_to_service_catalog($this->serverUrl().$this->baseUrl(), $this->projects);
$text = str_replace('>', '>', str_replace('<', '<', $xml));
- $text = add_links($text, "http");
- $text = add_links($text, $this->baseUrl());
+ $text = add_links($text, $this->serverUrl().$this->baseUrl());
echo $text;?>
</pre>
</body>
Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog.xml.phtml
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog.xml.phtml 2011-03-01 00:57:10 UTC (rev 17021)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/oslc-service-catalog.xml.phtml 2011-03-01 00:57:13 UTC (rev 17022)
@@ -27,4 +27,4 @@
require('_service-catalog_xml.php');
-print projects_to_service_catalog($this->baseUrl(), $this->projects);
+print projects_to_service_catalog($this->serverUrl().$this->baseUrl(), $this->projects);
Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/read-resource-collection.phtml
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/read-resource-collection.phtml 2011-03-01 00:57:10 UTC (rev 17021)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/oslc/include/oslc-zend/application/views/scripts/fusionforgecm/read-resource-collection.phtml 2011-03-01 00:57:13 UTC (rev 17022)
@@ -42,7 +42,7 @@
print '<h1>'.$tracker.' Change Requests:</h1>';
$xml = createRessourceCollectionView($this);
$text = str_replace('>', '>', str_replace('<', '<', $xml));
-$text = add_links($text, "http");
+$text = add_links($text, $this->serverUrl().$this->baseUrl());
print '<pre>'.$text.'</pre>';?>
</body>
More information about the evolvis-commits
mailing list