[jboss-cvs] JBossAS SVN: r110635 - in projects/security/security-negotiation/branches/dlofthouse/SECURITY-568: assembly/src/assembly and 4 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Feb 11 09:47:33 EST 2011


Author: darran.lofthouse at jboss.com
Date: 2011-02-11 09:47:32 -0500 (Fri, 11 Feb 2011)
New Revision: 110635

Added:
   projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net/
Removed:
   projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/
Modified:
   projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/assembly/src/assembly/bin.xml
   projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/assembly/src/assembly/sources.xml
   projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/pom.xml
   projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net/InitSPNEGOContextAction.java
   projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net/SPNEGOServerSocket.java
   projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net/SPNEGOServerSocketFactory.java
   projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net/SPNEGOSocket.java
   projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net/SPNEGOSocketFactory.java
   projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net/SecurityActions.java
   projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/pom.xml
Log:
Initial refactoring.

Modified: projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/assembly/src/assembly/bin.xml
===================================================================
--- projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/assembly/src/assembly/bin.xml	2011-02-11 14:40:07 UTC (rev 110634)
+++ projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/assembly/src/assembly/bin.xml	2011-02-11 14:47:32 UTC (rev 110635)
@@ -11,8 +11,12 @@
     <fileSet>
       <directory>../jboss-negotiation-extras/target/classes</directory>
       <outputDirectory>/</outputDirectory>
-    </fileSet>    
+    </fileSet>
     <fileSet>
+      <directory>../jboss-negotiation-net/target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
       <directory>../jboss-negotiation-ntlm/target/classes</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>

Modified: projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/assembly/src/assembly/sources.xml
===================================================================
--- projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/assembly/src/assembly/sources.xml	2011-02-11 14:40:07 UTC (rev 110634)
+++ projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/assembly/src/assembly/sources.xml	2011-02-11 14:47:32 UTC (rev 110635)
@@ -12,14 +12,18 @@
     <fileSet>
       <directory>../jboss-negotiation-extras/src/main/java</directory>
       <outputDirectory>/</outputDirectory>
-    </fileSet>    
+    </fileSet>
     <fileSet>
+      <directory>../jboss-negotiation-net/src/main/java</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
       <directory>../jboss-negotiation-ntlm/src/main/java</directory>
       <outputDirectory>/</outputDirectory>
-    </fileSet>    
+    </fileSet>
     <fileSet>
       <directory>../jboss-negotiation-spnego/src/main/java</directory>
       <outputDirectory>/</outputDirectory>
-    </fileSet>    
+    </fileSet>
   </fileSets>
 </assembly>

Modified: projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/pom.xml
===================================================================
--- projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/pom.xml	2011-02-11 14:40:07 UTC (rev 110634)
+++ projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/pom.xml	2011-02-11 14:47:32 UTC (rev 110635)
@@ -32,8 +32,24 @@
   <!-- Do not add version information here, use ../parent/pom.xml instead -->
   <dependencies>
     <!-- Local Dependencies -->
-
+    <dependency>
+      <groupId>org.jboss.security</groupId>
+      <artifactId>jboss-negotiation-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.security</groupId>
+      <artifactId>jboss-negotiation-spnego</artifactId>
+    </dependency>
+    
     <!-- Global dependencies -->
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.mx</groupId>
+      <artifactId>jboss-j2se</artifactId>
+    </dependency>
 
   </dependencies>
 

Copied: projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net (from rev 110632, projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net)

Modified: projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net/InitSPNEGOContextAction.java
===================================================================
--- projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/InitSPNEGOContextAction.java	2011-02-11 14:29:58 UTC (rev 110632)
+++ projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net/InitSPNEGOContextAction.java	2011-02-11 14:47:32 UTC (rev 110635)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.security.negotiation.spnego.net;
+package org.jboss.security.negotiation.net;
 
 import static org.jboss.security.negotiation.Constants.SPNEGO;
 

Modified: projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net/SPNEGOServerSocket.java
===================================================================
--- projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/SPNEGOServerSocket.java	2011-02-11 14:29:58 UTC (rev 110632)
+++ projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net/SPNEGOServerSocket.java	2011-02-11 14:47:32 UTC (rev 110635)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.security.negotiation.spnego.net;
+package org.jboss.security.negotiation.net;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;

Modified: projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net/SPNEGOServerSocketFactory.java
===================================================================
--- projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/SPNEGOServerSocketFactory.java	2011-02-11 14:29:58 UTC (rev 110632)
+++ projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net/SPNEGOServerSocketFactory.java	2011-02-11 14:47:32 UTC (rev 110635)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.security.negotiation.spnego.net;
+package org.jboss.security.negotiation.net;
 
 import java.io.IOException;
 import java.net.InetAddress;

Modified: projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net/SPNEGOSocket.java
===================================================================
--- projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/SPNEGOSocket.java	2011-02-11 14:29:58 UTC (rev 110632)
+++ projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net/SPNEGOSocket.java	2011-02-11 14:47:32 UTC (rev 110635)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.security.negotiation.spnego.net;
+package org.jboss.security.negotiation.net;
 
 import java.io.IOException;
 import java.net.InetAddress;

Modified: projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net/SPNEGOSocketFactory.java
===================================================================
--- projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/SPNEGOSocketFactory.java	2011-02-11 14:29:58 UTC (rev 110632)
+++ projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net/SPNEGOSocketFactory.java	2011-02-11 14:47:32 UTC (rev 110635)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.security.negotiation.spnego.net;
+package org.jboss.security.negotiation.net;
 
 import java.io.IOException;
 import java.net.InetAddress;

Modified: projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net/SecurityActions.java
===================================================================
--- projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/net/SecurityActions.java	2011-02-11 14:29:58 UTC (rev 110632)
+++ projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/jboss-negotiation-net/src/main/java/org/jboss/security/negotiation/net/SecurityActions.java	2011-02-11 14:47:32 UTC (rev 110635)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.security.negotiation.spnego.net;
+package org.jboss.security.negotiation.net;
 
 import java.security.AccessController;
 import java.security.Principal;

Modified: projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/pom.xml
===================================================================
--- projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/pom.xml	2011-02-11 14:40:07 UTC (rev 110634)
+++ projects/security/security-negotiation/branches/dlofthouse/SECURITY-568/pom.xml	2011-02-11 14:47:32 UTC (rev 110635)
@@ -17,6 +17,7 @@
      <module>parent</module>
      <module>jboss-negotiation-common</module>
      <module>jboss-negotiation-extras</module>
+     <module>jboss-negotiation-net</module>
      <module>jboss-negotiation-ntlm</module>
      <module>jboss-negotiation-spnego</module>
      <module>jboss-negotiation-toolkit</module>



More information about the jboss-cvs-commits mailing list