cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From owu...@apache.org
Subject svn commit: r1332138 - in /cxf/fediz/trunk: ./ examples/ plugin/ plugin/core/ plugin/core/src/main/java/org/apache/cxf/fediz/core/ plugin/core/src/main/java/org/apache/cxf/fediz/core/config/ plugin/core/src/main/java/org/apache/cxf/fediz/core/saml/ plu...
Date Mon, 30 Apr 2012 09:43:43 GMT
Author: owulff
Date: Mon Apr 30 09:43:42 2012
New Revision: 1332138

URL: http://svn.apache.org/viewvc?rev=1332138&view=rev
Log:
missing pom added, minor changes

Added:
    cxf/fediz/trunk/examples/pom.xml
    cxf/fediz/trunk/plugin/pom.xml
    cxf/fediz/trunk/services/pom.xml
Modified:
    cxf/fediz/trunk/plugin/core/pom.xml
    cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/FederationProcessorImpl.java
    cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/TokenValidator.java
    cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/config/FederationContext.java
    cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java
    cxf/fediz/trunk/plugin/tomcat/pom.xml
    cxf/fediz/trunk/pom.xml
    cxf/fediz/trunk/services/idp/pom.xml
    cxf/fediz/trunk/services/sts/pom.xml

Added: cxf/fediz/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/pom.xml?rev=1332138&view=auto
==============================================================================
--- cxf/fediz/trunk/examples/pom.xml (added)
+++ cxf/fediz/trunk/examples/pom.xml Mon Apr 30 09:43:42 2012
@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>org.apache.cxf.fediz</groupId>
+   <artifactId>examples</artifactId>
+   <version>0.6-SNAPSHOT</version>
+   <name>Apache Fediz examples</name>
+   <packaging>pom</packaging>
+
+   <modules>
+      <module>simpleWebapp</module>
+      <module>wsclientWebapp</module>
+   </modules>
+</project>

Modified: cxf/fediz/trunk/plugin/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugin/core/pom.xml?rev=1332138&r1=1332137&r2=1332138&view=diff
==============================================================================
--- cxf/fediz/trunk/plugin/core/pom.xml (original)
+++ cxf/fediz/trunk/plugin/core/pom.xml Mon Apr 30 09:43:42 2012
@@ -8,7 +8,7 @@
        <version>0.6-SNAPSHOT</version>
    </parent>
    <artifactId>fediz-core</artifactId>
-   <name>Fediz Core</name>
+   <name>Apache Fediz Plugin Core</name>
    <packaging>jar</packaging>
 
     <properties>

