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 2012/04/08 00:18:09 UTC
svn commit: r1310889 - in /archiva/redback/redback-core/trunk: redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/ redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/ r...

Author: olamy
Date: Sat Apr  7 22:18:08 2012
New Revision: 1310889

URL: http://svn.apache.org/viewvc?rev=1310889&view=rev
Log:
package move to o.a.a.r module redback-keys-memory

Added:
    archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/
    archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/
    archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/
    archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/
    archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/
    archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryAuthenticationKey.java
      - copied, changed from r1310886, archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryAuthenticationKey.java
    archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryKeyManager.java
      - copied, changed from r1310886, archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManager.java
    archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/apache/
    archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/apache/archiva/
    archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/apache/archiva/redback/
    archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/apache/archiva/redback/keys/
    archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/apache/archiva/redback/keys/memory/
    archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/apache/archiva/redback/keys/memory/MemoryKeyManagerTest.java   (with props)
Removed:
    archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryAuthenticationKey.java
    archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManager.java
    archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/codehaus/
Modified:
    archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java
    archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/resources/META-INF/spring-context.xml

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java?rev=1310889&r1=1310888&r2=1310889&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java Sat Apr  7 22:18:08 2012
@@ -24,8 +24,8 @@ import org.apache.archiva.redback.users.
 import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
 import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.codehaus.plexus.redback.keys.jdo.JdoAuthenticationKey;
-import org.codehaus.plexus.redback.keys.memory.MemoryAuthenticationKey;
-import org.codehaus.plexus.redback.keys.memory.MemoryKeyManager;
+import org.apache.archiva.redback.keys.memory.MemoryAuthenticationKey;
+import org.apache.archiva.redback.keys.memory.MemoryKeyManager;
 import org.codehaus.plexus.redback.policy.AccountLockedException;
 import org.codehaus.plexus.redback.policy.MustChangePasswordException;
 import org.codehaus.plexus.redback.system.SecuritySession;

Copied: archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryAuthenticationKey.java (from r1310886, archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryAuthenticationKey.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryAuthenticationKey.java?p2=archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryAuthenticationKey.java&p1=archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryAuthenticationKey.java&r1=1310886&r2=1310889&rev=1310889&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryAuthenticationKey.java (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryAuthenticationKey.java Sat Apr  7 22:18:08 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.keys.memory;
+package org.apache.archiva.redback.keys.memory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryKeyManager.java (from r1310886, archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManager.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryKeyManager.java?p2=archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryKeyManager.java&p1=archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManager.java&r1=1310886&r2=1310889&rev=1310889&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/codehaus/plexus/redback/keys/memory/MemoryKeyManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryKeyManager.java Sat Apr  7 22:18:08 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.keys.memory;
+package org.apache.archiva.redback.keys.memory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,6 +23,7 @@ import org.apache.archiva.redback.keys.A
 import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.apache.archiva.redback.keys.KeyManagerException;
 import org.apache.archiva.redback.keys.KeyNotFoundException;
+import org.apache.archiva.redback.keys.memory.MemoryAuthenticationKey;
 import org.codehaus.plexus.util.StringUtils;
 import org.springframework.stereotype.Service;
 

Modified: archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/resources/META-INF/spring-context.xml?rev=1310889&r1=1310888&r2=1310889&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/resources/META-INF/spring-context.xml Sat Apr  7 22:18:08 2012
@@ -29,6 +29,6 @@
 
   <context:annotation-config />
   <context:component-scan 
-    base-package="org.codehaus.plexus.redback.keys.memory"/>
+    base-package="org.apache.archiva.redback.keys.memory"/>
  
 </beans>
\ No newline at end of file

Added: archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/apache/archiva/redback/keys/memory/MemoryKeyManagerTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/apache/archiva/redback/keys/memory/MemoryKeyManagerTest.java?rev=1310889&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/apache/archiva/redback/keys/memory/MemoryKeyManagerTest.java (added)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/apache/archiva/redback/keys/memory/MemoryKeyManagerTest.java Sat Apr  7 22:18:08 2012
@@ -0,0 +1,50 @@
+package org.apache.archiva.redback.keys.memory;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.archiva.redback.keys.KeyManager;
+import org.codehaus.plexus.redback.keys.KeyManagerTestCase;
+import org.junit.Before;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+/**
+ * MemoryKeyManagerTest 
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class MemoryKeyManagerTest
+    extends KeyManagerTestCase
+{
+    @Inject @Named(value="keyManager#memory")
+    KeyManager keyManager;
+
+    @Before
+    public void setUp()
+        throws Exception
+    {
+        super.setUp();
+        
+        super.setKeyManager( keyManager );
+    }
+    
+}

Propchange: archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/apache/archiva/redback/keys/memory/MemoryKeyManagerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/test/java/org/apache/archiva/redback/keys/memory/MemoryKeyManagerTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision