[GeoNetwork-commit] SF.net SVN: geonetwork:[8953] trunk/web/src/main

[<fxp...@us...>]

Revision: 8953
          http://geonetwork.svn.sourceforge.net/geonetwork/?rev=8953&view=rev
Author:   fxprunayre
Date:     2012-03-30 12:35:17 +0000 (Fri, 30 Mar 2012)
Log Message:
-----------
GetCapabilities / cosmetic : do not display :80 in URL. #842

Modified Paths:
--------------
    trunk/web/src/main/java/org/fao/geonet/kernel/csw/services/GetCapabilities.java
    trunk/web/src/main/webapp/xml/csw/capabilities.xml
    trunk/web/src/main/webapp/xml/csw/capabilities_inspire.xml

Modified: trunk/web/src/main/java/org/fao/geonet/kernel/csw/services/GetCapabilities.java
===================================================================
--- trunk/web/src/main/java/org/fao/geonet/kernel/csw/services/GetCapabilities.java	2012-03-29 20:20:21 UTC (rev 8952)
+++ trunk/web/src/main/java/org/fao/geonet/kernel/csw/services/GetCapabilities.java	2012-03-30 12:35:17 UTC (rev 8953)
@@ -270,8 +270,9 @@
 		HashMap<String, String> vars = new HashMap<String, String>();
 
         vars.put("$PROTOCOL", sm.getValue("system/server/protocol"));
-		vars.put("$HOST",    sm.getValue("system/server/host"));
-		vars.put("$PORT",    sm.getValue("system/server/port"));
+        vars.put("$HOST", sm.getValue("system/server/host"));
+        String port = sm.getValue("system/server/port");
+        vars.put("$PORT", "80".equals(port) ? "" : ":" + port);
         vars.put("$END-POINT", context.getService());
 
         String providerName = sm.getValue("system/site/organization");

Modified: trunk/web/src/main/webapp/xml/csw/capabilities.xml
===================================================================
--- trunk/web/src/main/webapp/xml/csw/capabilities.xml	2012-03-29 20:20:21 UTC (rev 8952)
+++ trunk/web/src/main/webapp/xml/csw/capabilities.xml	2012-03-30 12:35:17 UTC (rev 8953)
@@ -19,7 +19,7 @@
     </ows:ServiceIdentification>
     <ows:ServiceProvider>
         <ows:ProviderName>$PROVIDER_NAME</ows:ProviderName>
-        <ows:ProviderSite xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET"/>
+        <ows:ProviderSite xlink:href="$PROTOCOL://$HOST$PORT$SERVLET"/>
         <ows:ServiceContact>
             <ows:IndividualName>$IND_NAME</ows:IndividualName>
             <ows:PositionName>$POS_NAME</ows:PositionName>
@@ -46,8 +46,8 @@
         <ows:Operation name="GetCapabilities">
             <ows:DCP>
                 <ows:HTTP>
-                    <ows:Get xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
-                    <ows:Post xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Get xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Post xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
                 </ows:HTTP>
             </ows:DCP>
             <ows:Parameter name="sections">
@@ -64,8 +64,8 @@
         <ows:Operation name="DescribeRecord">
             <ows:DCP>
                 <ows:HTTP>
-                    <ows:Get xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
-                    <ows:Post xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Get xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Post xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
                 </ows:HTTP>
             </ows:DCP>
             <ows:Parameter name="typeName">
@@ -86,16 +86,16 @@
         <ows:Operation name="GetDomain">
             <ows:DCP>
                 <ows:HTTP>
-                    <ows:Get xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
-                    <ows:Post xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Get xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Post xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
                 </ows:HTTP>
             </ows:DCP>
         </ows:Operation>
         <ows:Operation name="GetRecords">
             <ows:DCP>
                 <ows:HTTP>
-                    <ows:Get xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
-                    <ows:Post xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Get xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Post xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
                 </ows:HTTP>
             </ows:DCP>
             <!-- FIXME : Gets it from enum or conf -->
@@ -127,8 +127,8 @@
         <ows:Operation name="GetRecordById">
             <ows:DCP>
                 <ows:HTTP>
-                    <ows:Get xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
-                    <ows:Post xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Get xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Post xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
                 </ows:HTTP>
             </ows:DCP>
             <ows:Parameter name="outputSchema">
@@ -156,8 +156,8 @@
         <ows:Operation name="Transaction">
 			<ows:DCP>
 				<ows:HTTP>
-					<ows:Get  xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT" />
-					<ows:Post xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"  />
+					<ows:Get  xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT" />
+					<ows:Post xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"  />
 				</ows:HTTP>
 			</ows:DCP>
 		</ows:Operation>
@@ -167,8 +167,8 @@
             </ows:Parameter>
 			<ows:DCP>
 				<ows:HTTP>
