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/11/04 22:28:51 UTC
svn commit: r1197792 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/
archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources...
Author: olamy
Date: Fri Nov 4 21:28:51 2011
New Revision: 1197792
URL: http://svn.apache.org/viewvc?rev=1197792&view=rev
Log:
fix consumer archetype
Added:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/resources/
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/resources/spring-context.xml
- copied, changed from r1197791, archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.xml
- copied, changed from r1197791, archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/goal.txt
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml?rev=1197792&r1=1197791&r2=1197792&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml Fri Nov 4 21:28:51 2011
@@ -7,7 +7,7 @@
<version>${version}</version>
<packaging>jar</packaging>
<name>Simple Archiva Consumer</name>
- <url>http://maven.apache.org</url>
+ <url>http://archiva.apache.org</url>
<description>
This is a simple consumer component which demonstrates how a
component can be plugged in Archiva.
@@ -48,12 +48,72 @@
<version>4.9</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-admin-default</artifactId>
+ <version>${archiva.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-store-jcr</artifactId>
+ <version>${archiva.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>2.3.0</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.redback</groupId>
+ <artifactId>redback-common-test-resources</artifactId>
+ <scope>test</scope>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.redback</groupId>
+ <artifactId>redback-rbac-memory</artifactId>
+ <scope>test</scope>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.redback</groupId>
+ <artifactId>redback-rbac-cached</artifactId>
+ <scope>test</scope>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.redback</groupId>
+ <artifactId>redback-rbac-role-manager</artifactId>
+ <scope>test</scope>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
<executions>
<execution>
<id>package</id>
@@ -61,7 +121,7 @@
<configuration>
<tasks>
<echo>
- Remember to add the the following to the knownconsumers section in ~/.m2/archiva.xml
+ Remember to add the the following to the knownconsumers section in your archiva.xml file
<knownContentConsumer>simple-artifact-consumer</knownContentConsumer>
</echo>
</tasks>
@@ -75,11 +135,26 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.10</version>
+ <configuration>
+ <systemPropertyVariables>
+ <appserver.base>${project.build.directory}/appserver-base</appserver.base>
+ <archiva.user.configFileName>${basedir}/target/archiva.xml</archiva.user.configFileName>
+ <test.resources.path>${project.build.testOutputDirectory}</test.resources.path>
+ <redback.jdbc.url>jdbc:derby:memory:users-test;create=true</redback.jdbc.url>
+ <redback.jdbc.driver.name>org.apache.derby.jdbc.EmbeddedDriver</redback.jdbc.driver.name>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</build>
<repositories>
@@ -93,5 +168,16 @@
<enabled>true</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>redback.snapshots</id>
+ <name>Codehaus Redback Snapshots Repository</name>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
</project>
Copied: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/resources/spring-context.xml (from r1197791, archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/resources/spring-context.xml?p2=archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/resources/spring-context.xml&p1=archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml&r1=1197791&r2=1197792&rev=1197792&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/resources/spring-context.xml Fri Nov 4 21:28:51 2011
@@ -29,6 +29,4 @@
<context:annotation-config/>
<context:component-scan base-package="$package"/>
-
-
</beans>
\ No newline at end of file
Copied: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.xml (from r1197791, archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.xml?p2=archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.xml&p1=archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml&r1=1197791&r2=1197792&rev=1197792&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.xml Fri Nov 4 21:28:51 2011
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -18,17 +17,20 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd"
- default-lazy-init="true">
- <context:annotation-config/>
- <context:component-scan base-package="$package"/>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d [%t] %-5p %c %x - %m%n"/>
+ </layout>
+ </appender>
+ <root>
+ <priority value ="info" />
+ <appender-ref ref="console" />
+ </root>
-</beans>
\ No newline at end of file
+</log4j:configuration>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml?rev=1197792&r1=1197791&r2=1197792&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml Fri Nov 4 21:28:51 2011
@@ -29,6 +29,25 @@
<context:annotation-config/>
<context:component-scan base-package="$package"/>
+ <bean id="jcr-config" class="org.apache.archiva.metadata.repository.jcr.ArchivaJcrRepositoryConfig" factory-method="create">
+ <constructor-arg value="${appserver.base}/conf/foo.xml"/>
+ <constructor-arg value="${appserver.base}/data/jcr"/>
+ </bean>
+ <bean id="jcr-repository" class="org.apache.jackrabbit.core.RepositoryImpl" destroy-method="shutdown" lazy-init="true">
+ <constructor-arg ref="jcr-config"/>
+ </bean>
+
+ <bean name="scheduler" class="org.codehaus.redback.components.scheduler.DefaultScheduler">
+ <property name="properties">
+ <props>
+ <prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
+ <prop key="org.quartz.threadPool.class">org.quartz.simpl.SimpleThreadPool</prop>
+ <prop key="org.quartz.threadPool.threadCount">2</prop>
+ <prop key="org.quartz.threadPool.threadPriority">4</prop>
+ <prop key="org.quartz.jobStore.class">org.quartz.simpl.RAMJobStore</prop>
+ </props>
+ </property>
+ </bean>
</beans>
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/goal.txt
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/goal.txt?rev=1197792&r1=1197791&r2=1197792&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/goal.txt (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/goal.txt Fri Nov 4 21:28:51 2011
@@ -1 +1 @@
-verify
\ No newline at end of file
+clean verify
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java?rev=1197792&r1=1197791&r2=1197792&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java Fri Nov 4 21:28:51 2011
@@ -28,6 +28,7 @@ import org.codehaus.plexus.redback.rbac.
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.rbac.Role;
import org.codehaus.plexus.redback.rbac.UserAssignment;
+import org.codehaus.plexus.redback.rbac.memory.MemoryResource;
import org.springframework.stereotype.Service;
import java.util.Collection;
@@ -197,43 +198,41 @@ public class TestRBACManager implements
public boolean operationExists( Operation operation )
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public Operation saveOperation( Operation operation )
throws RbacObjectInvalidException, RbacManagerException
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public Operation getOperation( String operationName )
throws RbacObjectNotFoundException, RbacManagerException
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public List<Operation> getAllOperations()
throws RbacManagerException
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public void removeOperation( Operation operation )
throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException
{
- //To change body of implemented methods use File | Settings | File Templates.
}
public void removeOperation( String operationName )
throws RbacObjectNotFoundException, RbacObjectInvalidException, RbacManagerException
{
- //To change body of implemented methods use File | Settings | File Templates.
}
public Resource createResource( String identifier )
throws RbacManagerException
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return new MemoryResource();
}
public boolean resourceExists( String identifier )
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1197792&r1=1197791&r2=1197792&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Fri Nov 4 21:28:51 2011
@@ -30,7 +30,6 @@
<name>Archiva Web :: Application</name>
<properties>
- <jettyVersion>7.4.5.v20110725</jettyVersion>
<archiva.baseRestUrl />
<rest.admin.pwd />
</properties>
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java?rev=1197792&r1=1197791&r2=1197792&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java Fri Nov 4 21:28:51 2011
@@ -37,7 +37,6 @@ public class ArchivaJcrRepositoryConfig
if ( !homeFile.exists( ) )
{
homeFile.mkdirs( );
-
}
File configurationFile = new File( file );