Menu
▾
▴
[Unicore-cvs-commits] SF.net SVN: unicore:[5913] gateway/trunk
|
From: <bsc...@us...> - 2009-12-14 09:56:30
|
Revision: 5913
http://unicore.svn.sourceforge.net/unicore/?rev=5913&view=rev
Author: bschuller
Date: 2009-12-14 09:56:07 +0000 (Mon, 14 Dec 2009)
Log Message:
-----------
update jetty version; fix test failure; use webdav for mvn deploy
Modified Paths:
--------------
gateway/trunk/Changes.txt
gateway/trunk/pom.xml
gateway/trunk/src/main/java/eu/unicore/gateway/Gateway.java
gateway/trunk/src/main/java/eu/unicore/gateway/properties/GatewayProperties.java
gateway/trunk/src/main/java/eu/unicore/gateway/properties/RProperties.java
gateway/trunk/src/test/java/eu/unicore/gateway/TestServer.java
Modified: gateway/trunk/Changes.txt
===================================================================
--- gateway/trunk/Changes.txt 2009-12-14 09:04:59 UTC (rev 5912)
+++ gateway/trunk/Changes.txt 2009-12-14 09:56:07 UTC (rev 5913)
@@ -2,7 +2,7 @@
# Change log for the UNICORE 6 Gateway
#
-6.2.3
+6.3.0
- a new implementation of POST method processing, faster and less error prone, fixed bug 2547272
- SOAP faults are now standard complaint.
- Chunked HTTP dispatch is really configurable now (config option was ignored up to now, and
@@ -15,6 +15,7 @@
http.connection.maxPerService
- major code cleanup
- configuration files need not be in "conf/" any more (fix sf bug 2883175)
+ - update to Jetty 6.1.22
6.2.2
- allow to configure HTTP protocol details ("connection: close" and
Modified: gateway/trunk/pom.xml
===================================================================
--- gateway/trunk/pom.xml 2009-12-14 09:04:59 UTC (rev 5912)
+++ gateway/trunk/pom.xml 2009-12-14 09:56:07 UTC (rev 5913)
@@ -113,17 +113,14 @@
<repository>
<id>vsgc-public</id>
<name>VSGC repository</name>
- <url>
- scp://zam904.zam.kfa-juelich.de/srv/www/htdocs/maven
+ <url>dav:http://zam904.zam.kfa-juelich.de/maven
</url>
</repository>
<!-- use the following if you ARE using a snapshot version. -->
<snapshotRepository>
<id>vsgc-public-snapshot</id>
<name>VSGC SNAPSHOT Repository</name>
- <url>
- scp://zam904.zam.kfa-juelich.de/srv/www/htdocs/maven
- </url>
+ <url>dav:http://zam904.zam.kfa-juelich.de/maven</url>
</snapshotRepository>
<!-- where the website is deployed -->
<site>
Modified: gateway/trunk/src/main/java/eu/unicore/gateway/Gateway.java
===================================================================
--- gateway/trunk/src/main/java/eu/unicore/gateway/Gateway.java 2009-12-14 09:04:59 UTC (rev 5912)
+++ gateway/trunk/src/main/java/eu/unicore/gateway/Gateway.java 2009-12-14 09:56:07 UTC (rev 5913)
@@ -32,6 +32,7 @@
import java.io.File;
import java.io.FileNotFoundException;
import java.net.URI;
+import java.net.URISyntaxException;
import java.util.Date;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@@ -217,12 +218,17 @@
PropertyConfigurator.configure(logConfig);
}
};
- FileWatcher fw = new FileWatcher(new File(logConfig),r);
+ File logProperties=logConfig.startsWith("file:/")?new File(new URI(logConfig)):new File(logConfig);
+ FileWatcher fw = new FileWatcher(logProperties,r);
Executors.newSingleThreadScheduledExecutor().scheduleWithFixedDelay(fw, 5, 5, TimeUnit.SECONDS);
} catch(FileNotFoundException fex)
{
log.warn("Log configuration file <"+logConfig+"> not found.");
}
+ catch(URISyntaxException use)
+ {
+ log.warn("Not a valid URI: <"+logConfig+">");
+ }
}
Modified: gateway/trunk/src/main/java/eu/unicore/gateway/properties/GatewayProperties.java
===================================================================
--- gateway/trunk/src/main/java/eu/unicore/gateway/properties/GatewayProperties.java 2009-12-14 09:04:59 UTC (rev 5912)
+++ gateway/trunk/src/main/java/eu/unicore/gateway/properties/GatewayProperties.java 2009-12-14 09:56:07 UTC (rev 5913)
@@ -57,7 +57,7 @@
public static final String KEY_REG_ENABLED = "registration.enable";
public static final String KEY_WEBPAGE_DISABLE = "webpage.disable";
public static final String KEY_PROXY_AUTH = "proxyAuthentication";
- public static final String KEY_PROTOCOL_PLAGIN_PFX = "protocolPlugin.";
+ public static final String KEY_PROTOCOL_PLUGIN_PFX = "protocolPlugin.";
public static final String KEY_PROXY_VALIDATOR = "proxyValidator";
public static final String KEY_REG_INCL = "registration.allow";
public static final String KEY_REG_EXCL = "registration.deny";
@@ -181,7 +181,7 @@
*/
public String getProtocolPluginHandler(String name)
{
- String pv = getStringProperty(KEY_PROTOCOL_PLAGIN_PFX + name.toUpperCase(), "");
+ String pv = getStringProperty(KEY_PROTOCOL_PLUGIN_PFX + name.toUpperCase());
return pv;
}
Modified: gateway/trunk/src/main/java/eu/unicore/gateway/properties/RProperties.java
===================================================================
--- gateway/trunk/src/main/java/eu/unicore/gateway/properties/RProperties.java 2009-12-14 09:04:59 UTC (rev 5912)
+++ gateway/trunk/src/main/java/eu/unicore/gateway/properties/RProperties.java 2009-12-14 09:56:07 UTC (rev 5913)
@@ -72,9 +72,6 @@
protected String getStringProperty(String key)
{
- if (!mandatory.contains(key))
- throw new RuntimeException("Tried to get " + key + " property as " +
- "a required property, while it is not in the required set.");
return properties.getProperty(key);
}
Modified: gateway/trunk/src/test/java/eu/unicore/gateway/TestServer.java
===================================================================
--- gateway/trunk/src/test/java/eu/unicore/gateway/TestServer.java 2009-12-14 09:04:59 UTC (rev 5912)
+++ gateway/trunk/src/test/java/eu/unicore/gateway/TestServer.java 2009-12-14 09:56:07 UTC (rev 5913)
@@ -43,7 +43,10 @@
os.write(data);
os.flush();
String line=br.readLine();
- if(line!=null)System.out.println("recv : "+line);
+ if(line!=null){
+ System.out.println("recv : "+line);
+ assertTrue(line.contains("Testdata"));
+ }
}
}
public String getProtocol(){return "ECHO";}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|