From jbossws-commits at lists.jboss.org Tue Aug 4 07:07:12 2009
Content-Type: multipart/mixed; boundary="===============1774313039706572791=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r10474 -
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat.
Date: Tue, 04 Aug 2009 07:07:12 -0400
Message-ID: <200908041107.n74B7C6k013409@svn01.web.mwc.hst.phx2.redhat.com>
--===============1774313039706572791==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: richard.opalka(a)jboss.com
Date: 2009-08-04 07:07:12 -0400 (Tue, 04 Aug 2009)
New Revision: 10474
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webs=
ervices/integration/tomcat/AbstractSecurityBuilder.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webs=
ervices/integration/tomcat/SecurityBuilder.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webs=
ervices/integration/tomcat/SecurityBuilderEJB21.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webs=
ervices/integration/tomcat/SecurityBuilderEJB3.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webs=
ervices/integration/tomcat/WebMetaDataModifier.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webs=
ervices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java
Log:
fix whitespaces
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jbo=
ss/webservices/integration/tomcat/AbstractSecurityBuilder.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
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/tomcat/AbstractSecurityBuilder.java 2009-08-04 10:55:2=
3 UTC (rev 10473)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/tomcat/AbstractSecurityBuilder.java 2009-08-04 11:07:1=
2 UTC (rev 10474)
@@ -26,7 +26,7 @@
import org.jboss.wsf.spi.deployment.Deployment;
=
/**
- * Creates web app security meta data for EJB deployment. =
+ * Creates web app security meta data for EJB deployment.
*
* @author Richard Opalka
* @author Thomas Diesler
@@ -44,10 +44,10 @@
{
super();
}
- =
+
/**
* @see org.jboss.webservices.integration.tomcat.SecurityBuilder#addSec=
urityDomain(JBossWebMetaData, Deployment)
- * =
+ *
* @param jbossWebMD jboss web meta data
* @param dep webservice deployment
*/
@@ -64,7 +64,7 @@
=
/**
* @see org.jboss.webservices.integration.tomcat.SecurityBuilder#addSec=
urityRoles(JBossWebMetaData, Deployment)
- * =
+ *
* @param jbossWebMD jboss web meta data
* @param dep webservice deployment
*/
@@ -80,7 +80,7 @@
=
/**
* Template method for obtaining security domain from EJB deployment.
- * =
+ *
* @param dep webservice deployment
* @return security domain associated with EJB deployment
*/
@@ -88,7 +88,7 @@
=
/**
* Template method for obtaining security roles from EJB deployment.
- * =
+ *
* @param dep webservice deployment
* @return security roles associated with EJB deployment
*/
@@ -96,7 +96,7 @@
=
/**
* Appends 'java:/jaas/' prefix to security domain if it's not prefixed=
with it.
- * =
+ *
* @param securityDomain security domain to be prefixed
* @return security domain prefixed with jaas JNDI prefix
*/
@@ -105,13 +105,13 @@
if ( securityDomain !=3D null )
{
final boolean hasJaasPrefix =3D securityDomain.startsWith( Abstra=
ctSecurityBuilder.JAAS_JNDI_PREFIX ); =
- =
+
if ( !hasJaasPrefix )
{
return AbstractSecurityBuilder.JAAS_JNDI_PREFIX + securityDoma=
in;
}
}
- =
+
return securityDomain;
}
=
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jbo=
ss/webservices/integration/tomcat/SecurityBuilder.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
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/tomcat/SecurityBuilder.java 2009-08-04 10:55:23 UTC (r=
ev 10473)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/tomcat/SecurityBuilder.java 2009-08-04 11:07:12 UTC (r=
ev 10474)
@@ -25,8 +25,8 @@
import org.jboss.wsf.spi.deployment.Deployment;
=
/**
- * Creates web app security meta data for EJB deployments. =
- * =
+ * Creates web app security meta data for EJB deployments.
+ *
* @author Richard Opalka
* @author Thomas Diesler
*/
@@ -40,7 +40,7 @@
* @param dep webservice deployment
*/
void addSecurityDomain( JBossWebMetaData jbossWebMD, Deployment dep );
- =
+
/**
* Adds security roles to web.xml.
*
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jbo=
ss/webservices/integration/tomcat/SecurityBuilderEJB21.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
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/tomcat/SecurityBuilderEJB21.java 2009-08-04 10:55:23 U=
TC (rev 10473)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/tomcat/SecurityBuilderEJB21.java 2009-08-04 11:07:12 U=
TC (rev 10474)
@@ -30,13 +30,13 @@
=
/**
* Creates web app security meta data for EJB 21 deployment. =
- * =
+ *
* @author Richard Opalka
* @author Thomas Diesler
*/
public final class SecurityBuilderEJB21 extends AbstractSecurityBuilder
{
- =
+
/**
* Constructor.
*/
@@ -44,10 +44,10 @@
{
super();
}
- =
+
/**
* @see org.jboss.webservices.integration.tomcat.AbstractSecurityBuilde=
r#getSecurityDomain(Deployment)
- * =
+ *
* @param dep webservice deployment
* @return security domain associated with EJB 21 deployment
*/
@@ -60,7 +60,7 @@
=
/**
* @see org.jboss.webservices.integration.tomcat.AbstractSecurityBuilde=
r#getSecurityRoles(Deployment)
- * =
+ *
* @param dep webservice deployment
* @return security roles associated with EJB 21 deployment
*/
@@ -69,7 +69,7 @@
final JBossMetaData jbossWebMD =3D WSHelper.getRequiredAttachment( d=
ep, JBossMetaData.class );
final IAssemblyDescriptorMetaData assemblyDescriptorMD =3D jbossWebM=
D.getAssemblyDescriptor();
=
- return ( assemblyDescriptorMD !=3D null ) ? assemblyDescriptorMD.get=
SecurityRoles() : null; =
+ return ( assemblyDescriptorMD !=3D null ) ? assemblyDescriptorMD.get=
SecurityRoles() : null;
}
- =
+
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jbo=
ss/webservices/integration/tomcat/SecurityBuilderEJB3.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
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/tomcat/SecurityBuilderEJB3.java 2009-08-04 10:55:23 UT=
C (rev 10473)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/tomcat/SecurityBuilderEJB3.java 2009-08-04 11:07:12 UT=
C (rev 10474)
@@ -34,8 +34,8 @@
import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
=
/**
- * Creates web app security meta data for EJB 3 deployment. =
- * =
+ * Creates web app security meta data for EJB 3 deployment.
+ *
* @author Richard Opalka
* @author Thomas Diesler
*/
@@ -52,7 +52,7 @@
=
/**
* @see org.jboss.webservices.integration.tomcat.AbstractSecurityBuilde=
r#getSecurityDomain(Deployment)
- * =
+ *
* @param dep webservice deployment
* @return security domain associated with EJB 3 deployment
*/
@@ -69,13 +69,13 @@
=
securityDomain =3D this.getDomain( securityDomain, nextSecurityDo=
main );
}
- =
+
return securityDomain;
}
- =
+
/**
* @see org.jboss.webservices.integration.tomcat.AbstractSecurityBuilde=
r#getSecurityRoles(Deployment)
- * =
+ *
* @param dep webservice deployment
* @return security roles associated with EJB 21 deployment
*/
@@ -90,25 +90,25 @@
final WebServiceDeclaration ejbContainer =3D ejbContainers.next();
final RolesAllowed allowedRoles =3D ejbContainer.getAnnotation( R=
olesAllowed.class );
final boolean hasAllowedRoles =3D allowedRoles !=3D null;
- =
+
if ( hasAllowedRoles )
{
for ( final String roleName : allowedRoles.value() )
{
final SecurityRoleMetaData securityRoleMD =3D new SecurityR=
oleMetaData();
- =
+
securityRoleMD.setRoleName( roleName );
securityRolesMD.add( securityRoleMD );
}
}
}
- =
+
return securityRolesMD;
}
=
/**
* Returns security domain value. This method checks domain is the same=
for every EJB 3 endpoint.
- * =
+ *
* @param oldSecurityDomain our security domain
* @param nextSecurityDomain next security domain
* @return security domain value
@@ -120,7 +120,7 @@
{
return oldSecurityDomain;
}
- =
+
if ( oldSecurityDomain =3D=3D null )
{
return nextSecurityDomain.value();
@@ -130,10 +130,10 @@
=
return oldSecurityDomain;
}
- =
+
/**
* This method ensures both passed domains contain the same value.
- * =
+ *
* @param oldSecurityDomain our security domain
* @param newSecurityDomain next security domain
* @throws IllegalStateException if domains have different values
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jbo=
ss/webservices/integration/tomcat/WebMetaDataModifier.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
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/tomcat/WebMetaDataModifier.java 2009-08-04 10:55:23 UT=
C (rev 10473)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/tomcat/WebMetaDataModifier.java 2009-08-04 11:07:12 UT=
C (rev 10474)
@@ -37,7 +37,7 @@
import org.jboss.wsf.spi.deployment.Endpoint;
=
/**
- * The modifier of jboss web meta data. =
+ * The modifier of jboss web meta data.
* It configures WS transport for every webservice endpoint
* plus propagates WS stack specific context parameters if required.
*
@@ -57,7 +57,7 @@
=
/**
* Modifies web meta data to configure webservice stack transport and p=
roperties.
- * =
+ *
* @param dep webservice deployment
*/
public void modify( final Deployment dep )
@@ -70,7 +70,7 @@
=
/**
* Propagates stack specific context parameters if specified. =
- * =
+ *
* @param dep webservice deployment
* @param jbossWebMD web meta data
*/
@@ -79,7 +79,7 @@
{
final Map< String, String > stackContextParams =3D ( Map< String, St=
ring > )
dep.getProperty( WSConstants.STACK_CONTEXT_PARAMS );
- =
+
if ( stackContextParams !=3D null )
{
final List< ParamValueMetaData > contextParams =3D this.getContex=
tParams( jbossWebMD );
@@ -94,14 +94,14 @@
=
/**
* Configures transport servlet class for every found webservice endpoi=
nt. =
- * =
+ *
* @param dep webservice deployment
* @param jbossWebMD web meta data
*/
private void configureEndpoints( final Deployment dep, final JBossWebMe=
taData jbossWebMD )
{
final Iterator< JBossServletMetaData > servlets =3D jbossWebMD.getSe=
rvlets().iterator();
- =
+
while ( servlets.hasNext() )
{
final ServletMetaData servletMD =3D servlets.next();
@@ -118,15 +118,15 @@
final List< ParamValueMetaData > initParams =3D this.getServle=
tInitParams( servletMD );
final ParamValueMetaData endpointParam =3D this.newParameter( =
Endpoint.SEPID_DOMAIN_ENDPOINT, endpointClassName ); =
- =
+
initParams.add( endpointParam );
}
}
}
- =
+
/**
* Returns stack specific transport class name.
- * =
+ *
* @param dep webservice deployment
* @return stack specific transport class name
* @throws IllegalStateException if transport class name is not found i=
n deployment properties map
@@ -134,18 +134,18 @@
private String getTransportClassName( final Deployment dep )
{
final String transportClassName =3D ( String ) dep.getProperty( WSCo=
nstants.STACK_TRANSPORT_CLASS );
- =
+
if ( transportClassName =3D=3D null )
{
throw new IllegalStateException( "Cannot obtain deployment proper=
ty: " + WSConstants.STACK_TRANSPORT_CLASS );
}
- =
+
return transportClassName;
}
- =
+
/**
* Creates new parameter with specified key and value.
- * =
+ *
* @param key the key
* @param value the value
* @return new parameter
@@ -155,13 +155,13 @@
final ParamValueMetaData paramMD =3D new ParamValueMetaData();
paramMD.setParamName( key );
paramMD.setParamValue( value );
- =
+
return paramMD;
}
- =
+
/**
* Gets servlet init params list. Constructs new init params list if it=
does not exist yet.
- * =
+ *
* @param servletMD servlet meta data
* @return servlet init params list
*/
@@ -174,26 +174,26 @@
initParams =3D new ArrayList< ParamValueMetaData >();
servletMD.setInitParam( initParams );
}
- =
+
return initParams;
}
=
/**
* Gets context params list. Constructs new context params list if it d=
oes not exist yet.
- * =
+ *
* @param jbossWebMD web meta data
* @return context params list
*/
private List< ParamValueMetaData > getContextParams( final JBossWebMeta=
Data jbossWebMD )
{
List< ParamValueMetaData > contextParams =3D jbossWebMD.getContextPa=
rams();
- =
+
if ( contextParams =3D=3D null )
{
contextParams =3D new ArrayList< ParamValueMetaData >();
jbossWebMD.setContextParams( contextParams );
}
- =
+
return contextParams;
}
=
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jbo=
ss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.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
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2009-=
08-04 10:55:23 UTC (rev 10473)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2009-=
08-04 11:07:12 UTC (rev 10474)
@@ -26,13 +26,13 @@
=
/**
* Modifies web meta data to configure webservice stack endpoints and prop=
erties.
- * =
+ *
* @author Richard Opalka
* @author Thomas Diesler
*/
public final class WebMetaDataModifyingDeploymentAspect extends Deployment=
Aspect
{
- =
+
/** Web meta data modifier. */
private WebMetaDataModifier webMetaDataModifier;
=
@@ -46,7 +46,7 @@
=
/**
* Sets Web meta data modifier. This method is called using MC injectio=
n.
- * =
+ *
* @param webMDModifier web meta data modifier
*/
public void setWebMetaDataModifier( final WebMetaDataModifier webMDModi=
fier )
@@ -56,12 +56,12 @@
=
/**
* Modifies web meta data.
- * =
+ *
* @param dep webservice deployment
*/
public void start( final Deployment dep )
{
this.webMetaDataModifier.modify( dep );
}
- =
+
}
--===============1774313039706572791==--