cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/2] cxf-fediz git commit: Applied patch thanks to Christian Schmulling. Some minor formatting changes + spelling corrections applied
Date Thu, 13 Aug 2015 09:47:26 GMT
Applied patch thanks to Christian Schmulling. Some minor formatting changes + spelling corrections
applied


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

Branch: refs/heads/1.2.x-fixes
Commit: 74dfb98fd5b177a5b1ca1cb72951040173418d1b
Parents: 7931ec1
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Aug 13 10:32:23 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Aug 13 10:34:13 2015 +0100

----------------------------------------------------------------------
 plugins/websphere/pom.xml                       | 65 +++++++++-----------
 .../org/apache/cxf/fediz/was/Constants.java     |  4 +-
 .../cxf/fediz/was/tai/FedizInterceptor.java     |  4 +-
 pom.xml                                         | 25 ++++++++
 4 files changed, 59 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/74dfb98f/plugins/websphere/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/websphere/pom.xml b/plugins/websphere/pom.xml
index 65e26e5..68fc05e 100644
--- a/plugins/websphere/pom.xml
+++ b/plugins/websphere/pom.xml
@@ -17,8 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.cxf.fediz</groupId>
@@ -32,13 +31,12 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
             <!--<version>${servlet.version}</version>-->
-			<version>3.1.0</version>
+            <version>3.1.0</version>
             <!--<type>jar</type>-->
             <!--<scope>compile</scope>-->
         </dependency>
@@ -63,40 +61,38 @@
             <scope>provided</scope>
         </dependency>
 		-->
-		<dependency>
-			<groupId>com.ibm.websphere</groupId>
-			<artifactId>com.ibm.websphere.security</artifactId>
-			<version>1.0.3</version>
-			<type>jar</type>
-			<scope>provided</scope>
- 		</dependency>
-		<dependency>
-			<groupId>com.ibm.ws.security</groupId>
-			<artifactId>com.ibm.ws.security.authentication.tai</artifactId>
-			<version>1.0.3</version>
-			<type>jar</type>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.ibm.ws.security</groupId>
-			<artifactId>com.ibm.ws.security.token</artifactId>
-			<version>1.0.2</version>
-			<type>jar</type>
-			<scope>provided</scope>
-		</dependency>        
-
-		<dependency>
+        <dependency>
+            <groupId>com.ibm.websphere</groupId>
+            <artifactId>com.ibm.websphere.security</artifactId>
+            <version>1.0.3</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.ibm.ws.security</groupId>
+            <artifactId>com.ibm.ws.security.authentication.tai</artifactId>
+            <version>1.0.3</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.ibm.ws.security</groupId>
+            <artifactId>com.ibm.ws.security.token</artifactId>
+            <version>1.0.2</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>${slf4j.version}</version>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${slf4j.version}</version>
             <scope>test</scope>
-		</dependency>
-
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -139,7 +135,7 @@
                     <verbose>true</verbose>
                 </configuration>
             </plugin>
-			<plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
@@ -159,5 +155,4 @@
             </plugin>
         </plugins>
     </build>
-	
 </project>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/74dfb98f/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/Constants.java
----------------------------------------------------------------------
diff --git a/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/Constants.java b/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/Constants.java
index 4519c73..7b3ee9e 100644
--- a/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/Constants.java
+++ b/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/Constants.java
@@ -71,8 +71,8 @@ public interface Constants {
     String PROPERTY_KEY_DIRECT_GROUP_MAPPING = "directGroupMapping";
     
     /**
-     * The session cookie name can be renamed in WebSphere. If it is renames, it is required
to change it in the
-     * interceptor configuration too. A missconfiguration would lead to performance loss.
+     * The session cookie name can be renamed in WebSphere. If it is renamed, it is required
to change it in the
+     * interceptor configuration too. A misconfiguration would lead to performance loss.
      */
     String PROPERTY_SESSION_COOKIE_NAME = "sessionCookieName";
     

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/74dfb98f/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
----------------------------------------------------------------------
diff --git a/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
b/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
index b6f6551..e28439c 100644
--- a/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
+++ b/plugins/websphere/src/main/java/org/apache/cxf/fediz/was/tai/FedizInterceptor.java
@@ -324,7 +324,7 @@ public class FedizInterceptor implements TrustAssociationInterceptor {
                         request.logout();
                     } catch (ServletException e) {
                         LOG.error("Could not logout users");
-                        e.printStackTrace();
+                        // e.printStackTrace();
                     }
                     // WSSecurityHelper.revokeSSOCookies(request, response);
                     return super.signoutCleanup(request, response);
@@ -340,7 +340,7 @@ public class FedizInterceptor implements TrustAssociationInterceptor {
                         request.logout();
                     } catch (ServletException e) {
                         LOG.error("Could not logout users");
-                        e.printStackTrace();
+                        // e.printStackTrace();
                     }
                     return super.signout(request, response);
                 }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/74dfb98f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a5138dd..b0a01c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,6 +136,18 @@
                 <enabled>false</enabled>
             </releases>
         </repository>
+        <repository>
+            <id>central</id>
+            <url>https://repo1.maven.org/maven2</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+        <repository>
+            <id>wasdev-maven-repo</id>
+            <name>wasdev-maven-repo</name>
+            <url>http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/maven/repository/</url>
+        </repository>
     </repositories>
     <pluginRepositories>
         <pluginRepository>
@@ -149,6 +161,19 @@
                 <enabled>false</enabled>
             </releases>
         </pluginRepository>
+        <pluginRepository>
+            <id>Liberty</id>
+            <name>Liberty Repository</name>
+            <url>http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/maven/repository/</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </pluginRepository>
+
     </pluginRepositories>
 
     <inceptionYear>2011</inceptionYear>


Mime
View raw message