Author: ogusakov
Date: Tue Dec 16 10:23:31 2008
New Revision: 727105
URL: http://svn.apache.org/viewvc?rev=727105&view=rev
Log:
[MERCURY-59] - trying to apply Maven coding conventions
Modified:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Messages.properties
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryUpdateIntervalPolicy.java
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/AuthenticatingTestServer.java
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SimpleTestServer.java
Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml?rev=727105&r1=727104&r2=727105&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml Tue Dec 16
10:23:31 2008
@@ -23,28 +23,39 @@
<merc:repo id="localRepo" dir="${local.repo.dir}"/>
<merc:repo id="central" url="http://repo1.maven.org/maven2"/>
</merc:config>
-
+
+ <merc:config id="config-bad-auth">
+ <merc:repo id="localRepo" dir="${local.repo.dir}"/>
+ <merc:repo id="central" url="http://localhost:50000/maven2"/>
+ </merc:config>
+
+ <merc:config id="config-auth">
+ <merc:auth id="test-auth" name="foo" pass="bar"/>
+ <merc:repo id="localRepo" dir="${local.repo.dir}"/>
+ <merc:repo id="central" url="http://localhost:50000/maven2";
authid="test-auth">
+ </merc:repo>
+ </merc:config>
+
<property name="local.verify.dir"
value="${basedir}/target/test-verify-repo"/>
<delete dir="${local.verify.dir}"/>
<mkdir dir="${local.verify.dir}"/>
<merc:config id="verification-conf">
-
+
<merc:repo id="localVerifyRepo" dir="${local.verify.dir}">
-
+
<merc:verifywrite type="pgp">
<property name="keyring"
value="${basedir}/target/test-classes/pgp/secring.gpg"/>
<property name="pass" value="testKey82"/>
<property name="key" value="0EDB5D91141BC4F2"/>
</merc:verifywrite>
-
+
<merc:verifyread type="pgp">
<property name="keyring"
value="${basedir}/target/test-classes/pgp/pubring.gpg"/>
</merc:verifyread>
</merc:repo>
-
</merc:config>
@@ -71,13 +82,45 @@
target="${compiler.version}"
/>
-
<jar destfile="${jar.target}/t.jar"
basedir="${target}"
/>
</target>
+
+ <target name="compile-bad-auth" depends="init">
+ <merc:resolve pathid="compile-path-bad-auth"
+ depid="my-libs"
+ configid="config-bad-auth"
+ />
+ </target>
+
+
+ <target name="compile-auth" depends="init">
+
+ <merc:resolve pathid="compile-path-auth"
+ depid="my-libs"
+ configid="config-auth"
+ />
+
+ <property name="cpa" refid="compile-path-auth"/>
+ <echo>compile-path-auth is ${cpa}</echo>
+
+ <javac srcdir="${src}"
+ destdir="${target}"
+ classpathref="compile-path-auth"
+ debug="on"
+ source="${compiler.version}"
+ target="${compiler.version}"
+ />
+
+ <jar destfile="${jar.target}/t-auth.jar"
+ basedir="${target}"
+ />
+
+ </target>
+
<target name="deploy" depends="compile">
<merc:write repoid="localRepo"
name="t:t:1.0"
Modified:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java?rev=727105&r1=727104&r2=727105&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
(original)
+++
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
Tue Dec 16 10:23:31 2008
@@ -40,7 +40,7 @@
public class Config
extends AbstractDataType
{
- private static final Language LANG = new DefaultLanguage( Config.class );
+ private static final Language _lang = new DefaultLanguage( Config.class );
Collection<Repo> _repos;
@@ -73,7 +73,7 @@
{
File cf = new File( a._certfile );
if( ! cf.exists() )
- throw new BuildException( LANG.getMessage( "config.no.cert.file",
a._certfile ) );
+ throw new BuildException( _lang.getMessage( "config.no.cert.file",
a._certfile ) );
try
{
@@ -252,14 +252,14 @@
Auth au = null;
if( _auths == null )
- throw new BuildException( LANG.getMessage( "config.no.auths",
_authid ) );
+ throw new BuildException( _lang.getMessage( "config.no.auths",
_authid ) );
for( Auth a : _auths )
if( _authid.equals( a.getId() ) )
au = a;
if( au == null )
- throw new BuildException( LANG.getMessage(
"config.no.auth.for.id", _authid ) );
+ throw new BuildException( _lang.getMessage(
"config.no.auth.for.id", _authid ) );
Credentials serverCred = createCredentials( au );
@@ -271,14 +271,14 @@
Auth au = null;
if( _auths == null )
- throw new BuildException( LANG.getMessage(
"config.no.proxy.auths", _proxyauthid ) );
+ throw new BuildException( _lang.getMessage(
"config.no.proxy.auths", _proxyauthid ) );
for( Auth a : _auths )
if( _proxyauthid.equals( a.getId() ) )
au = a;
if( au == null )
- throw new BuildException( LANG.getMessage(
"config.no.proxy.auth.for.id", _proxyauthid ) );
+ throw new BuildException( _lang.getMessage(
"config.no.proxy.auth.for.id", _proxyauthid ) );
Credentials proxyCred = createCredentials( au );
@@ -298,7 +298,7 @@
}
}
-
+
public class Auth
extends AbstractDataType
{
@@ -360,17 +360,17 @@
throws BuildException
{
if( _type == null )
- throw new BuildException( LANG.getMessage(
"config.repo.verifier.no.type" ) );
+ throw new BuildException( _lang.getMessage(
"config.repo.verifier.no.type" ) );
if( _properties == null || _properties.isEmpty() )
- throw new BuildException( LANG.getMessage(
"config.repo.verifier.no.properties", _type ) );
+ throw new BuildException( _lang.getMessage(
"config.repo.verifier.no.properties", _type ) );
if( PGP.equals( _type ) )
{
String keyRing = _properties.get( "keyring" );
if( keyRing == null )
- throw new BuildException( LANG.getMessage(
"config.repo.verifier.pgp.no.keyring" ) );
+ throw new BuildException( _lang.getMessage(
"config.repo.verifier.pgp.no.keyring" ) );
String pass = _properties.get( "pass" );
@@ -395,7 +395,7 @@
String keyId = _properties.get( "key" );
if( keyId == null || keyId.length() != 16 )
- throw new BuildException( LANG.getMessage(
"config.repo.verifier.pgp.bad.keyid", keyId, keyRing ) );
+ throw new BuildException( _lang.getMessage(
"config.repo.verifier.pgp.bad.keyid", keyId, keyRing ) );
try
{
@@ -420,7 +420,7 @@
return fac;
}
- throw new BuildException( LANG.getMessage(
"config.repo.verifier.bad.type", _type ) );
+ throw new BuildException( _lang.getMessage(
"config.repo.verifier.bad.type", _type ) );
}
}
Modified:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Messages.properties
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Messages.properties?rev=727105&r1=727104&r2=727105&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Messages.properties
(original)
+++
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Messages.properties
Tue Dec 16 10:23:31 2008
@@ -16,6 +16,7 @@
vr.error=errors reading dependencies: {0}
empty.map=internal error - please report to the authors: bucket map cannot be
empty at this juncture - found {0}
empty.map.2=internal error 2 - please report to the authors: bucket map cannot
be empty at this juncture - found {0}
+resolve.cannot.read=cannot read artifacts from any repository in config {0}.
Query is: {1}
write.repo.id.mandatory=repo id is mandatory for write task - none supplied
write.repo.not.found=Repository {0} not yet declared in the build file.
Modified:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java?rev=727105&r1=727104&r2=727105&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
(original)
+++
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
Tue Dec 16 10:23:31 2008
@@ -31,12 +31,10 @@
public class ResolveTask
extends AbstractAntTask
{
- private static final Language LANG = new DefaultLanguage( ResolveTask.class
);
+ private static final Language _lang = new DefaultLanguage( ResolveTask.class
);
- public static final String TASK_NAME = LANG.getMessage( "resolve.task.name"
);
- public static final String TASK_DESC = LANG.getMessage( "resolve.task.desc"
);
-
- private boolean _transitive = true;
+ public static final String TASK_NAME = _lang.getMessage( "resolve.task.name"
);
+ public static final String TASK_DESC = _lang.getMessage( "resolve.task.desc"
);
private String _pathId;
@@ -69,7 +67,7 @@
{
if( _configId == null )
{
- throwIfEnabled( LANG.getMessage( "config.id.mandatory" ) );
+ throwIfEnabled( _lang.getMessage( "config.id.mandatory" ) );
return;
}
@@ -77,13 +75,13 @@
if( so == null )
{
- throwIfEnabled( LANG.getMessage( "config.id.object.null", _configId ) );
+ throwIfEnabled( _lang.getMessage( "config.id.object.null", _configId ) );
return;
}
if( ! Config.class.isAssignableFrom( so.getClass() ) )
{
- throwIfEnabled( LANG.getMessage( "config.id.object.wrong", _configId,
so.getClass().getName() ) );
+ throwIfEnabled( _lang.getMessage( "config.id.object.wrong", _configId,
so.getClass().getName() ) );
return;
}
@@ -91,7 +89,7 @@
if( Util.isEmpty( _pathId ) && Util.isEmpty( _pathId ) )
{
- throwIfEnabled( LANG.getMessage("no.path.ref") );
+ throwIfEnabled( _lang.getMessage("no.path.ref") );
return;
}
@@ -99,7 +97,7 @@
if( _depId == null )
{
- throwIfEnabled( LANG.getMessage( "no.dep.id" ) );
+ throwIfEnabled( _lang.getMessage( "no.dep.id" ) );
return;
}
@@ -107,13 +105,13 @@
if( d == null )
{
- throwIfEnabled( LANG.getMessage( "no.dep", _depId ) );
+ throwIfEnabled( _lang.getMessage( "no.dep", _depId ) );
return;
}
- if( ! Dep.class.isAssignableFrom( d.getClass() ) )
+ if( ! Dep.class.isAssignableFrom( d.getClass() ) )
{
- throwIfEnabled( LANG.getMessage( "bad.dep", _depId,
d.getClass().getName(), Dep.class.getName() ) );
+ throwIfEnabled( _lang.getMessage( "bad.dep", _depId,
d.getClass().getName(), Dep.class.getName() ) );
return;
}
@@ -125,7 +123,7 @@
{
if( getProject().getReference( _pathId ) != null )
{
- throwIfEnabled( LANG.getMessage( "path.exists", _pathId ) );
+ throwIfEnabled( _lang.getMessage( "path.exists", _pathId ) );
return;
}
}
@@ -135,7 +133,7 @@
if( p == null )
{
- throwIfEnabled( LANG.getMessage( "no.path.ref", _refPathId ) );
+ throwIfEnabled( _lang.getMessage( "no.path.ref", _refPathId ) );
return;
}
@@ -161,9 +159,12 @@
ArtifactResults aRes = vr.readArtifacts( res );
- if( aRes.hasExceptions() )
+ if( aRes == null )
+ throw new BuildException( _lang.getMessage( "resolve.cannot.read",
_configId, res.toString() ) );
+
+ if( aRes == null || aRes.hasExceptions() )
{
- throwIfEnabled( LANG.getMessage( "vr.error",
aRes.getExceptions().toString() ) );
+ throwIfEnabled( _lang.getMessage( "vr.error",
aRes.getExceptions().toString() ) );
return;
}
@@ -180,7 +181,7 @@
{
List<Artifact> artifacts = resMap.get( key );
- if( !Util.isEmpty( artifacts ) )
+ if( !Util.isEmpty( artifacts ) )
for( Artifact a : artifacts )
{
if( dir == null )
@@ -231,11 +232,6 @@
this._configId = configid;
}
- public void setTransitive( boolean val )
- {
- this._transitive = val;
- }
-
public void setPathid( String pathId )
{
this._pathId = pathId;
Modified:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java?rev=727105&r1=727104&r2=727105&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java
(original)
+++
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java
Tue Dec 16 10:23:31 2008
@@ -2,6 +2,7 @@
import java.io.File;
+import org.apache.maven.mercury.spi.http.server.AuthenticatingTestServer;
import org.apache.maven.mercury.spi.http.server.SimpleTestServer;
import org.apache.maven.mercury.util.FileUtil;
import org.apache.tools.ant.BuildFileTest;
@@ -20,6 +21,7 @@
extends BuildFileTest
{
static final String _localRepoDir = "./target/repo";
+ static File _localRepoDirFile;
static final String _writeRepoDir = "./target/test-repo";
static File _writeRepoDirFile;
@@ -34,6 +36,7 @@
static File _jarDirFile;
static final String _remoteRepoDir = "./target/test-classes/remoteRepo";
+ static File _remoteRepoDirFile;
static final String _remoteRepoUrlPrefix = "http://localhost:";;
static final String _remoteRepoUrlSufix = "/repo";
@@ -41,6 +44,9 @@
SimpleTestServer _jetty;
String _port;
+
+ AuthenticatingTestServer _secureJetty;
+ String _securedPort;
Resolver _resolver;
Config _config;
@@ -95,16 +101,16 @@
_config = new Config();
_config.setId( "conf" );
- File lrDir = new File( _localRepoDir );
- FileUtil.delete( lrDir );
- lrDir.mkdirs();
+ _localRepoDirFile = new File( _localRepoDir );
+ FileUtil.delete( _localRepoDirFile );
+ _localRepoDirFile.mkdirs();
Config.Repo localRepo = _config.createRepo();
localRepo.setId( "localRepo" );
localRepo.setDir( _localRepoDir );
- File rrDir = new File( _remoteRepoDir );
- _jetty = new SimpleTestServer( rrDir, _remoteRepoUrlSufix );
+ _remoteRepoDirFile = new File( _remoteRepoDir );
+ _jetty = new SimpleTestServer( _remoteRepoDirFile, _remoteRepoUrlSufix );
_jetty.start();
_port = ""+_jetty.getPort();
@@ -125,7 +131,7 @@
System.setProperty( "ant.home", ".src/test/apache-ant-1.6.5" );
- configureProject("build.xml");
+ configureProject( "build.xml" );
_writeRepoDirFile = new File( _writeRepoDir );
FileUtil.delete( _writeRepoDirFile );
@@ -216,6 +222,77 @@
assertTrue( jar.exists() );
}
//-----------------------------------
+ public void testBadAuthRepo()
+ throws Exception
+ {
+ try
+ {
+ String title = "compile-auth";
+ System.out.println("========> start "+title);
+ System.out.flush();
+
+ _secureJetty = new AuthenticatingTestServer( 50000, _remoteRepoDirFile,
"/maven2" );
+ _secureJetty.start();
+
+ try
+ {
+ executeTarget("compile-bad-auth");
+ fail( "accessing authenticated repo without password succeded -
failing test" );
+ }
+ catch( Exception e )
+ {
+ System.out.println("Expected exception: "+e.getMessage() );
+ }
+ }
+ finally
+ {
+ if( _secureJetty != null )
+ try
+ {
+ _secureJetty.stop();
+ _secureJetty.destroy();
+ }
+ catch( Exception e ){}
+ }
+ }
+ //-----------------------------------
+ public void testAuthRepo()
+ throws Exception
+ {
+ try
+ {
+ String title = "compile-auth";
+ System.out.println("========> start "+title);
+ System.out.flush();
+
+ File af = new File( _compileDirFile, "T.class" );
+
+ assertFalse( af.exists() );
+
+ File jar = new File( _jarDirFile, "t-auth.jar" );
+
+ assertFalse( jar.exists() );
+
+ _secureJetty = new AuthenticatingTestServer( 50000, _remoteRepoDirFile,
"/maven2" );
+ _secureJetty.start();
+
+ executeTarget("compile-auth");
+
+ assertTrue( af.exists() );
+ assertTrue( jar.exists() );
+ }
+ finally
+ {
+ if( _secureJetty != null )
+ try
+ {
+ _secureJetty.stop();
+ _secureJetty.destroy();
+ }
+ catch( Exception e ){}
+ }
+ }
+ //-----------------------------------
public void testWriteToRepository()
{
String title = "write";
Modified:
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java?rev=727105&r1=727104&r2=727105&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
(original)
+++
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
Tue Dec 16 10:23:31 2008
@@ -59,8 +59,8 @@
{
public static final ArtifactMetadata DUMMY_ROOT = new
ArtifactMetadata("__fake:__fake:1.0");
- private static final Language LANG = new
DefaultLanguage(DependencyTreeBuilder.class);
- private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger(
DependencyTreeBuilder.class );
+ private static final Language _lang = new
DefaultLanguage(DependencyTreeBuilder.class);
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger(
DependencyTreeBuilder.class );
private Collection<MetadataTreeArtifactFilter> _filters;
private List<Comparator<MetadataTreeNode>> _comparators;
@@ -158,7 +158,7 @@
throws MetadataTreeException
{
if( Util.isEmpty( startMDs ) )
- throw new MetadataTreeException( LANG.getMessage( "empty.md.collection")
);
+ throw new MetadataTreeException( _lang.getMessage(
"empty.md.collection") );
List<MetadataTreeNode> deps = new ArrayList<MetadataTreeNode>(
startMDs.size() );
@@ -178,7 +178,11 @@
for( MetadataTreeNode kid : deps )
root.addChild( kid );
- return resolveConflicts( root );
+ List<ArtifactMetadata> res = resolveConflicts( root );
+
+ res.remove( DUMMY_ROOT );
+
+ return res;
}
//-----------------------------------------------------
private MetadataTreeNode createNode( ArtifactBasicMetadata nodeMD,
MetadataTreeNode parent, ArtifactBasicMetadata nodeQuery, ArtifactScopeEnum
globalScope )
@@ -203,7 +207,7 @@
mr = _reader.readDependencies( nodeMD );
if( mr == null )
- throw new MetadataTreeException( LANG.getMessage(
"artifact.md.not.found", nodeMD.toString() ) );
+ throw new MetadataTreeException( _lang.getMessage(
"artifact.md.not.found", nodeMD.toString() ) );
MetadataTreeNode node = new MetadataTreeNode( mr, parent, nodeQuery );
@@ -233,8 +237,8 @@
for( ArtifactBasicMetadata md : dependencies )
{
-if( LOG.isDebugEnabled() )
- LOG.debug("node "+nodeQuery+", dep "+md );
+if( _log.isDebugEnabled() )
+ _log.debug("node "+nodeQuery+", dep "+md );
List<ArtifactBasicMetadata> versions = expandedDeps.get( md );
if( versions == null || versions.size() < 1 )
@@ -370,7 +374,7 @@
throws MetadataTreeException
{
if( root == null )
- throw new MetadataTreeException(LANG.getMessage( "empty.tree" ));
+ throw new MetadataTreeException(_lang.getMessage( "empty.tree" ));
try
{
@@ -393,7 +397,7 @@
throws MetadataTreeException
{
if( root == null )
- throw new MetadataTreeException(LANG.getMessage( "empty.tree" ));
+ throw new MetadataTreeException(_lang.getMessage( "empty.tree" ));
try
{
Modified:
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryUpdateIntervalPolicy.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryUpdateIntervalPolicy.java?rev=727105&r1=727104&r2=727105&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryUpdateIntervalPolicy.java
(original)
+++
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryUpdateIntervalPolicy.java
Tue Dec 16 10:23:31 2008
@@ -35,7 +35,7 @@
public class RepositoryUpdateIntervalPolicy
implements RepositoryUpdatePolicy
{
- private static final Language LANG = new DefaultLanguage(
RepositoryUpdateIntervalPolicy.class );
+ private static final Language _lang = new DefaultLanguage(
RepositoryUpdateIntervalPolicy.class );
public static final String UPDATE_POLICY_NAME_NEVER = "never";
@@ -81,7 +81,7 @@
public void init( String policy )
{
if( Util.isEmpty( policy ) )
- throw new IllegalArgumentException( LANG.getMessage( "empty.policy",
policy ));
+ throw new IllegalArgumentException( _lang.getMessage( "empty.policy",
policy ));
if( policy.startsWith( UPDATE_POLICY_NAME_ALWAYS ) )
interval = 0L;
@@ -93,12 +93,12 @@
{
int len = policy.length();
if( len <= UPDATE_POLICY_INTERVAL_LENGTH )
- throw new IllegalArgumentException( LANG.getMessage(
"bad.interval.policy", policy ));
+ throw new IllegalArgumentException( _lang.getMessage(
"bad.interval.policy", policy ));
interval = Integer.parseInt( policy.substring( len-1 ) ) * 60000L;
}
else
- throw new IllegalArgumentException( LANG.getMessage( "bad.policy",
policy ));
+ throw new IllegalArgumentException( _lang.getMessage( "bad.policy",
policy ));
}
public boolean timestampExpired( long lastUpdateMillis )
@@ -121,12 +121,4 @@
return res;
}
- public static void main(
- String[] args )
- {
- RepositoryUpdateIntervalPolicy up = new
RepositoryUpdateIntervalPolicy("interval2");
-
- System.out.println("Interval is "+up.interval);
- }
-
}
Modified:
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/AuthenticatingTestServer.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/AuthenticatingTestServer.java?rev=727105&r1=727104&r2=727105&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/AuthenticatingTestServer.java
(original)
+++
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/AuthenticatingTestServer.java
Tue Dec 16 10:23:31 2008
@@ -18,39 +18,53 @@
*/
package org.apache.maven.mercury.spi.http.server;
+import java.io.File;
+
import org.mortbay.jetty.security.BasicAuthenticator;
import org.mortbay.jetty.security.Constraint;
import org.mortbay.jetty.security.ConstraintMapping;
import org.mortbay.jetty.security.HashUserRealm;
import org.mortbay.jetty.security.SecurityHandler;
-public class AuthenticatingTestServer extends SimpleTestServer
+public class AuthenticatingTestServer
+extends SimpleTestServer
{
private static final String __username = "foo";
private static final String __password = "bar";
private static final String __role = "foomeister";
+ private void init()
+ {
+ HashUserRealm realm = new HashUserRealm();
+ realm.put (__username, __password);
+ realm.addUserToRole(__username, __role);
+ realm.setName("foorealm");
+
+ SecurityHandler securityHandler = new SecurityHandler();
+ securityHandler.setAuthenticator(new BasicAuthenticator());
+ securityHandler.setUserRealm(realm);
+ Constraint constraint = new Constraint();
+ constraint.setAuthenticate(true);
+ constraint.setRoles(new String[]{__role});
+ ConstraintMapping cm = new ConstraintMapping();
+ cm.setConstraint(constraint);
+ cm.setPathSpec("/*");
+ securityHandler.setConstraintMappings(new ConstraintMapping[]{cm});
+ context.addHandler(securityHandler);
+ }
+
+ public AuthenticatingTestServer( int port, File localBase, String
remotePathFragment )
+ throws Exception
+ {
+ super( port, localBase, remotePathFragment );
+ init();
+ }
+
public AuthenticatingTestServer()
throws Exception
{
- super();
-
- HashUserRealm realm = new HashUserRealm();
- realm.put (__username, __password);
- realm.addUserToRole(__username, __role);
- realm.setName("foorealm");
-
- SecurityHandler securityHandler = new SecurityHandler();
- securityHandler.setAuthenticator(new BasicAuthenticator());
- securityHandler.setUserRealm(realm);
- Constraint constraint = new Constraint();
- constraint.setAuthenticate(true);
- constraint.setRoles(new String[]{__role});
- ConstraintMapping cm = new ConstraintMapping();
- cm.setConstraint(constraint);
- cm.setPathSpec("/*");
- securityHandler.setConstraintMappings(new ConstraintMapping[]{cm});
- context.addHandler(securityHandler);
+ super();
+ init();
}
public String getUsername()
Modified:
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SimpleTestServer.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SimpleTestServer.java?rev=727105&r1=727104&r2=727105&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SimpleTestServer.java
(original)
+++
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/test/java/org/apache/maven/mercury/spi/http/server/SimpleTestServer.java
Tue Dec 16 10:23:31 2008
@@ -32,20 +32,35 @@
public class SimpleTestServer
extends Server
{
- File base;
- Context context;
+
+ final static String LOCAL_PATH = "/testRepo/";
+ final static String REMOTE_SEG = "/maven2/repo";
+
+ File base;
+ Context context;
+ public SimpleTestServer( int port )
+ throws Exception
+ {
+ this( port, LOCAL_PATH, REMOTE_SEG );
+ }
public SimpleTestServer()
- throws Exception
+ throws Exception
{
- this( "/testRepo/", "/maven2/repo" );
+ this( 0, LOCAL_PATH, REMOTE_SEG );
}
public SimpleTestServer( String localPathFragment, String
remotePathFragment )
- throws Exception
+ throws Exception
{
- super( 0 );
+ this( 0, localPathFragment, remotePathFragment );
+ }
+
+ public SimpleTestServer( int port, String localPathFragment, String
remotePathFragment )
+ throws Exception
+ {
+ super( port );
HandlerCollection handlers = new HandlerCollection();
setHandler( handlers );
@@ -76,9 +91,15 @@
}
public SimpleTestServer( File localBase, String remotePathFragment )
- throws Exception
+ throws Exception
+ {
+ this( 0, localBase, remotePathFragment );
+ }
+
+ public SimpleTestServer( int port, File localBase, String
remotePathFragment )
+ throws Exception
{
- super( 0 );
+ super( port );
HandlerCollection handlers = new HandlerCollection();
setHandler( handlers );
