JBossWS SVN: r10478 - spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-08-04 09:14:08 -0400 (Tue, 04 Aug 2009)
New Revision: 10478
Modified:
spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/Service.java
Log:
[JBWS-2332] fix Service consistency
Modified: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/Service.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/Service.java 2009-08-04 11:58:11 UTC (rev 10477)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/Service.java 2009-08-04 13:14:08 UTC (rev 10478)
@@ -55,9 +55,9 @@
void setContextRoot(String contextRoot);
/** Get the virtual hosts for this service */
- String[] getVirtualHosts();
+ List<String> getVirtualHosts();
/** Set the virtual hosts for this service */
- void setVirtualHosts(String[] virtualHosts);
+ void setVirtualHosts(List<String> virtualHosts);
}
14 years, 9 months
JBossWS SVN: r10477 - common/branches.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-08-04 07:58:11 -0400 (Tue, 04 Aug 2009)
New Revision: 10477
Added:
common/branches/ropalka/
Log:
creating user branch
Copied: common/branches/ropalka (from rev 10476, common/trunk)
14 years, 9 months
JBossWS SVN: r10476 - framework/branches.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-08-04 07:57:37 -0400 (Tue, 04 Aug 2009)
New Revision: 10476
Added:
framework/branches/ropalka/
Log:
creating user branch
Copied: framework/branches/ropalka (from rev 10475, framework/trunk)
14 years, 9 months
JBossWS SVN: r10475 - spi/branches.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-08-04 07:56:59 -0400 (Tue, 04 Aug 2009)
New Revision: 10475
Added:
spi/branches/ropalka/
Log:
creating user branch
Copied: spi/branches/ropalka (from rev 10474, spi/trunk)
14 years, 9 months
JBossWS SVN: r10474 - container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat.
by jbossws-commits＠lists.jboss.org
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/webservices/integration/tomcat/AbstractSecurityBuilder.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilder.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilderEJB21.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilderEJB3.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java
Log:
fix whitespaces
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityBuilder.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityBuilder.java 2009-08-04 10:55:23 UTC (rev 10473)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityBuilder.java 2009-08-04 11:07:12 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 <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
* @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
@@ -44,10 +44,10 @@
{
super();
}
-
+
/**
* @see org.jboss.webservices.integration.tomcat.SecurityBuilder#addSecurityDomain(JBossWebMetaData, Deployment)
- *
+ *
* @param jbossWebMD jboss web meta data
* @param dep webservice deployment
*/
@@ -64,7 +64,7 @@
/**
* @see org.jboss.webservices.integration.tomcat.SecurityBuilder#addSecurityRoles(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 != null )
{
final boolean hasJaasPrefix = securityDomain.startsWith( AbstractSecurityBuilder.JAAS_JNDI_PREFIX );
-
+
if ( !hasJaasPrefix )
{
return AbstractSecurityBuilder.JAAS_JNDI_PREFIX + securityDomain;
}
}
-
+
return securityDomain;
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilder.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilder.java 2009-08-04 10:55:23 UTC (rev 10473)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilder.java 2009-08-04 11:07:12 UTC (rev 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 <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
* @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
@@ -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/jboss/webservices/integration/tomcat/SecurityBuilderEJB21.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilderEJB21.java 2009-08-04 10:55:23 UTC (rev 10473)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilderEJB21.java 2009-08-04 11:07:12 UTC (rev 10474)
@@ -30,13 +30,13 @@
/**
* Creates web app security meta data for EJB 21 deployment.
- *
+ *
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
* @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public final class SecurityBuilderEJB21 extends AbstractSecurityBuilder
{
-
+
/**
* Constructor.
*/
@@ -44,10 +44,10 @@
{
super();
}
-
+
/**
* @see org.jboss.webservices.integration.tomcat.AbstractSecurityBuilder#getSecurityDomain(Deployment)
- *
+ *
* @param dep webservice deployment
* @return security domain associated with EJB 21 deployment
*/
@@ -60,7 +60,7 @@
/**
* @see org.jboss.webservices.integration.tomcat.AbstractSecurityBuilder#getSecurityRoles(Deployment)
- *
+ *
* @param dep webservice deployment
* @return security roles associated with EJB 21 deployment
*/
@@ -69,7 +69,7 @@
final JBossMetaData jbossWebMD = WSHelper.getRequiredAttachment( dep, JBossMetaData.class );
final IAssemblyDescriptorMetaData assemblyDescriptorMD = jbossWebMD.getAssemblyDescriptor();
- return ( assemblyDescriptorMD != null ) ? assemblyDescriptorMD.getSecurityRoles() : null;
+ return ( assemblyDescriptorMD != null ) ? assemblyDescriptorMD.getSecurityRoles() : null;
}
-
+
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilderEJB3.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilderEJB3.java 2009-08-04 10:55:23 UTC (rev 10473)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilderEJB3.java 2009-08-04 11:07:12 UTC (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 <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
* @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
@@ -52,7 +52,7 @@
/**
* @see org.jboss.webservices.integration.tomcat.AbstractSecurityBuilder#getSecurityDomain(Deployment)
- *
+ *
* @param dep webservice deployment
* @return security domain associated with EJB 3 deployment
*/
@@ -69,13 +69,13 @@
securityDomain = this.getDomain( securityDomain, nextSecurityDomain );
}
-
+
return securityDomain;
}
-
+
/**
* @see org.jboss.webservices.integration.tomcat.AbstractSecurityBuilder#getSecurityRoles(Deployment)
- *
+ *
* @param dep webservice deployment
* @return security roles associated with EJB 21 deployment
*/
@@ -90,25 +90,25 @@
final WebServiceDeclaration ejbContainer = ejbContainers.next();
final RolesAllowed allowedRoles = ejbContainer.getAnnotation( RolesAllowed.class );
final boolean hasAllowedRoles = allowedRoles != null;
-
+
if ( hasAllowedRoles )
{
for ( final String roleName : allowedRoles.value() )
{
final SecurityRoleMetaData securityRoleMD = new SecurityRoleMetaData();
-
+
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 == 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/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2009-08-04 10:55:23 UTC (rev 10473)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2009-08-04 11:07:12 UTC (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 properties.
- *
+ *
* @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 = ( Map< String, String > )
dep.getProperty( WSConstants.STACK_CONTEXT_PARAMS );
-
+
if ( stackContextParams != null )
{
final List< ParamValueMetaData > contextParams = this.getContextParams( jbossWebMD );
@@ -94,14 +94,14 @@
/**
* Configures transport servlet class for every found webservice endpoint.
- *
+ *
* @param dep webservice deployment
* @param jbossWebMD web meta data
*/
private void configureEndpoints( final Deployment dep, final JBossWebMetaData jbossWebMD )
{
final Iterator< JBossServletMetaData > servlets = jbossWebMD.getServlets().iterator();
-
+
while ( servlets.hasNext() )
{
final ServletMetaData servletMD = servlets.next();
@@ -118,15 +118,15 @@
final List< ParamValueMetaData > initParams = this.getServletInitParams( servletMD );
final ParamValueMetaData endpointParam = 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 in deployment properties map
@@ -134,18 +134,18 @@
private String getTransportClassName( final Deployment dep )
{
final String transportClassName = ( String ) dep.getProperty( WSConstants.STACK_TRANSPORT_CLASS );
-
+
if ( transportClassName == null )
{
throw new IllegalStateException( "Cannot obtain deployment property: " + 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 = 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 = new ArrayList< ParamValueMetaData >();
servletMD.setInitParam( initParams );
}
-
+
return initParams;
}
/**
* Gets context params list. Constructs new context params list if it does not exist yet.
- *
+ *
* @param jbossWebMD web meta data
* @return context params list
*/
private List< ParamValueMetaData > getContextParams( final JBossWebMetaData jbossWebMD )
{
List< ParamValueMetaData > contextParams = jbossWebMD.getContextParams();
-
+
if ( contextParams == null )
{
contextParams = new ArrayList< ParamValueMetaData >();
jbossWebMD.setContextParams( contextParams );
}
-
+
return contextParams;
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2009-08-04 10:55:23 UTC (rev 10473)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/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 properties.
- *
+ *
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
* @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public final class WebMetaDataModifyingDeploymentAspect extends DeploymentAspect
{
-
+
/** Web meta data modifier. */
private WebMetaDataModifier webMetaDataModifier;
@@ -46,7 +46,7 @@
/**
* Sets Web meta data modifier. This method is called using MC injection.
- *
+ *
* @param webMDModifier web meta data modifier
*/
public void setWebMetaDataModifier( final WebMetaDataModifier webMDModifier )
@@ -56,12 +56,12 @@
/**
* Modifies web meta data.
- *
+ *
* @param dep webservice deployment
*/
public void start( final Deployment dep )
{
this.webMetaDataModifier.modify( dep );
}
-
+
}
14 years, 9 months
JBossWS SVN: r10473 - container/jboss50/branches/ropalka-jboss510.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-08-04 06:55:23 -0400 (Tue, 04 Aug 2009)
New Revision: 10473
Added:
container/jboss50/branches/ropalka-jboss510/.checkstyle
Modified:
container/jboss50/branches/ropalka-jboss510/.project
Log:
adding checkstyle
Added: container/jboss50/branches/ropalka-jboss510/.checkstyle
===================================================================
--- container/jboss50/branches/ropalka-jboss510/.checkstyle (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/.checkstyle 2009-08-04 10:55:23 UTC (rev 10473)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+ <local-check-config name="JBossWS" location="eclipse/JBossWSCheckStyle.xml" type="project" description="">
+ <additional-data name="protect-config-file" value="false"/>
+ </local-check-config>
+ <fileset name="all" enabled="true" check-config-name="JBossWS" local="true">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ </fileset>
+</fileset-config>
Modified: container/jboss50/branches/ropalka-jboss510/.project
===================================================================
--- container/jboss50/branches/ropalka-jboss510/.project 2009-08-04 10:54:21 UTC (rev 10472)
+++ container/jboss50/branches/ropalka-jboss510/.project 2009-08-04 10:55:23 UTC (rev 10473)
@@ -15,9 +15,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
</projectDescription>
14 years, 9 months
JBossWS SVN: r10472 - in container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration: deployers and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-08-04 06:54:21 -0400 (Tue, 04 Aug 2009)
New Revision: 10472
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSVirtualFileFilter.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/AbstractInvocationHandler.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXRPC.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXWS.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/SecurityAdapterFactoryImpl.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/SecurityAdaptorImpl.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptor.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityBuilder.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilder.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilderEJB21.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilderEJB3.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebAppGeneratorDeploymentAspect.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java
Log:
[JBWS-2332] fixing javadoc
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -32,9 +32,9 @@
/**
* A ServerConfig for AS <= 5.1.0
*
- * @author alessio.soldano(a)jboss.com
- * @author Thomas.Diesler(a)jboss.org
- *
+ * @author <a href="mailto:asoldano@redhat.com">Alessio Soldano</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public class ServerConfigImpl extends AbstractServerConfig implements AbstractServerConfigMBean
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -34,7 +34,7 @@
/**
* A deployer that delegates to JBossWS deployment aspect.
*
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
public final class WSDeploymentAspectDeployer extends AbstractRealDeployer
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -58,7 +58,7 @@
/**
* This deployer initializes JBossWS deployment meta data.
*
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
public final class WSDeploymentDeployer extends AbstractRealDeployer
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -29,7 +29,7 @@
/**
* webservices.xml deployer.
*
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
public final class WSDescriptorDeployer extends ObjectModelFactoryDeployer< WebservicesMetaData >
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -47,7 +47,7 @@
/**
* WebServiceDeployment deployer processes EJB containers and its metadata and creates WS adapters wrapping it.
*
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
public final class WSEJBAdapterDeployer extends AbstractRealDeployer
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -34,7 +34,7 @@
/**
* Detects Web Service deployment type.
*
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
public final class WSTypeDeployer extends AbstractRealDeployer
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSVirtualFileFilter.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSVirtualFileFilter.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSVirtualFileFilter.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -29,7 +29,7 @@
* WS file filter for files with the '.wsdl', or '.xsd' or '.xml' suffix.
*
* @author <a href="mailto:dbevenius@jboss.com">Daniel Bevenius</a>
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
public final class WSVirtualFileFilter implements VirtualFileFilterWithAttributes
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/AbstractInvocationHandler.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/AbstractInvocationHandler.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/AbstractInvocationHandler.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -27,7 +27,8 @@
import org.jboss.wsf.spi.invocation.InvocationHandler;
/**
- * @author Thomas.Diesler(a)jboss.org
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public abstract class AbstractInvocationHandler extends InvocationHandler
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -58,7 +58,8 @@
/**
* Handles invocations on EJB21 endpoints.
*
- * @author Thomas.Diesler(a)jboss.org
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public class InvocationHandlerEJB21 extends InvocationHandler
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -35,8 +35,8 @@
/**
* Handles invocations on EJB3 endpoints.
*
- * @author Thomas.Diesler(a)jboss.org
- * @author Heiko.Braun(a)jboss.com
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public class InvocationHandlerEJB3 extends AbstractInvocationHandler
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -26,7 +26,8 @@
/**
* The default invocation model factory fro AS 5.0.
*
- * @author Heiko.Braun(a)jboss.com
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public class InvocationHandlerFactoryImpl extends InvocationHandlerFactory
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXRPC.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXRPC.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXRPC.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -31,7 +31,8 @@
/**
* Handles invocations on JSE endpoints.
*
- * @author Thomas.Diesler(a)jboss.org
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public class InvocationHandlerJAXRPC extends InvocationHandlerJSE
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXWS.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXWS.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXWS.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -24,7 +24,8 @@
/**
* Handles invocations on JSE endpoints.
*
- * @author Thomas.Diesler(a)jboss.org
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public class InvocationHandlerJAXWS extends InvocationHandlerJSE
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -41,8 +41,8 @@
/**
* Handles invocations on JSE endpoints.
*
- * @author Thomas.Diesler(a)jboss.org
- * @author richard.opalka(a)jboss.com
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public class InvocationHandlerJSE extends InvocationHandler
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -31,7 +31,8 @@
/**
* Handles invocations on MDB EJB21 endpoints.
*
- * @author Thomas.Diesler(a)jboss.org
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public class InvocationHandlerMDB21 extends AbstractInvocationHandler
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -31,7 +31,8 @@
/**
* Handles invocations on MDB EJB3 endpoints.
*
- * @author Thomas.Diesler(a)jboss.org
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public class InvocationHandlerMDB3 extends AbstractInvocationHandler
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/SecurityAdapterFactoryImpl.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/SecurityAdapterFactoryImpl.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/SecurityAdapterFactoryImpl.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -25,7 +25,8 @@
import org.jboss.wsf.spi.invocation.SecurityAdaptor;
/**
- * @author Heiko.Braun(a)jboss.com
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public class SecurityAdapterFactoryImpl extends SecurityAdaptorFactory
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/SecurityAdaptorImpl.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/SecurityAdaptorImpl.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/SecurityAdaptorImpl.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -35,7 +35,8 @@
/**
* A JBoss specific SecurityAssociationAdaptor
*
- * @author Thomas.Diesler(a)jboss.org
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public class SecurityAdaptorImpl implements SecurityAdaptor
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptor.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptor.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptor.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -36,7 +36,8 @@
* According to the ws4ee spec the handler logic must be invoked after the container
* applied method level security to the invocation.
*
- * @author Thomas.Diesler(a)jboss.org
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public class ServiceEndpointInterceptor extends AbstractInterceptor
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -32,8 +32,8 @@
/**
* An aspect that builds container independent meta data.
*
- * @author Thomas.Diesler(a)jboss.org
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public final class ContainerMetaDataDeploymentAspect extends DeploymentAspect
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -48,7 +48,8 @@
/**
* Builds container independent meta data from EJB21 container meta data.
*
- * @author Thomas.Diesler(a)jboss.org
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
final class MetaDataBuilderEJB21
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -44,7 +44,8 @@
/**
* Builds container independent meta data from EJB3 container meta data.
*
- * @author Thomas.Diesler(a)jboss.org
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
final class MetaDataBuilderEJB3
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -51,7 +51,8 @@
/**
* Builds container independent meta data from WEB container meta data.
*
- * @author Thomas.Diesler(a)jboss.org
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
final class MetaDataBuilderJSE
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityBuilder.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityBuilder.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityBuilder.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -28,19 +28,29 @@
/**
* Creates web app security meta data for EJB deployment.
*
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
abstract class AbstractSecurityBuilder implements SecurityBuilder
{
/** JAAS JNDI prefix. */
private static final String JAAS_JNDI_PREFIX = "java:/jaas/";
-
+
+ /**
+ * Constructor.
+ */
protected AbstractSecurityBuilder()
{
super();
}
+ /**
+ * @see org.jboss.webservices.integration.tomcat.SecurityBuilder#addSecurityDomain(JBossWebMetaData, Deployment)
+ *
+ * @param jbossWebMD jboss web meta data
+ * @param dep webservice deployment
+ */
public final void addSecurityDomain( final JBossWebMetaData jbossWebMD, final Deployment dep )
{
final String securityDomain = this.getSecurityDomain( dep );
@@ -52,22 +62,44 @@
}
}
- public final void addSecurityRoles( final JBossWebMetaData webAppMD, final Deployment dep )
+ /**
+ * @see org.jboss.webservices.integration.tomcat.SecurityBuilder#addSecurityRoles(JBossWebMetaData, Deployment)
+ *
+ * @param jbossWebMD jboss web meta data
+ * @param dep webservice deployment
+ */
+ public final void addSecurityRoles( final JBossWebMetaData jbossWebMD, final Deployment dep )
{
final SecurityRolesMetaData securityRolesMD = this.getSecurityRoles( dep );
if ( securityRolesMD != null )
{
- webAppMD.setSecurityRoles( securityRolesMD );
+ jbossWebMD.setSecurityRoles( securityRolesMD );
}
}
- // Template method
+ /**
+ * Template method for obtaining security domain from EJB deployment.
+ *
+ * @param dep webservice deployment
+ * @return security domain associated with EJB deployment
+ */
protected abstract String getSecurityDomain( final Deployment dep );
- // Template method
+ /**
+ * Template method for obtaining security roles from EJB deployment.
+ *
+ * @param dep webservice deployment
+ * @return security roles associated with EJB deployment
+ */
protected abstract SecurityRolesMetaData getSecurityRoles( final Deployment dep );
+ /**
+ * 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
+ */
private String appendJaasPrefix( final String securityDomain )
{
if ( securityDomain != null )
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilder.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilder.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilder.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -27,15 +27,26 @@
/**
* Creates web app security meta data for EJB deployments.
*
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
-public interface SecurityBuilder
+interface SecurityBuilder
{
- /** Adds the security domain to jboss-web.xml */
- void addSecurityDomain( JBossWebMetaData jbossWeb, Deployment dep );
+ /**
+ * Adds a security domain to jboss-web.xml.
+ *
+ * @param jbossWebMD jboss web meta data
+ * @param dep webservice deployment
+ */
+ void addSecurityDomain( JBossWebMetaData jbossWebMD, Deployment dep );
- /** Adds the security roles to web.xml */
- void addSecurityRoles( JBossWebMetaData webApp, Deployment dep );
+ /**
+ * Adds security roles to web.xml.
+ *
+ * @param jbossWebMD jboss web meta data
+ * @param dep webservice deployment
+ */
+ void addSecurityRoles( JBossWebMetaData jbossWebMD, Deployment dep );
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilderEJB21.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilderEJB21.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilderEJB21.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -31,16 +31,26 @@
/**
* Creates web app security meta data for EJB 21 deployment.
*
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public final class SecurityBuilderEJB21 extends AbstractSecurityBuilder
{
+ /**
+ * Constructor.
+ */
public SecurityBuilderEJB21()
{
super();
}
+ /**
+ * @see org.jboss.webservices.integration.tomcat.AbstractSecurityBuilder#getSecurityDomain(Deployment)
+ *
+ * @param dep webservice deployment
+ * @return security domain associated with EJB 21 deployment
+ */
protected String getSecurityDomain( final Deployment dep )
{
final EJBArchiveMetaData ejbMetaData = WSHelper.getRequiredAttachment( dep, EJBArchiveMetaData.class );
@@ -48,6 +58,12 @@
return ejbMetaData.getSecurityDomain();
}
+ /**
+ * @see org.jboss.webservices.integration.tomcat.AbstractSecurityBuilder#getSecurityRoles(Deployment)
+ *
+ * @param dep webservice deployment
+ * @return security roles associated with EJB 21 deployment
+ */
protected SecurityRolesMetaData getSecurityRoles( final Deployment dep )
{
final JBossMetaData jbossWebMD = WSHelper.getRequiredAttachment( dep, JBossMetaData.class );
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilderEJB3.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilderEJB3.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityBuilderEJB3.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -21,6 +21,10 @@
*/
package org.jboss.webservices.integration.tomcat;
+import java.util.Iterator;
+
+import javax.annotation.security.RolesAllowed;
+
import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
@@ -29,27 +33,34 @@
import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
-import javax.annotation.security.RolesAllowed;
-import java.util.Iterator;
-
/**
* Creates web app security meta data for EJB 3 deployment.
*
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public final class SecurityBuilderEJB3 extends AbstractSecurityBuilder
{
+ /**
+ * Constructor.
+ */
public SecurityBuilderEJB3()
{
super();
}
-
+
+ /**
+ * @see org.jboss.webservices.integration.tomcat.AbstractSecurityBuilder#getSecurityDomain(Deployment)
+ *
+ * @param dep webservice deployment
+ * @return security domain associated with EJB 3 deployment
+ */
protected String getSecurityDomain( final Deployment dep )
{
- final WebServiceDeployment webServiceDeployment = WSHelper.getRequiredAttachment( dep, WebServiceDeployment.class );
+ final WebServiceDeployment wsDeployment = WSHelper.getRequiredAttachment( dep, WebServiceDeployment.class );
String securityDomain = null;
- final Iterator< WebServiceDeclaration > ejbContainers = webServiceDeployment.getServiceEndpoints().iterator();
+ final Iterator< WebServiceDeclaration > ejbContainers = wsDeployment.getServiceEndpoints().iterator();
while ( ejbContainers.hasNext() )
{
@@ -62,17 +73,23 @@
return securityDomain;
}
+ /**
+ * @see org.jboss.webservices.integration.tomcat.AbstractSecurityBuilder#getSecurityRoles(Deployment)
+ *
+ * @param dep webservice deployment
+ * @return security roles associated with EJB 21 deployment
+ */
protected SecurityRolesMetaData getSecurityRoles( final Deployment dep )
{
- final WebServiceDeployment webServiceDeployment = WSHelper.getRequiredAttachment( dep, WebServiceDeployment.class );
+ final WebServiceDeployment wsDeployment = WSHelper.getRequiredAttachment( dep, WebServiceDeployment.class );
final SecurityRolesMetaData securityRolesMD = new SecurityRolesMetaData();
- final Iterator< WebServiceDeclaration > ejbContainers = webServiceDeployment.getServiceEndpoints().iterator();
+ final Iterator< WebServiceDeclaration > ejbContainers = wsDeployment.getServiceEndpoints().iterator();
while ( ejbContainers.hasNext() )
{
final WebServiceDeclaration ejbContainer = ejbContainers.next();
final RolesAllowed allowedRoles = ejbContainer.getAnnotation( RolesAllowed.class );
- final boolean hasAllowedRoles = ( allowedRoles != null );
+ final boolean hasAllowedRoles = allowedRoles != null;
if ( hasAllowedRoles )
{
@@ -89,6 +106,14 @@
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
+ * @throws IllegalStateException if domains have different values
+ */
private String getDomain( final String oldSecurityDomain, final SecurityDomain nextSecurityDomain )
{
if ( nextSecurityDomain == null )
@@ -106,6 +131,13 @@
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
+ */
private void ensureSameDomains( final String oldSecurityDomain, final String newSecurityDomain )
{
final boolean domainsDiffer = !oldSecurityDomain.equals( newSecurityDomain );
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebAppGeneratorDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebAppGeneratorDeploymentAspect.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebAppGeneratorDeploymentAspect.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -49,7 +49,8 @@
/**
* A deployment aspect that generates a webapp for an EJB endpoint
*
- * @author Thomas.Diesler(a)jboss.org
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public final class WebAppGeneratorDeploymentAspect extends DeploymentAspect
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -42,6 +42,7 @@
* plus propagates WS stack specific context parameters if required.
*
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public final class WebMetaDataModifier
{
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2009-08-04 10:22:58 UTC (rev 10471)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2009-08-04 10:54:21 UTC (rev 10472)
@@ -28,6 +28,7 @@
* Modifies web meta data to configure webservice stack endpoints and properties.
*
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
public final class WebMetaDataModifyingDeploymentAspect extends DeploymentAspect
{
14 years, 9 months
JBossWS SVN: r10471 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-08-04 06:22:58 -0400 (Tue, 04 Aug 2009)
New Revision: 10471
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
Log:
[JBWS-2507] Removing FIXME
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2009-08-04 10:15:18 UTC (rev 10470)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2009-08-04 10:22:58 UTC (rev 10471)
@@ -110,18 +110,12 @@
javaSource = new File(directory.getAbsolutePath() + FS + "org" + FS + "jboss" + FS + "test" + FS + "ws" + FS + "jaxws" + FS + "smoke" + FS + "tools" + FS
+ "jaxws" + FS + "GetKeysResponse.java");
assertTrue("Source not generated", javaSource.exists());
- String contents;
- if (isIntegrationCXF())
- {
- System.out.println("FIXME: [JBWS-2507] Support generics in wrapper classes");
- }
- else
- {
- contents = readFile(javaSource);
- //[JBWS-2477] check support for generics
- assertTrue("Didn't found method \"public Set<Integer> getReturn()\"", contents.contains("public Set<Integer> getReturn()"));
- }
+ String contents = readFile(javaSource);
+ //[JBWS-2477] check support for generics
+ boolean bool = contents.contains("public Set<Integer> getReturn()") || contents.contains(" public java.util.Set<java.lang.Integer> getReturn()");
+ assertTrue("Didn't found method \"public Set<Integer> getReturn()\"", bool);
+
javaSource = new File(directory.getAbsolutePath() + FS + "org" + FS + "jboss" + FS + "test" + FS + "ws" + FS + "jaxws" + FS + "smoke" + FS + "tools" + FS
+ "jaxws" + FS + "ProcessListResponse.java");
assertTrue("Source not generated", javaSource.exists());
14 years, 9 months
JBossWS SVN: r10470 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-08-04 06:15:18 -0400 (Tue, 04 Aug 2009)
New Revision: 10470
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java
Log:
[JBWS-2508] Invoking new methods allowing for an output stream to be specified
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2009-08-04 10:14:29 UTC (rev 10469)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2009-08-04 10:15:18 UTC (rev 10470)
@@ -221,7 +221,7 @@
WSDLToJava w2j = new WSDLToJava(args.toArray(new String[0]));
try
{
- w2j.run(new ToolContext());
+ w2j.run(new ToolContext(), stream);
}
catch (Throwable t)
{
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java 2009-08-04 10:14:29 UTC (rev 10469)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java 2009-08-04 10:15:18 UTC (rev 10470)
@@ -22,6 +22,7 @@
package org.jboss.wsf.stack.cxf.tools;
import java.io.File;
+import java.io.OutputStream;
import java.io.PrintStream;
import java.net.URL;
import java.net.URLClassLoader;
@@ -172,7 +173,7 @@
args.add(endpointClass.getCanonicalName());
JavaToWS j2w = new JavaToWS(args.toArray(new String[0]));
- j2w.run();
+ j2w.run(stream);
}
catch (Throwable t)
{
14 years, 9 months