You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/08/08 23:15:02 UTC
svn commit: r684096 - in /maven/sandbox/trunk/mercury:
mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/
mercury-md/mercury-md-shared/
mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/repository/
mercury-tr...
Author: ogusakov
Date: Fri Aug 8 14:15:01 2008
New Revision: 684096
URL: http://svn.apache.org/viewvc?rev=684096&view=rev
Log:
small changes for http://jira.codehaus.org/browse/MERCURY-2
Removed:
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/repository/
Modified:
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/Artifact.java
maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/pom.xml
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Credentials.java
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java
Modified: maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/Artifact.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/Artifact.java?rev=684096&r1=684095&r2=684096&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/Artifact.java (original)
+++ maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/Artifact.java Fri Aug 8 14:15:01 2008
@@ -34,6 +34,8 @@
String SNAPSHOT_VERSION = "SNAPSHOT";
+ String RELEASE_VERSION = "RELEASE";
+
Pattern VERSION_FILE_PATTERN = Pattern.compile( "^(.*)-([0-9]{8}.[0-9]{6})-([0-9]+)$" );
// TODO: into artifactScope handler
@@ -48,8 +50,6 @@
String SCOPE_SYSTEM = ArtifactScopeEnum.system.toString();
- String RELEASE_VERSION = "RELEASE";
-
String getGroupId();
String getArtifactId();
Modified: maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/pom.xml?rev=684096&r1=684095&r2=684096&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/pom.xml Fri Aug 8 14:15:01 2008
@@ -55,5 +55,12 @@
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-artifact</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Modified: maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Credentials.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Credentials.java?rev=684096&r1=684095&r2=684096&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Credentials.java (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Credentials.java Fri Aug 8 14:15:01 2008
@@ -55,6 +55,11 @@
{
return cert;
}
+
+ public boolean isCertificate()
+ {
+ return cert != null && cert.length > 1;
+ }
public void setCertificate( byte [] cert )
{
Modified: maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java?rev=684096&r1=684095&r2=684096&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java Fri Aug 8 14:15:01 2008
@@ -23,12 +23,14 @@
public class Server
{
- private String id;
- private Set<StreamObserverFactory> streamObserverFactories;
- private URL url;
- private Credentials serverCredentials;
- private URL proxy;
- private Credentials proxyCredentials;
+ private String id;
+ private Set<StreamObserverFactory> streamObserverFactories;
+ private URL url;
+ private Credentials serverCredentials;
+ private URL proxy;
+ private Credentials proxyCredentials;
+ private boolean requireEncryption = false;
+ private boolean requireTrustedServer = false;
public Server( String id, URL url )
{
@@ -36,21 +38,29 @@
this.id = id;
}
- public Server( String id, URL url, Credentials serverCredentials )
+ public Server( String id, URL url, boolean requireEncryption, boolean requireTrustedServer )
{
this( id, url );
+
+ this.requireEncryption = requireEncryption;
+ this.requireTrustedServer = requireTrustedServer;
+ }
+
+ public Server( String id, URL url, boolean requireEncryption, boolean requireTrustedServer, Credentials serverCredentials )
+ {
+ this( id, url, requireEncryption, requireTrustedServer );
this.serverCredentials = serverCredentials;
}
- public Server( String id, URL url, Credentials serverCredentials, URL proxy )
+ public Server( String id, URL url, boolean requireEncryption, boolean requireTrustedServer, Credentials serverCredentials, URL proxy )
{
- this( id, url, serverCredentials );
+ this( id, url, requireEncryption, requireTrustedServer, serverCredentials );
this.proxy = proxy;
}
- public Server( String id, URL url, Credentials serverCredentials, URL proxy, Credentials proxyCredentials )
+ public Server( String id, URL url, boolean requireEncryption, boolean requireTrustedServer, Credentials serverCredentials, URL proxy, Credentials proxyCredentials )
{
- this( id, url, serverCredentials, proxy );
+ this( id, url, requireEncryption, requireTrustedServer, serverCredentials, proxy );
this.proxyCredentials = proxyCredentials;
}
@@ -74,6 +84,11 @@
return this.proxy;
}
+ public boolean hasProxy()
+ {
+ return this.proxy != null;
+ }
+
public Credentials getProxyCredentials()
{
return this.serverCredentials;
@@ -89,4 +104,14 @@
streamObserverFactories = factories;
}
+ public boolean isRequireEncryption()
+ {
+ return requireEncryption;
+ }
+
+ public boolean isRequireTrustedServer()
+ {
+ return requireTrustedServer;
+ }
+
}