[jboss-cvs] JBossAS SVN: r76824 - in projects/security/security-negotiation/trunk: jboss-negotiation-common and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Aug 8 08:10:33 EDT 2008


Author: darran.lofthouse at jboss.com
Date: 2008-08-08 08:10:33 -0400 (Fri, 08 Aug 2008)
New Revision: 76824

Modified:
   projects/security/security-negotiation/trunk/jboss-negotiation-common/.classpath
   projects/security/security-negotiation/trunk/jboss-negotiation-spnego/.classpath
   projects/security/security-negotiation/trunk/jboss-negotiation-spnego/.project
   projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.classpath
   projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.project
   projects/security/security-negotiation/trunk/jboss-negotiation/.classpath
   projects/security/security-negotiation/trunk/jboss-negotiation/.project
   projects/security/security-negotiation/trunk/jboss-negotiation/pom.xml
   projects/security/security-negotiation/trunk/parent/pom.xml
Log:
[SECURITY-217] Project refactoring - fix dependencies.

Modified: projects/security/security-negotiation/trunk/jboss-negotiation/.classpath
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation/.classpath	2008-08-08 12:07:10 UTC (rev 76823)
+++ projects/security/security-negotiation/trunk/jboss-negotiation/.classpath	2008-08-08 12:10:33 UTC (rev 76824)
@@ -1,10 +1,9 @@
 <classpath>
   <classpathentry kind="src" path="src/main/java"/>
   <classpathentry kind="src" path="src/resources"/>
-  <classpathentry kind="src" path="src/tests" output="target/test-classes"/>
+  <classpathentry kind="src" path="src/tests/java" output="target/test-classes"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/apache-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/jboss-common/4.2.2.GA/jboss-common-4.2.2.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/jboss-jmx/4.2.2.GA/jboss-jmx-4.2.2.GA.jar"/>
@@ -12,6 +11,4 @@
   <classpathentry kind="var" path="M2_REPO/jboss/jbosssx/4.2.2.GA/jbosssx-4.2.2.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/web/jbossweb/2.1.0.GA/jbossweb-2.1.0.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/web/servlet-api/2.1.0.GA/servlet-api-2.1.0.GA.jar"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
-  <classpathentry kind="src" path="/jboss-negotiation-ntlm"/>
 </classpath>
\ No newline at end of file

Modified: projects/security/security-negotiation/trunk/jboss-negotiation/.project
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation/.project	2008-08-08 12:07:10 UTC (rev 76823)
+++ projects/security/security-negotiation/trunk/jboss-negotiation/.project	2008-08-08 12:10:33 UTC (rev 76824)
@@ -1,9 +1,7 @@
 <projectDescription>
   <name>jboss-negotiation</name>
   <comment>JBoss Negotiation Library</comment>
-  <projects>
-    <project>jboss-negotiation-ntlm</project>
-  </projects>
+  <projects/>
   <buildSpec>
     <buildCommand>
       <name>org.eclipse.jdt.core.javabuilder</name>

Modified: projects/security/security-negotiation/trunk/jboss-negotiation/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation/pom.xml	2008-08-08 12:07:10 UTC (rev 76823)
+++ projects/security/security-negotiation/trunk/jboss-negotiation/pom.xml	2008-08-08 12:10:33 UTC (rev 76824)
@@ -50,9 +50,17 @@
       <artifactId>jbosssx</artifactId>
     </dependency>    
     <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-system</artifactId>
+    </dependency>    
+    <dependency>
       <groupId>jboss.web</groupId>
       <artifactId>jbossweb</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jboss.web</groupId>
+      <artifactId>servlet-api</artifactId>
+    </dependency>    
 
   </dependencies>
 

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-common/.classpath
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-common/.classpath	2008-08-08 12:07:10 UTC (rev 76823)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/.classpath	2008-08-08 12:10:33 UTC (rev 76824)
@@ -1,7 +1,7 @@
 <classpath>
   <classpathentry kind="src" path="src/main/java"/>
   <classpathentry kind="src" path="src/resources"/>
