You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/05/29 00:14:42 UTC
svn commit: r1128782 - in /archiva/trunk: ./
archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/
Author: olamy
Date: Sat May 28 22:14:41 2011
New Revision: 1128782
URL: http://svn.apache.org/viewvc?rev=1128782&view=rev
Log:
no need of this configuration as it s done in setup and avoid null in directory as unit tests use getName for directories
Added:
archiva/trunk/init-git-svn.sh (with props)
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java?rev=1128782&r1=1128781&r2=1128782&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java Sat May 28 22:14:41 2011
@@ -23,6 +23,7 @@ import junit.framework.TestCase;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
@@ -189,6 +190,12 @@ public abstract class AbstractProxyTestC
System.out.println( "\n.\\ " + getName() + "() \\._________________________________________\n" );
}
+ @Override
+ public String getName()
+ {
+ return StringUtils.substringAfterLast( getClass().getName(), "." );
+ }
+
protected static final ArgumentsMatcher customWagonGetIfNewerMatcher = new ArgumentsMatcher()
{
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java?rev=1128782&r1=1128781&r2=1128782&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java Sat May 28 22:14:41 2011
@@ -85,7 +85,7 @@ public class MockConfiguration
createRepository( AbstractProxyTestCase.ID_DEFAULT_MANAGED, "Default Managed Repository", repoPath,
"default" );
ManagedRepositoryConfiguration repoConfig = managedDefaultRepository.getRepository();
- configuration.addManagedRepository( repoConfig );
+ //configuration.addManagedRepository( repoConfig );
configuration.setRepositoryScanning( new RepositoryScanningConfiguration(){
@Override
Added: archiva/trunk/init-git-svn.sh
URL: http://svn.apache.org/viewvc/archiva/trunk/init-git-svn.sh?rev=1128782&view=auto
==============================================================================
--- archiva/trunk/init-git-svn.sh (added)
+++ archiva/trunk/init-git-svn.sh Sat May 28 22:14:41 2011
@@ -0,0 +1,4 @@
+cd .git;wget http://git.apache.org/authors.txt; cd ..
+git config svn.authorsfile ".git/authors.txt"
+git svn init --prefix=origin/ --tags=tags --trunk=trunk --branches=branches https://svn.apache.org/repos/asf/archiva
+git svn rebase
Propchange: archiva/trunk/init-git-svn.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/init-git-svn.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: archiva/trunk/init-git-svn.sh
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Re: svn commit: r1128782 - in /archiva/trunk: ./ archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/
Posted by Brett Porter <br...@apache.org>.
On 14/06/2011, at 7:58 PM, Olivier Lamy wrote:
> I have added more details on
> http://archiva.apache.org/developers/building.html (wait sync)
That's a better place - but I was wondering if it made more sense to just put the instructions there, rather than the shell script.
Otherwise, it might become out of date like... http://svn.apache.org/viewvc/continuum/trunk/build.sh
Or someone might run it without understanding it, and not know how to handle failures (as there's no error handling :)
- Brett
>
> 2011/6/14 Brett Porter <br...@apache.org>:
>>
>> On 14/06/2011, at 6:04 PM, Olivier Lamy wrote:
>>
>>> Hello,
>>> Not really accidental, it's just a "shortcut" for people who wants to
>>> try git svn.
>>> As I have to play this script a lot : I had some issues with git svn
>>> with cygwin arghhhh :-), I have added the script to setup the clone
>>> from github or git.a.o
>>>
>>> Just do :
>>> git clone git://github.com/apache/archiva.git; cd archiva ; ./init-git-svn.sh
>>>
>>> And you have everything ready for hacking.
>>>
>>> The script contains "only" :
>>>
>>> cd .git;wget http://git.apache.org/authors.txt; cd ..
>>> git config svn.authorsfile ".git/authors.txt"
>>> git svn init --prefix=origin/ --tags=tags --trunk=trunk
>>> --branches=branches https://svn.apache.org/repos/asf/archiva
>>> git svn rebase
>>>
>>> see http://wiki.apache.org/general/GitAtApache
>>>
>>> You prefer I remove it ?
>>
>> Sorry, I was sure that that was included in the original clone from those repos - I must have added it and forgotten I did :)
>>
>> That's fine... though maybe it could go on the wiki or dev docs instead? It's just a bit more likely to bitrot in svn, or need to be copied for windows, etc. :)
>>
>> - Brett
>>
>> --
>> Brett Porter
>> brett@apache.org
>> http://brettporter.wordpress.com/
>> http://au.linkedin.com/in/brettporter
>>
>>
>>
>>
>>
>
>
>
> --
> Olivier Lamy
> http://twitter.com/olamy | http://www.linkedin.com/in/olamy
--
Brett Porter
brett@apache.org
http://brettporter.wordpress.com/
http://au.linkedin.com/in/brettporter
Re: svn commit: r1128782 - in /archiva/trunk: ./ archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/
Posted by Olivier Lamy <ol...@apache.org>.
I have added more details on
http://archiva.apache.org/developers/building.html (wait sync)
2011/6/14 Brett Porter <br...@apache.org>:
>
> On 14/06/2011, at 6:04 PM, Olivier Lamy wrote:
>
>> Hello,
>> Not really accidental, it's just a "shortcut" for people who wants to
>> try git svn.
>> As I have to play this script a lot : I had some issues with git svn
>> with cygwin arghhhh :-), I have added the script to setup the clone
>> from github or git.a.o
>>
>> Just do :
>> git clone git://github.com/apache/archiva.git; cd archiva ; ./init-git-svn.sh
>>
>> And you have everything ready for hacking.
>>
>> The script contains "only" :
>>
>> cd .git;wget http://git.apache.org/authors.txt; cd ..
>> git config svn.authorsfile ".git/authors.txt"
>> git svn init --prefix=origin/ --tags=tags --trunk=trunk
>> --branches=branches https://svn.apache.org/repos/asf/archiva
>> git svn rebase
>>
>> see http://wiki.apache.org/general/GitAtApache
>>
>> You prefer I remove it ?
>
> Sorry, I was sure that that was included in the original clone from those repos - I must have added it and forgotten I did :)
>
> That's fine... though maybe it could go on the wiki or dev docs instead? It's just a bit more likely to bitrot in svn, or need to be copied for windows, etc. :)
>
> - Brett
>
> --
> Brett Porter
> brett@apache.org
> http://brettporter.wordpress.com/
> http://au.linkedin.com/in/brettporter
>
>
>
>
>
--
Olivier Lamy
http://twitter.com/olamy | http://www.linkedin.com/in/olamy
Re: svn commit: r1128782 - in /archiva/trunk: ./ archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/
Posted by Brett Porter <br...@apache.org>.
On 14/06/2011, at 6:04 PM, Olivier Lamy wrote:
> Hello,
> Not really accidental, it's just a "shortcut" for people who wants to
> try git svn.
> As I have to play this script a lot : I had some issues with git svn
> with cygwin arghhhh :-), I have added the script to setup the clone
> from github or git.a.o
>
> Just do :
> git clone git://github.com/apache/archiva.git; cd archiva ; ./init-git-svn.sh
>
> And you have everything ready for hacking.
>
> The script contains "only" :
>
> cd .git;wget http://git.apache.org/authors.txt; cd ..
> git config svn.authorsfile ".git/authors.txt"
> git svn init --prefix=origin/ --tags=tags --trunk=trunk
> --branches=branches https://svn.apache.org/repos/asf/archiva
> git svn rebase
>
> see http://wiki.apache.org/general/GitAtApache
>
> You prefer I remove it ?
Sorry, I was sure that that was included in the original clone from those repos - I must have added it and forgotten I did :)
That's fine... though maybe it could go on the wiki or dev docs instead? It's just a bit more likely to bitrot in svn, or need to be copied for windows, etc. :)
- Brett
--
Brett Porter
brett@apache.org
http://brettporter.wordpress.com/
http://au.linkedin.com/in/brettporter
Re: svn commit: r1128782 - in /archiva/trunk: ./ archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/
Posted by Olivier Lamy <ol...@apache.org>.
Hello,
Not really accidental, it's just a "shortcut" for people who wants to
try git svn.
As I have to play this script a lot : I had some issues with git svn
with cygwin arghhhh :-), I have added the script to setup the clone
from github or git.a.o
Just do :
git clone git://github.com/apache/archiva.git; cd archiva ; ./init-git-svn.sh
And you have everything ready for hacking.
The script contains "only" :
cd .git;wget http://git.apache.org/authors.txt; cd ..
git config svn.authorsfile ".git/authors.txt"
git svn init --prefix=origin/ --tags=tags --trunk=trunk
--branches=branches https://svn.apache.org/repos/asf/archiva
git svn rebase
see http://wiki.apache.org/general/GitAtApache
You prefer I remove it ?
2011/6/14 Brett Porter <br...@apache.org>:
>
> On 29/05/2011, at 8:14 AM, olamy@apache.org wrote:
>
>> Author: olamy
>> Date: Sat May 28 22:14:41 2011
>> New Revision: 1128782
>>
>> URL: http://svn.apache.org/viewvc?rev=1128782&view=rev
>> Log:
>> no need of this configuration as it s done in setup and avoid null in directory as unit tests use getName for directories
>>
>> Added:
>> archiva/trunk/init-git-svn.sh (with props)
>
> Accidental commit?
>
> Also, why not clone from the existing one at Apache (or the github clone?) I think they retain the svn metadata
>
> - Brett
>
> --
> Brett Porter
> brett@apache.org
> http://brettporter.wordpress.com/
> http://au.linkedin.com/in/brettporter
>
>
>
>
>
--
Olivier Lamy
http://twitter.com/olamy | http://www.linkedin.com/in/olamy
Re: svn commit: r1128782 - in /archiva/trunk: ./ archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/
Posted by Brett Porter <br...@apache.org>.
On 29/05/2011, at 8:14 AM, olamy@apache.org wrote:
> Author: olamy
> Date: Sat May 28 22:14:41 2011
> New Revision: 1128782
>
> URL: http://svn.apache.org/viewvc?rev=1128782&view=rev
> Log:
> no need of this configuration as it s done in setup and avoid null in directory as unit tests use getName for directories
>
> Added:
> archiva/trunk/init-git-svn.sh (with props)
Accidental commit?
Also, why not clone from the existing one at Apache (or the github clone?) I think they retain the svn metadata
- Brett
--
Brett Porter
brett@apache.org
http://brettporter.wordpress.com/
http://au.linkedin.com/in/brettporter