From do-not-reply at jboss.org Wed Feb  1 16:07:56 2012
Content-Type: multipart/mixed; boundary="===============2854991171177427451=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: gatein-commits at lists.jboss.org
Subject: [gatein-commits] gatein SVN: r8350 - in portal/trunk/wsrp-integration:
 extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf and 1
 other directory.
Date: Wed, 01 Feb 2012 16:07:55 -0500
Message-ID: <201202012107.q11L7tYk027492@svn01.web.mwc.hst.phx2.redhat.com>

--===============2854991171177427451==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2012-02-01 16:07:55 -0500 (Wed, 01 Feb 2012)
New Revision: 8350

Removed:
   portal/trunk/wsrp-integration/extension-component/src/main/java/org/gate=
in/integration/wsrp/wss/ConversationStateCredentialsAccessor.java
Modified:
   portal/trunk/wsrp-integration/extension-component/src/main/java/org/gate=
in/integration/wsrp/wss/JBoss5WSSServiceIntegration.java
   portal/trunk/wsrp-integration/extension-ear-as5/src/main/application/lib=
/jboss5integration.jar/conf/configuration.xml
Log:
- Reverted changes from GTNWSRP-268 until a new WSRP version is released.

Deleted: portal/trunk/wsrp-integration/extension-component/src/main/java/or=
g/gatein/integration/wsrp/wss/ConversationStateCredentialsAccessor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- portal/trunk/wsrp-integration/extension-component/src/main/java/org/gat=
ein/integration/wsrp/wss/ConversationStateCredentialsAccessor.java	2012-02-=
01 19:10:58 UTC (rev 8349)
+++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gat=
ein/integration/wsrp/wss/ConversationStateCredentialsAccessor.java	2012-02-=
01 21:07:55 UTC (rev 8350)
@@ -1,55 +0,0 @@
-/*
- * JBoss, a division of Red Hat
- * Copyright 2012, Red Hat Middleware, LLC, and individual
- * contributors as indicated by the @authors tag. See the
- * copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.gatein.integration.wsrp.wss;
-
-import org.exoplatform.services.security.ConversationState;
-import org.gatein.common.logging.Logger;
-import org.gatein.common.logging.LoggerFactory;
-import org.gatein.wci.security.Credentials;
-import org.gatein.wsrp.wss.credentials.CredentialsAccessor;
-
-/**
- * @author <a href=3D"mailto:mposolda(a)redhat.com">Marek Posolda</a>
- */
-public class ConversationStateCredentialsAccessor implements CredentialsAc=
cessor
-{
-
-   private static final Logger log =3D LoggerFactory.getLogger(Conversatio=
nStateCredentialsAccessor.class);
-
-   /**
-    * Reading credentials from @{link ConversationState} of current user.
-    *
-    * @return credentials
-    */
-   @Override
-   public Credentials getCredentials()
-   {
-      if (ConversationState.getCurrent() =3D=3D null)
-      {
-         log.warn("Cannot find Credentials because ConversationState not s=
et.");
-         return null;
-      }
-      return (Credentials)ConversationState.getCurrent().getAttribute(Cred=
entials.CREDENTIALS);
-   }
-}

Modified: portal/trunk/wsrp-integration/extension-component/src/main/java/o=
rg/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- portal/trunk/wsrp-integration/extension-component/src/main/java/org/gat=
ein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java	2012-02-01 19:10:=
58 UTC (rev 8349)
+++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gat=
ein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java	2012-02-01 21:07:=
55 UTC (rev 8350)
@@ -23,7 +23,6 @@
 package org.gatein.integration.wsrp.wss;
 =

 import org.gatein.wsrp.wss.WebServiceSecurityFactory;
-import org.gatein.wsrp.wss.credentials.CredentialsAccessor;
 import org.picocontainer.Startable;
 import org.wsrp.wss.jboss5.handlers.consumer.JBWSSecurityHandlerWrapper;
 import org.wsrp.wss.jboss5.handlers.consumer.WSSecurityCredentialHandler;
@@ -36,13 +35,12 @@
 {
    private final WebServiceSecurityFactory wssFactory;
    =

-   private final WSSecurityCredentialHandler WS_CREDENTIAL_HANDLER;
+   private final WSSecurityCredentialHandler WS_CREDENTIAL_HANDLER =3D new=
 WSSecurityCredentialHandler();
    private final JBWSSecurityHandlerWrapper JBWS_SECURITY_WRAPPER =3D new =
JBWSSecurityHandlerWrapper();
    =

-   public JBoss5WSSServiceIntegration(CredentialsAccessor credentialsAcces=
sor)
+   public JBoss5WSSServiceIntegration()
    {
       wssFactory =3D WebServiceSecurityFactory.getInstance();
-      WS_CREDENTIAL_HANDLER =3D new WSSecurityCredentialHandler(credential=
sAccessor);
    }
    =

    public void start()

Modified: portal/trunk/wsrp-integration/extension-ear-as5/src/main/applicat=
ion/lib/jboss5integration.jar/conf/configuration.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- portal/trunk/wsrp-integration/extension-ear-as5/src/main/application/li=
b/jboss5integration.jar/conf/configuration.xml	2012-02-01 19:10:58 UTC (rev=
 8349)
+++ portal/trunk/wsrp-integration/extension-ear-as5/src/main/application/li=
b/jboss5integration.jar/conf/configuration.xml	2012-02-01 21:07:55 UTC (rev=
 8350)
@@ -28,16 +28,6 @@
    xmlns=3D"http://www.exoplaform.org/xml/ns/kernel_1_2.xsd">
 =

    <component>
-      <key>org.gatein.wsrp.wss.credentials.CredentialsAccessor</key>
-
-      <!-- Reading credentials from HTTP session -->
-      <type>org.gatein.wsrp.wss.credentials.HTTPSessionCredentialsAccessor=
</type>
-
-      <!-- Reading credentials from ConversationState -->
-      <!--<type>org.gatein.integration.wsrp.wss.ConversationStateCredentia=
lsAccessor</type>-->
-   </component>
-
-   <component>
       <type>org.gatein.integration.wsrp.wss.JBoss5WSSServiceIntegration</t=
ype>
    </component>
 =



--===============2854991171177427451==--