geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r696767 - in /geronimo/gshell/trunk/gshell-remote/gshell-remote-common: pom.xml src/main/java/org/apache/geronimo/gshell/remote/crypto/CryptoContext.java src/main/java/org/apache/geronimo/gshell/remote/jaas/JaasConfigurationHelper.java
Date Thu, 18 Sep 2008 19:02:25 GMT
Author: jdillon
Date: Thu Sep 18 12:02:25 2008
New Revision: 696767

URL: http://svn.apache.org/viewvc?rev=696767&view=rev
Log:
Remove dependency on plexus

Modified:
    geronimo/gshell/trunk/gshell-remote/gshell-remote-common/pom.xml
    geronimo/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/crypto/CryptoContext.java
    geronimo/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/jaas/JaasConfigurationHelper.java

Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-common/pom.xml?rev=696767&r1=696766&r2=696767&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-common/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-common/pom.xml Thu Sep 18 12:02:25 2008
@@ -47,7 +47,12 @@
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-api</artifactId>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.geronimo.gshell.support</groupId>
+            <artifactId>gshell-spring</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.gshell.remote</groupId>
             <artifactId>gshell-whisper</artifactId>

Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/crypto/CryptoContext.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/crypto/CryptoContext.java?rev=696767&r1=696766&r2=696767&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/crypto/CryptoContext.java
(original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/crypto/CryptoContext.java
Thu Sep 18 12:02:25 2008
@@ -28,7 +28,6 @@
 
 import javax.crypto.Cipher;
 
-import org.codehaus.plexus.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,7 +36,6 @@
  *
  * @version $Rev$ $Date$
  */
-@Component(role=CryptoContext.class)
 public class CryptoContext
 {
     private final Logger log = LoggerFactory.getLogger(getClass());
@@ -46,10 +44,8 @@
     // TODO: See if we should use DSA or RSA for this...
     //
     
-    // @Configuration
     private String transformation = "RSA";
 
-    // @Configuration
     private String provider;
 
     private final KeyPair keyPair;

Modified: geronimo/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/jaas/JaasConfigurationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/jaas/JaasConfigurationHelper.java?rev=696767&r1=696766&r2=696767&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/jaas/JaasConfigurationHelper.java
(original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/jaas/JaasConfigurationHelper.java
Thu Sep 18 12:02:25 2008
@@ -21,26 +21,22 @@
 
 import java.net.URL;
 
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.PostConstruct;
+
 /**
  * ???
  *
  * @version $Rev$ $Date$
  */
-@Component(role=JaasConfigurationHelper.class)
 public class JaasConfigurationHelper
-    implements Initializable
 {
     private static final String KEY = "java.security.auth.login.config";
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    // @Configuration
     private String resourceName;
 
     public JaasConfigurationHelper(final String resourceName) {
@@ -48,8 +44,9 @@
     }
 
     public JaasConfigurationHelper() {}
-    
-    public void initialize() throws InitializationException {
+
+    @PostConstruct
+    public void init() {
         // Initialize the JAAS configuration
         String path = System.getProperty(KEY);
 



Mime
View raw message