-					<ows:Get  xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT" />
-					<ows:Post xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"  />
+					<ows:Get  xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT" />
+					<ows:Post xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"  />
 				</ows:HTTP>
 			</ows:DCP>
 		</ows:Operation>

Modified: trunk/web/src/main/webapp/xml/csw/capabilities_inspire.xml
===================================================================
--- trunk/web/src/main/webapp/xml/csw/capabilities_inspire.xml	2012-03-29 20:20:21 UTC (rev 8952)
+++ trunk/web/src/main/webapp/xml/csw/capabilities_inspire.xml	2012-03-30 12:35:17 UTC (rev 8953)
@@ -21,7 +21,7 @@
     </ows:ServiceIdentification>
     <ows:ServiceProvider>
         <ows:ProviderName>$PROVIDER_NAME</ows:ProviderName>
-        <ows:ProviderSite xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET"/>
+        <ows:ProviderSite xlink:href="$PROTOCOL://$HOST$PORT$SERVLET"/>
         <ows:ServiceContact>
             <ows:IndividualName>$IND_NAME</ows:IndividualName>
             <ows:PositionName>$POS_NAME</ows:PositionName>
@@ -48,8 +48,8 @@
         <ows:Operation name="GetCapabilities">
             <ows:DCP>
                 <ows:HTTP>
-                    <ows:Get xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
-                    <ows:Post xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Get xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Post xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
                 </ows:HTTP>
             </ows:DCP>
             <ows:Parameter name="sections">
@@ -66,8 +66,8 @@
         <ows:Operation name="DescribeRecord">
             <ows:DCP>
                 <ows:HTTP>
-                    <ows:Get xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
-                    <ows:Post xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Get xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Post xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
                 </ows:HTTP>
             </ows:DCP>
             <ows:Parameter name="typeName">
@@ -88,16 +88,16 @@
         <ows:Operation name="GetDomain">
             <ows:DCP>
                 <ows:HTTP>
-                    <ows:Get xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
-                    <ows:Post xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Get xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Post xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
                 </ows:HTTP>
             </ows:DCP>
         </ows:Operation>
         <ows:Operation name="GetRecords">
             <ows:DCP>
                 <ows:HTTP>
-                    <ows:Get xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
-                    <ows:Post xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Get xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Post xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
                 </ows:HTTP>
             </ows:DCP>
             <!-- FIXME : Gets it from enum or conf -->
@@ -129,8 +129,8 @@
         <ows:Operation name="GetRecordById">
             <ows:DCP>
                 <ows:HTTP>
-                    <ows:Get xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
-                    <ows:Post xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Get xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
+                    <ows:Post xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"/>
                 </ows:HTTP>
             </ows:DCP>
             <ows:Parameter name="outputSchema">
@@ -158,8 +158,8 @@
         <ows:Operation name="Transaction">
 			<ows:DCP>
 				<ows:HTTP>
-					<ows:Get  xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT" />
-					<ows:Post xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT"  />
+					<ows:Get  xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT" />
+					<ows:Post xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT"  />
 				</ows:HTTP>
 			</ows:DCP>
 		</ows:Operation>
@@ -167,8 +167,8 @@
 		<ows:Operation name="Harvest">
 			<ows:DCP>
 				<ows:HTTP>
-					<ows:Get  xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/en/csw" />
-					<ows:Post xlink:href="$PROTOCOL://$HOST:$PORT$SERVLET/srv/en/csw"  />
+					<ows:Get  xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/en/csw" />
+					<ows:Post xlink:href="$PROTOCOL://$HOST$PORT$SERVLET/srv/en/csw"  />
 				</ows:HTTP>
 			</ows:DCP>
 		</ows:Operation>
@@ -188,12 +188,12 @@
 
         <inspire_ds:ExtendedCapabilities>
 			<inspire_common:ResourceLocator>
-				<inspire_common:URL>$PROTOCOL://$HOST:$PORT$SERVLET/srv/$LOCALE/$END-POINT?SERVICE=CSW&amp;VERSION=2.0.2&amp;REQUEST=GetCapabilities</inspire_common:URL>
+				<inspire_common:URL>$PROTOCOL://$HOST$PORT$SERVLET/srv/$LOCALE/$END-POINT?SERVICE=CSW&amp;VERSION=2.0.2&amp;REQUEST=GetCapabilities</inspire_common:URL>
 				<inspire_common:MediaType>application/xml</inspire_common:MediaType>
 			</inspire_common:ResourceLocator>
 
 			<inspire_common:ResourceLocator>
-				<inspire_common:URL>$PROTOCOL://$HOST:$PORT$SERVLET</inspire_common:URL>
+				<inspire_common:URL>$PROTOCOL://$HOST$PORT$SERVLET</inspire_common:URL>
 				<inspire_common:MediaType>text/html</inspire_common:MediaType>
 			</inspire_common:ResourceLocator>
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.