Modified: cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/FederationProcessorImpl.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/FederationProcessorImpl.java?rev=1332138&r1=1332137&r2=1332138&view=diff
==============================================================================
--- cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/FederationProcessorImpl.java
(original)
+++ cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/FederationProcessorImpl.java
Mon Apr 30 09:43:42 2012
@@ -73,7 +73,7 @@ public class FederationProcessorImpl imp
 
     @Override
     public FederationResponse processRequest(FederationRequest request,
-            FederationContext config) {
+                                             FederationContext config) {
         FederationResponse response = null;
         if (request.getWa().equals(FederationConstants.ACTION_SIGNIN)) {
             response = this.processSignInRequest(request, config);
@@ -233,7 +233,7 @@ public class FederationProcessorImpl imp
 
     @Override
     public String createSignInRequest(HttpServletRequest request,
-            FederationContext config) {
+                                      FederationContext config) {
 
         String redirectURL = null;
         //        if (this.getIssuerCallbackHandler() != null) {

Modified: cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/TokenValidator.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/TokenValidator.java?rev=1332138&r1=1332137&r2=1332138&view=diff
==============================================================================
--- cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/TokenValidator.java
(original)
+++ cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/TokenValidator.java
Mon Apr 30 09:43:42 2012
@@ -18,6 +18,7 @@
 package org.apache.cxf.fediz.core;
 
 import org.apache.cxf.fediz.core.config.FederationContext;
+
 import org.w3c.dom.Element;
 
 public interface TokenValidator {

Modified: cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/config/FederationContext.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/config/FederationContext.java?rev=1332138&r1=1332137&r2=1332138&view=diff
==============================================================================
--- cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/config/FederationContext.java
(original)
+++ cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/config/FederationContext.java
Mon Apr 30 09:43:42 2012
@@ -32,6 +32,7 @@ public class FederationContext {
 
     private boolean detectExpiredTokens = true;
     private boolean detectReplayedTokens = true;
+    private String relativePath;
 
     public FederationContext(ContextConfig config) {
         this.config = config;
@@ -153,4 +154,12 @@ public class FederationContext {
         return storeType;
     }
 
+    public void setRelativePath(String relativePath) {
+        this.relativePath = relativePath;
+    }
+
+    public String getRelativePath() {
+        return relativePath;
+    }
+
 }

Modified: cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java?rev=1332138&r1=1332137&r2=1332138&view=diff
==============================================================================
--- cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java
(original)
+++ cxf/fediz/trunk/plugin/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java
Mon Apr 30 09:43:42 2012
@@ -17,6 +17,7 @@
 
 package org.apache.cxf.fediz.core.saml;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.security.cert.X509Certificate;
@@ -76,12 +77,12 @@ public class SAMLTokenValidator implemen
 
         try {
             String trustStoreFile = config.getTrustStoreFile();
-            /*
+            
             File f = new File(trustStoreFile);
             if (!f.exists() && config.getRelativePath() != null && !config.getRelativePath().isEmpty())
{
                 trustStoreFile = config.getRelativePath().concat(File.separator + config.getTrustStoreFile());
             }
-            */
+            
             Properties sigProperties = createCryptoProviderProperties(
                     trustStoreFile, config.getTrustStorePassword());
 

Added: cxf/fediz/trunk/plugin/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugin/pom.xml?rev=1332138&view=auto
==============================================================================
--- cxf/fediz/trunk/plugin/pom.xml (added)
+++ cxf/fediz/trunk/plugin/pom.xml Mon Apr 30 09:43:42 2012
@@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+   <modelVersion>4.0.0</modelVersion>
+   <parent>
+       <groupId>org.apache.cxf.fediz</groupId>
+       <artifactId>fediz</artifactId>
+       <version>0.6-SNAPSHOT</version>
+   </parent>
+   <groupId>org.apache.cxf.fediz</groupId>
+   <artifactId>plugin</artifactId>
+   <version>0.6-SNAPSHOT</version>
+   <name>Apache Fediz Plugin</name>
+   <packaging>pom</packaging>
+
+   <modules>
+      <module>core</module>
+      <module>tomcat</module>
+   </modules>
+</project>

Modified: cxf/fediz/trunk/plugin/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugin/tomcat/pom.xml?rev=1332138&r1=1332137&r2=1332138&view=diff
==============================================================================
--- cxf/fediz/trunk/plugin/tomcat/pom.xml (original)
+++ cxf/fediz/trunk/plugin/tomcat/pom.xml Mon Apr 30 09:43:42 2012
@@ -8,7 +8,7 @@
        <version>0.6-SNAPSHOT</version>
 	</parent>
 	<artifactId>fediz-tomcat</artifactId>
-	<name>Fediz Tomcat plugin</name>
+	<name>Apache Fediz Plugin Tomcat</name>
 	<packaging>jar</packaging>
 
    <properties>

Modified: cxf/fediz/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/pom.xml?rev=1332138&r1=1332137&r2=1332138&view=diff
==============================================================================
--- cxf/fediz/trunk/pom.xml (original)
+++ cxf/fediz/trunk/pom.xml Mon Apr 30 09:43:42 2012
@@ -22,8 +22,8 @@
             <artifactId>maven-compiler-plugin</artifactId>
             <version>2.3.2</version>
             <configuration>
-               <source>1.6</source>
-               <target>1.6</target>
+               <source>${jdk.version}</source>
+               <target>${jdk.version}</target>
             </configuration>
          </plugin>
          <plugin>
@@ -44,7 +44,7 @@
                     <linkXRef>false</linkXRef>
                     <failOnViolation>true</failOnViolation>
                     <verbose>true</verbose>
-                    <targetJdk>1.6</targetJdk>
+                    <targetJdk>${jdk.version}</targetJdk>
                 </configuration>
                 <executions>
                     <execution>
@@ -81,6 +81,7 @@
       <cxf.version>2.5.3</cxf.version>
       <wss4j.version>1.6.5</wss4j.version>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+      <jdk.version>1.6</jdk.version>
    </properties>
 
    <dependencies>

Modified: cxf/fediz/trunk/services/idp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/pom.xml?rev=1332138&r1=1332137&r2=1332138&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/pom.xml (original)
+++ cxf/fediz/trunk/services/idp/pom.xml Mon Apr 30 09:43:42 2012
@@ -9,7 +9,7 @@
        <version>0.6-SNAPSHOT</version>
     </parent>
     <artifactId>fediz-idp</artifactId>
-    <name>Fediz IDP</name>
+    <name>Apache Fediz IDP</name>
     <packaging>war</packaging>
 
     <dependencyManagement>

Added: cxf/fediz/trunk/services/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/pom.xml?rev=1332138&view=auto
==============================================================================
--- cxf/fediz/trunk/services/pom.xml (added)
+++ cxf/fediz/trunk/services/pom.xml Mon Apr 30 09:43:42 2012
@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>org.apache.cxf.fediz</groupId>
+   <artifactId>services</artifactId>
+   <version>0.6-SNAPSHOT</version>
+   <name>Apache Fediz Services</name>
+   <packaging>pom</packaging>
+
+   <modules>
+      <module>idp</module>
+      <module>sts</module>
+   </modules>
+</project>

Modified: cxf/fediz/trunk/services/sts/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/pom.xml?rev=1332138&r1=1332137&r2=1332138&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/pom.xml (original)
+++ cxf/fediz/trunk/services/sts/pom.xml Mon Apr 30 09:43:42 2012
@@ -9,7 +9,7 @@
        <version>0.6-SNAPSHOT</version>
     </parent>
     <artifactId>fediz-idp-sts</artifactId>
-    <name>Fediz STS</name>
+    <name>Apache Fediz STS</name>
     <packaging>war</packaging>
 
    <properties>



Mime
View raw message