[jboss-cvs] Picketlink SVN: r1282 - in integration-tests/trunk: picketlink-openid-tests and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: pskopek at redhat.com
Date: 2011-10-04 09:41:58 -0400 (Tue, 04 Oct 2011)
New Revision: 1282

Modified:
   integration-tests/trunk/ant-scripts/ant-build.xml
   integration-tests/trunk/picketlink-openid-tests/pom.xml
   integration-tests/trunk/picketlink-pdp-tests/ant-build.xml
   integration-tests/trunk/picketlink-saml-tomcat6/pom.xml
Log:
removing openid4java dependency from submodules not using it

Modified: integration-tests/trunk/ant-scripts/ant-build.xml
===================================================================
--- integration-tests/trunk/ant-scripts/ant-build.xml	2011-10-04 11:14:39 UTC (rev 1281)
+++ integration-tests/trunk/ant-scripts/ant-build.xml	2011-10-04 13:41:58 UTC (rev 1282)
@@ -35,7 +35,7 @@
   </target>
 
   <target name="tomcat6-thirdparty-deps" depends="init-tomcat6" >
-    <copy file="${localRepository}/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" todir="${TOMCAT6_LIB}"/>
+    <copy file="${localRepository}/log4j/log4j/1.2.14/log4j-1.2.14.jar" todir="${TOMCAT6_LIB}"/>
   </target>
 
   <target name="copy-picketlink-tomcat6" depends="tomcat6-thirdparty-deps" >
@@ -43,7 +43,7 @@
     <copy file="${localRepository}/org/picketlink/picketlink-bindings-jboss/${version}/picketlink-bindings-jboss-${version}.jar" todir="${TOMCAT6_LIB}"/>
     <copy file="${localRepository}/org/picketlink/picketlink-fed/${version}/picketlink-fed-${version}.jar" todir="${TOMCAT6_LIB}"/>
 
-    <copy file="${localRepository}/org/openid4java/openid4java-nodeps/0.9.5/openid4java-nodeps-0.9.5.jar" todir="${TOMCAT6_LIB}"/>
+    <!-- copy file="${localRepository}/org/openid4java/openid4java-nodeps/0.9.5/openid4java-nodeps-0.9.5.jar" todir="${TOMCAT6_LIB}"/ -->
     <unzip src="${localRepository}/org/picketlink/picketlink-fed-webapps-assembly/${version}/picketlink-fed-webapps-assembly-${version}.zip"
            dest="${TOMCAT6_DEPLOY}"/>
 
@@ -80,7 +80,7 @@
     <copy file="${localRepository}/org/picketlink/picketlink-fed/${version}/picketlink-fed-${version}.jar" todir="${deploy}/picketlink"/>
     <unzip src="${localRepository}/org/picketlink/picketlink-fed-webapps-assembly/${version}/picketlink-fed-webapps-assembly-${version}.zip"
            dest="${deploy}"/>
-    <copy file="${localRepository}/org/openid4java/openid4java-nodeps/0.9.5/openid4java-nodeps-0.9.5.jar" todir="${deploy}/picketlink"/>
+    <!-- copy file="${localRepository}/org/openid4java/openid4java-nodeps/0.9.5/openid4java-nodeps-0.9.5.jar" todir="${deploy}/picketlink"/ -->
 
     <chmod file="${jbossas}/bin/run.sh" perm="700"/>
 

Modified: integration-tests/trunk/picketlink-openid-tests/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-openid-tests/pom.xml	2011-10-04 11:14:39 UTC (rev 1281)
+++ integration-tests/trunk/picketlink-openid-tests/pom.xml	2011-10-04 13:41:58 UTC (rev 1282)
@@ -117,8 +117,12 @@
         <version>3.1</version>
          <scope>test</scope>
       </dependency>
-
       <dependency>
+         <groupId>org.openid4java</groupId>
+         <artifactId>openid4java</artifactId>
+         <version>0.9.5</version>
+      </dependency>
+      <dependency>
          <groupId>commons-codec</groupId>
          <artifactId>commons-codec</artifactId>
         <version>1.3</version>

Modified: integration-tests/trunk/picketlink-pdp-tests/ant-build.xml
===================================================================
--- integration-tests/trunk/picketlink-pdp-tests/ant-build.xml	2011-10-04 11:14:39 UTC (rev 1281)
+++ integration-tests/trunk/picketlink-pdp-tests/ant-build.xml	2011-10-04 13:41:58 UTC (rev 1282)
@@ -15,7 +15,7 @@
     <copy file="${localRepository}/org/picketlink/picketlink-bindings/${version}/picketlink-bindings-${version}.jar" todir="${JBAS_DEPLOY}/picketlink"/>
     <copy file="${localRepository}/org/picketlink/picketlink-bindings-jboss/${version}/picketlink-bindings-jboss-${version}.jar" todir="${JBAS_DEPLOY}/picketlink"/>
     <copy file="${localRepository}/org/picketlink/picketlink-fed/${version}/picketlink-fed-${version}.jar" todir="${JBAS_DEPLOY}/picketlink"/>
-    <copy file="${localRepository}/org/openid4java/openid4java-nodeps/${OPENID4JAVA_VERSION}/openid4java-nodeps-${OPENID4JAVA_VERSION}.jar" todir="${JBAS_DEPLOY}/picketlink"/>
+    <!-- copy file="${localRepository}/org/openid4java/openid4java-nodeps/${OPENID4JAVA_VERSION}/openid4java-nodeps-${OPENID4JAVA_VERSION}.jar" todir="${JBAS_DEPLOY}/picketlink"/ -->
     <unzip src="${localRepository}/org/picketlink/picketlink-fed-webapps-assembly/${version}/picketlink-fed-webapps-assembly-${version}.zip"
            dest="${JBAS_DEPLOY}"/>
     <chmod file="${basedir}/target/jboss-5.1.0.GA/bin/run.sh" perm="700"/>

Modified: integration-tests/trunk/picketlink-saml-tomcat6/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-saml-tomcat6/pom.xml	2011-10-04 11:14:39 UTC (rev 1281)
+++ integration-tests/trunk/picketlink-saml-tomcat6/pom.xml	2011-10-04 13:41:58 UTC (rev 1282)
@@ -123,7 +123,12 @@
         <artifactId>ant-contrib</artifactId>
         <version>1.0b2</version>
       </dependency>
-
+      <dependency>
+         <groupId>log4j</groupId>
+         <artifactId>log4j</artifactId>
+         <version>1.2.14</version>
+         <optional>true</optional>
+      </dependency>
    </dependencies>
    
    <reporting>