cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/2] cxf-fediz git commit: Adding alice's cert to the STS truststore
Date Thu, 23 Apr 2015 16:01:52 GMT
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 6415da23f -> 67547bea8


Adding alice's cert to the STS truststore


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/67547bea
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/67547bea
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/67547bea

Branch: refs/heads/master
Commit: 67547bea834ffeb7971c07695e68666db3156974
Parents: 9ca2002
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Apr 23 16:55:22 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Apr 23 17:01:46 2015 +0100

----------------------------------------------------------------------
 services/sts/src/main/resources/ststrust.jks    | Bin 3241 -> 4079 bytes
 systests/tomcat7/pom.xml                        |  26 -------------------
 .../tomcat7/src/test/resources/sts/ststrust.jks | Bin 4079 -> 0 bytes
 3 files changed, 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/67547bea/services/sts/src/main/resources/ststrust.jks
----------------------------------------------------------------------
diff --git a/services/sts/src/main/resources/ststrust.jks b/services/sts/src/main/resources/ststrust.jks
index 3a408ae..c4d1c1e 100644
Binary files a/services/sts/src/main/resources/ststrust.jks and b/services/sts/src/main/resources/ststrust.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/67547bea/systests/tomcat7/pom.xml
----------------------------------------------------------------------
diff --git a/systests/tomcat7/pom.xml b/systests/tomcat7/pom.xml
index c2d8dea..d214223 100644
--- a/systests/tomcat7/pom.xml
+++ b/systests/tomcat7/pom.xml
@@ -195,32 +195,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--  Needed for ClientCertificateTests -->
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.7</version>
-                <executions>
-                    <execution>
-                        <id>copy-entities-to-sts2</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${basedir}/target/tomcat/idp/webapps/fediz-idp-sts/WEB-INF/classes</outputDirectory>
-                            <overwrite>true</overwrite>
-                            <resources>
-                                <resource>
-                                    <directory>${basedir}/src/test/resources/sts</directory>
-                                    <includes>
-                                        <include>ststrust.jks</include>
-                                    </includes>
-                                </resource>
-                            </resources>              
-                        </configuration>            
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <inherited>true</inherited>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/67547bea/systests/tomcat7/src/test/resources/sts/ststrust.jks
----------------------------------------------------------------------
diff --git a/systests/tomcat7/src/test/resources/sts/ststrust.jks b/systests/tomcat7/src/test/resources/sts/ststrust.jks
deleted file mode 100644
index c4d1c1e..0000000
Binary files a/systests/tomcat7/src/test/resources/sts/ststrust.jks and /dev/null differ


Mime
View raw message