Author: jdumay
Date: Thu Dec 18 01:33:20 2008
New Revision: 727681
URL: http://svn.apache.org/viewvc?rev=727681&view=rev
Log:
Somewhat working
Modified:
archiva/branches/archiva-obr-repository/archiva-modules/archiva-base/archiva-consumers/archiva-obr-consumer/
(props changed)
archiva/branches/archiva-obr-repository/archiva-modules/archiva-base/archiva-consumers/archiva-obr-consumer/pom.xml
archiva/branches/archiva-obr-repository/archiva-modules/archiva-base/archiva-consumers/archiva-obr-consumer/src/main/java/org/apache/archiva/consumers/OBRRepositoryConsumer.java
archiva/branches/archiva-obr-repository/archiva-modules/archiva-base/archiva-consumers/archiva-obr-consumer/src/test/java/org/apache/archiva/consumers/OBRRepositoryConsumerTest.java
Propchange:
archiva/branches/archiva-obr-repository/archiva-modules/archiva-base/archiva-consumers/archiva-obr-consumer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 18 01:33:20 2008
@@ -0,0 +1 @@
+target
Modified:
archiva/branches/archiva-obr-repository/archiva-modules/archiva-base/archiva-consumers/archiva-obr-consumer/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-obr-repository/archiva-modules/archiva-base/archiva-consumers/archiva-obr-consumer/pom.xml?rev=727681&r1=727680&r2=727681&view=diff
==============================================================================
---
archiva/branches/archiva-obr-repository/archiva-modules/archiva-base/archiva-consumers/archiva-obr-consumer/pom.xml
(original)
+++
archiva/branches/archiva-obr-repository/archiva-modules/archiva-base/archiva-consumers/archiva-obr-consumer/pom.xml
Thu Dec 18 01:33:20 2008
@@ -32,10 +32,6 @@
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-database</artifactId>
</dependency>
Modified:
archiva/branches/archiva-obr-repository/archiva-modules/archiva-base/archiva-consumers/archiva-obr-consumer/src/main/java/org/apache/archiva/consumers/OBRRepositoryConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-obr-repository/archiva-modules/archiva-base/archiva-consumers/archiva-obr-consumer/src/main/java/org/apache/archiva/consumers/OBRRepositoryConsumer.java?rev=727681&r1=727680&r2=727681&view=diff
==============================================================================
---
archiva/branches/archiva-obr-repository/archiva-modules/archiva-base/archiva-consumers/archiva-obr-consumer/src/main/java/org/apache/archiva/consumers/OBRRepositoryConsumer.java
(original)
+++
archiva/branches/archiva-obr-repository/archiva-modules/archiva-base/archiva-consumers/archiva-obr-consumer/src/main/java/org/apache/archiva/consumers/OBRRepositoryConsumer.java
Thu Dec 18 01:33:20 2008
@@ -31,11 +31,8 @@
import
org.apache.maven.archiva.repository.content.ManagedDefaultRepositoryContent;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.types.FileSet;
-import org.osgi.impl.bundle.bindex.Index;
+import org.apache.tools.ant.types.selectors.FilenameSelector;
import org.osgi.impl.bundle.bindex.ant.BindexTask;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
/**
*
@@ -43,14 +40,10 @@
*/
public class OBRRepositoryConsumer
extends AbstractMonitoredConsumer
- implements KnownRepositoryContentConsumer, ApplicationContextAware
+ implements KnownRepositoryContentConsumer
{
private ManagedRepositoryContent content;
- public void setApplicationContext(ApplicationContext context) throws
BeansException {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
public String getDescription() {
return "Produces the OSGi OBR repository index";
}
@@ -84,15 +77,15 @@
throws ConsumerException
{
BindexTask task = new BindexTask();
- File temporaryBindexLocation = new File(path, ".bindex");
- temporaryBindexLocation.mkdirs();
- task.setRepositoryFile(new File(temporaryBindexLocation,
"repository.xml"));
+ File repositoryIndexFile = new File(new File(path).getParentFile(),
".repository.xml");
+ task.setRepositoryFile(repositoryIndexFile);
task.setName(content.getRepository().getName());
- task.setQuiet(true);
+ task.setQuiet(false);
task.setRoot(new File(content.getRepoRoot()));
FileSet fileSet = new FileSet();
- fileSet.setIncludesfile(new File(path));
+ fileSet.setDir(new File(path).getParentFile());
+ fileSet.setIncludes("**/*.jar");
try
{
task.execute();
@@ -101,17 +94,6 @@
{
throw new ConsumerException("Could not add jar " + path + " to obr
repository.xml", e);
}
- finally
- {
- try
- {
- FileUtils.deleteDirectory(temporaryBindexLocation);
- }
- catch (IOException e)
- {
- throw new ConsumerException(e.getMessage(), e);
- }
- }
}
}
Modified:
archiva/branches/archiva-obr-repository/archiva-modules/archiva-base/archiva-consumers/archiva-obr-consumer/src/test/java/org/apache/archiva/consumers/OBRRepositoryConsumerTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-obr-repository/archiva-modules/archiva-base/archiva-consumers/archiva-obr-consumer/src/test/java/org/apache/archiva/consumers/OBRRepositoryConsumerTest.java?rev=727681&r1=727680&r2=727681&view=diff
==============================================================================
---
archiva/branches/archiva-obr-repository/archiva-modules/archiva-base/archiva-consumers/archiva-obr-consumer/src/test/java/org/apache/archiva/consumers/OBRRepositoryConsumerTest.java
(original)
+++
archiva/branches/archiva-obr-repository/archiva-modules/archiva-base/archiva-consumers/archiva-obr-consumer/src/test/java/org/apache/archiva/consumers/OBRRepositoryConsumerTest.java
Thu Dec 18 01:33:20 2008
@@ -19,16 +19,15 @@
import java.io.File;
import java.util.Date;
+import junit.framework.TestCase;
import org.apache.commons.io.FileUtils;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.codehaus.plexus.spring.PlexusInSpringTestCase;
-import org.codehaus.plexus.spring.PlexusToSpringUtils;
/**
*
* @author jdumay
*/
-public class OBRRepositoryConsumerTest extends PlexusInSpringTestCase
+public class OBRRepositoryConsumerTest extends TestCase
{
private OBRRepositoryConsumer consumer;
@@ -43,7 +42,7 @@
File testRepoData = new File("src/test/resources/repository");
testRepo = new File("target/obrtestrepo").getAbsoluteFile();
testRepo.mkdirs();
- consumer =
(OBRRepositoryConsumer)lookup(PlexusToSpringUtils.buildSpringId(OBRRepositoryConsumer.class));
+ consumer = new OBRRepositoryConsumer();
FileUtils.copyDirectory(testRepoData, testRepo);
configuration = new ManagedRepositoryConfiguration();
configuration.setName("My Test OSGi repository");
@@ -57,7 +56,7 @@
throws Exception
{
super.tearDown();
- FileUtils.deleteDirectory(testRepo);
+ //FileUtils.deleteDirectory(testRepo);
}
public void testCreatesRepositoryXml() throws Exception
@@ -65,6 +64,8 @@
File repositoryXml = new File(configuration.getLocation(),
"repository.xml");
assertFalse("repository.xml should not exist", repositoryXml.exists());
consumer.processFile(new File(testRepo,
"./commons-codec/commons-codec/1.3.0/commons-codec-1.3.0.jar").getAbsolutePath());
+
+ assertTrue(".repository.xml iterim file should exist", new
File(testRepo, "commons-codec/commons-codec/1.3.0/.repository.xml").exists());
assertTrue("repository.xml should exist", repositoryXml.exists());
}
}