-  <classpathentry kind="src" path="src/tests" output="target/test-classes"/>
+  <classpathentry kind="src" path="src/tests/java" output="target/test-classes"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/apache-codec/commons-codec/1.2/commons-codec-1.2.jar"/>

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-spnego/.classpath
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-spnego/.classpath	2008-08-08 12:07:10 UTC (rev 76823)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/.classpath	2008-08-08 12:10:33 UTC (rev 76824)
@@ -6,14 +6,13 @@
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/jboss/jboss-common/4.2.2.GA/jboss-common-4.2.2.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/jbosssx/4.2.2.GA/jbosssx-4.2.2.GA.jar"/>
-  <classpathentry kind="src" path="/jboss-negotiation"/>
-  <classpathentry kind="src" path="/jboss-negotiation-ntlm"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/apache-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
+  <classpathentry kind="src" path="/jboss-negotiation"/>
   <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/jboss-jmx/4.2.2.GA/jboss-jmx-4.2.2.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/jboss-system/4.2.2.GA/jboss-system-4.2.2.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/web/jbossweb/2.1.0.GA/jbossweb-2.1.0.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/web/servlet-api/2.1.0.GA/servlet-api-2.1.0.GA.jar"/>
   <classpathentry kind="src" path="/jboss-negotiation-common"/>
+  <classpathentry kind="var" path="M2_REPO/apache-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
 </classpath>
\ No newline at end of file

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-spnego/.project
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-spnego/.project	2008-08-08 12:07:10 UTC (rev 76823)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/.project	2008-08-08 12:10:33 UTC (rev 76824)
@@ -3,7 +3,6 @@
   <comment>JBoss Negotiation Library</comment>
   <projects>
     <project>jboss-negotiation</project>
-    <project>jboss-negotiation-ntlm</project>
     <project>jboss-negotiation-common</project>
   </projects>
   <buildSpec>

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.classpath
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.classpath	2008-08-08 12:07:10 UTC (rev 76823)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.classpath	2008-08-08 12:10:33 UTC (rev 76824)
@@ -6,13 +6,12 @@
   <classpathentry kind="var" path="M2_REPO/jboss/jboss-common/4.2.2.GA/jboss-common-4.2.2.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/jbosssx/4.2.2.GA/jbosssx-4.2.2.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/web/servlet-api/2.1.0.GA/servlet-api-2.1.0.GA.jar"/>
-  <classpathentry kind="src" path="/jboss-negotiation-spnego"/>
   <classpathentry kind="src" path="/jboss-negotiation"/>
-  <classpathentry kind="src" path="/jboss-negotiation-ntlm"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/apache-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/jboss-jmx/4.2.2.GA/jboss-jmx-4.2.2.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/jboss-system/4.2.2.GA/jboss-system-4.2.2.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/web/jbossweb/2.1.0.GA/jbossweb-2.1.0.GA.jar"/>
   <classpathentry kind="src" path="/jboss-negotiation-common"/>
+  <classpathentry kind="var" path="M2_REPO/apache-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
+  <classpathentry kind="src" path="/jboss-negotiation-spnego"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
 </classpath>
\ No newline at end of file

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.project
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.project	2008-08-08 12:07:10 UTC (rev 76823)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/.project	2008-08-08 12:10:33 UTC (rev 76824)
@@ -2,10 +2,9 @@
   <name>jboss-negotiation-toolkit</name>
   <comment>JBoss Negotiation Toolkit</comment>
   <projects>
-    <project>jboss-negotiation-spnego</project>
     <project>jboss-negotiation</project>
-    <project>jboss-negotiation-ntlm</project>
     <project>jboss-negotiation-common</project>
+    <project>jboss-negotiation-spnego</project>
   </projects>
   <buildSpec>
     <buildCommand>

Modified: projects/security/security-negotiation/trunk/parent/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/parent/pom.xml	2008-08-08 12:07:10 UTC (rev 76823)
+++ projects/security/security-negotiation/trunk/parent/pom.xml	2008-08-08 12:10:33 UTC (rev 76824)
@@ -30,7 +30,7 @@
   </properties>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
-    <testSourceDirectory>src/tests</testSourceDirectory>
+    <testSourceDirectory>src/tests/java</testSourceDirectory>
     <finalName>${artifactId}</finalName>
     <resources>
       <resource>




More information about the jboss-cvs-commits mailing list