JBossWS SVN: r10291 - in container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50: deployment/tomcat and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-02 09:24:31 -0400 (Thu, 02 Jul 2009)
New Revision: 10291
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerUtils.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentAspectDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSTypeDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifier.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
Log:
[JBWS-2332][JBWS-2382] refactoring (WIP)
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerUtils.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerUtils.java 2009-07-02 11:22:52 UTC (rev 10290)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerUtils.java 2009-07-02 13:24:31 UTC (rev 10291)
@@ -22,18 +22,22 @@
package org.jboss.wsf.container.jboss50.deployer;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
import java.util.List;
import javax.jws.WebService;
import javax.servlet.Servlet;
import javax.xml.ws.WebServiceProvider;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.metadata.javaee.spec.ParamValueMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.ServletMetaData;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
/**
* TODO: javadoc
@@ -63,24 +67,43 @@
return isWebServiceBean;
}
+
+ static final boolean isEjb3Deployment( final DeploymentUnit unit )
+ {
+ final WebServiceDeployment wsDeployment = unit.getAttachment( WebServiceDeployment.class );
+
+ Iterator<WebServiceDeclaration> it = wsDeployment.getServiceEndpoints().iterator();
+ while (it.hasNext())
+ {
+ WebServiceDeclaration container = it.next();
+ if (DeployerUtils.isWebServiceBean(container))
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
- static final List<ServletMetaData> getRelevantJAXWSServlets( final JBossWebMetaData webMD, final ClassLoader loader)
+ static final List<ServletMetaData> getJaxwsServlets( final DeploymentUnit unit )
{
- return DeployerUtils.getRelevantServlets( webMD, loader, true );
+ return DeployerUtils.getRelevantServlets( unit, true );
}
- static List<ServletMetaData> getRelevantJAXRPCServlets( final JBossWebMetaData webMD, final ClassLoader loader)
+ static List<ServletMetaData> getJaxrpcServlets( final DeploymentUnit unit )
{
- return DeployerUtils.getRelevantServlets( webMD, loader, false );
+ return DeployerUtils.getRelevantServlets( unit, false );
}
- private static final List< ServletMetaData > getRelevantServlets
- (
- final JBossWebMetaData webMD, final ClassLoader loader, final boolean jaxws
- )
+ private static final List< ServletMetaData > getRelevantServlets( final DeploymentUnit unit, final boolean jaxws )
{
+ try
+ {
+ final JBossWebMetaData jbossWebMD = unit.getAttachment(JBossWebMetaData.class);
+ final ClassLoader loader = unit.getClassLoader();
+
List<ServletMetaData> endpoints = new ArrayList<ServletMetaData>();
- for (ServletMetaData servlet : webMD.getServlets())
+ for (ServletMetaData servlet : jbossWebMD.getServlets())
{
String servletClassName = getTargetBean(servlet);
@@ -120,6 +143,12 @@
}
return endpoints;
+ }
+ catch (Exception ex)
+ {
+ log.error("Cannot process web deployment", ex);
+ return Collections.emptyList();
+ }
}
static String getTargetBean(ServletMetaData servlet)
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentAspectDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentAspectDeployer.java 2009-07-02 11:22:52 UTC (rev 10290)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentAspectDeployer.java 2009-07-02 13:24:31 UTC (rev 10291)
@@ -27,25 +27,29 @@
import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.wsf.container.jboss50.ASIntegrationHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
/**
* A deployer that delegates to JBossWS deployment aspect.
*
* @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
*/
-public class WSDeploymentAspectDeployer extends AbstractRealDeployer
+public final class WSDeploymentAspectDeployer extends AbstractRealDeployer
{
+ /** JBossWS specific inputs/outputs prefix. */
private static final String JBOSSWS_ATTACHMENT_PREFIX = "jbossws.";
+ /** Delegee. */
private final DeploymentAspect aspect;
/**
* Constructor.
+ *
+ * @param aspect deployment aspect
*/
- public WSDeploymentAspectDeployer( DeploymentAspect aspect )
+ public WSDeploymentAspectDeployer( final DeploymentAspect aspect )
{
super();
@@ -59,7 +63,7 @@
final Set< String > inputs = aspect.getRequiresAsSet();
for ( String input : inputs )
{
- this.addInput( JBOSSWS_ATTACHMENT_PREFIX + input );
+ this.addInput( WSDeploymentAspectDeployer.JBOSSWS_ATTACHMENT_PREFIX + input );
}
// outputs
@@ -69,14 +73,21 @@
final Set< String > outputs = aspect.getProvidesAsSet();
for ( String output : outputs )
{
- this.addOutput( JBOSSWS_ATTACHMENT_PREFIX + output );
+ this.addOutput( WSDeploymentAspectDeployer.JBOSSWS_ATTACHMENT_PREFIX + output );
}
}
+ /**
+ * If deployed unit is related to web services this method delegates
+ * to deployment aspect and calls its create() and start() methods.
+ *
+ * @param unit deployment unit
+ * @throws DeploymentException on deployment failure
+ */
@Override
- public void internalDeploy(DeploymentUnit unit) throws DeploymentException
+ public void internalDeploy( final DeploymentUnit unit ) throws DeploymentException
{
- if ( this.isWebServiceDeployment( unit ) )
+ if ( ASIntegrationHelper.isWebServiceDeployment( unit ) )
{
log.debug( this.aspect.getClass() + " deploy: " + unit.getName() );
final Deployment dep = unit.getAttachment( Deployment.class );
@@ -85,10 +96,16 @@
}
}
+ /**
+ * If undeployed unit is related to web services this method delegates
+ * to deployment aspect and calls its stop() and destroy() methods.
+ *
+ * @param unit deployment unit
+ */
@Override
- public void internalUndeploy(DeploymentUnit unit)
+ public void internalUndeploy( final DeploymentUnit unit )
{
- if ( this.isWebServiceDeployment( unit ) )
+ if ( ASIntegrationHelper.isWebServiceDeployment( unit ) )
{
log.debug( this.aspect.getClass() + " undeploy: " + unit.getName() );
final Deployment dep = unit.getAttachment( Deployment.class );
@@ -97,9 +114,4 @@
}
}
- private boolean isWebServiceDeployment( final DeploymentUnit unit )
- {
- return unit.getAttachment( DeploymentType.class ) != null;
- }
-
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentDeployer.java 2009-07-02 11:22:52 UTC (rev 10290)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentDeployer.java 2009-07-02 13:24:31 UTC (rev 10291)
@@ -255,7 +255,7 @@
// Copy the attachments
dep.addAttachment(JBossWebMetaData.class, webMetaData);
- List<ServletMetaData> servlets = DeployerUtils.getRelevantJAXWSServlets(webMetaData, unit.getClassLoader());
+ List<ServletMetaData> servlets = DeployerUtils.getJaxwsServlets(unit);
for (ServletMetaData servlet : servlets)
{
String servletName = servlet.getName();
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSTypeDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSTypeDeployer.java 2009-07-02 11:22:52 UTC (rev 10290)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSTypeDeployer.java 2009-07-02 13:24:31 UTC (rev 10291)
@@ -21,23 +21,17 @@
*/
package org.jboss.wsf.container.jboss50.deployer;
-import java.util.Iterator;
-import java.util.List;
-
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.metadata.web.spec.ServletMetaData;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
/**
- * Detects webservice deployment type.
- * TODO: move all isWebServiceDeployment staff here, use DeploymentVisitor?
+ * Detects Web Service deployment type.
*
* @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
*/
@@ -62,107 +56,105 @@
}
/**
- * Detects deployment type and puts it to the deployment unit attachment.
+ * Detects WS deployment type and puts it to the deployment unit attachments.
+ *
+ * @param unit deployment unit
+ * @throws DeploymentException on failure
*/
@Override
protected void internalDeploy( final DeploymentUnit unit ) throws DeploymentException
{
- if ( isJAXRPCEJB21DeploymentType( unit ) )
+ if ( this.isJaxrpcEjbDeployment( unit ) )
{
unit.addAttachment( DeploymentType.class, DeploymentType.JAXRPC_EJB21 );
}
- else if ( isJAXWSEJB3DeploymentType( unit ) )
+ else if ( this.isJaxwsEjbDeployment( unit ) )
{
unit.addAttachment( DeploymentType.class, DeploymentType.JAXWS_EJB3 );
}
- else if ( isJAXRPCJSEDeploymentType( unit ) )
+ else if ( this.isJaxrpcPojoDeployment( unit ) )
{
unit.addAttachment( DeploymentType.class, DeploymentType.JAXRPC_JSE );
}
- else if ( isJAXWSJSEDeploymentType( unit ) )
+ else if ( this.isJaxwsPojoDeployment( unit ) )
{
unit.addAttachment( DeploymentType.class, DeploymentType.JAXWS_JSE );
}
}
- private boolean isJAXRPCEJB21DeploymentType( final DeploymentUnit unit )
+ /**
+ * Returns true if JAXRPC EJB deployment is detected.
+ *
+ * @param unit deployment unit
+ * @return true if JAXRPC EJB, false otherwise
+ */
+ private boolean isJaxrpcEjbDeployment( final DeploymentUnit unit )
{
- WebservicesMetaData wsMetaData = unit.getAttachment( WebservicesMetaData.class );
- return ( wsMetaData != null ) && ( unit.getAllMetaData( JBossMetaData.class ).size() > 0 );
+ final boolean isJaxrpc = unit.getAttachment( WebservicesMetaData.class ) != null;
+ final boolean hasJBossMD = unit.getAllMetaData( JBossMetaData.class ).size() > 0;
+
+ return isJaxrpc && hasJBossMD;
}
- private boolean isJAXRPCJSEDeploymentType( final DeploymentUnit unit )
+ /**
+ * Returns true if JAXRPC POJO deployment is detected.
+ *
+ * @param unit deployment unit
+ * @return true if JAXRPC POJO, false otherwise
+ */
+ private boolean isJaxrpcPojoDeployment( final DeploymentUnit unit )
{
- JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class);
-
- if (webMetaData == null)
+ final boolean isJaxrpc = unit.getAttachment( WebservicesMetaData.class ) != null;
+ final boolean hasJBossWebMD = unit.getAttachment( JBossWebMetaData.class ) != null;
+
+ if ( isJaxrpc && hasJBossWebMD )
{
- return false;
+ return DeployerUtils.getJaxrpcServlets( unit ).size() > 0;
}
-
- WebservicesMetaData wsMetaData = unit.getAttachment( WebservicesMetaData.class );
- if ( wsMetaData == null )
+ else
{
return false;
}
-
- boolean isWebServiceDeployment = false;
- try
- {
- List<ServletMetaData> servlets = DeployerUtils.getRelevantJAXRPCServlets(webMetaData, unit.getClassLoader());
- isWebServiceDeployment = servlets.size() > 0;
- }
- catch (Exception ex)
- {
- log.error("Cannot process web deployment", ex);
- }
-
- return isWebServiceDeployment;
}
- private boolean isJAXWSEJB3DeploymentType( final DeploymentUnit unit )
+ /**
+ * Returns true if JAXWS EJB deployment is detected.
+ *
+ * @param unit deployment unit
+ * @return true if JAXWS EJB, false otherwise
+ */
+ private boolean isJaxwsEjbDeployment( final DeploymentUnit unit )
{
- WebServiceDeployment webServiceDeployment = unit.getAttachment(WebServiceDeployment.class);
- if (null == webServiceDeployment )
- return false;
+ final boolean hasWSDeployment = unit.getAttachment( WebServiceDeployment.class ) != null;
- boolean isWebServiceDeployment = false;
-
- Iterator<WebServiceDeclaration> it = webServiceDeployment.getServiceEndpoints().iterator();
- while (it.hasNext())
+ if ( hasWSDeployment )
{
- WebServiceDeclaration container = it.next();
- if (DeployerUtils.isWebServiceBean(container))
- {
- isWebServiceDeployment = true;
- break;
- }
+ return DeployerUtils.isEjb3Deployment( unit );
}
-
- return isWebServiceDeployment;
- }
-
- public boolean isJAXWSJSEDeploymentType( final DeploymentUnit unit )
- {
- JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class);
-
- if (webMetaData == null)
+ else
{
return false;
}
+ }
- boolean isWebServiceDeployment = false;
- try
+ /**
+ * Returns true if JAXWS POJO deployment is detected.
+ *
+ * @param unit deployment unit
+ * @return true if JAXWS POJO, false otherwise
+ */
+ private boolean isJaxwsPojoDeployment( final DeploymentUnit unit )
+ {
+ final boolean hasJBossWebMD = unit.getAttachment( JBossWebMetaData.class ) != null;
+
+ if ( hasJBossWebMD )
{
- List<ServletMetaData> servlets = DeployerUtils.getRelevantJAXWSServlets(webMetaData, unit.getClassLoader());
- isWebServiceDeployment = servlets.size() > 0;
+ return DeployerUtils.getJaxwsServlets( unit ).size() > 0;
}
- catch (Exception ex)
+ else
{
- log.error("Cannot process web deployment", ex);
+ return false;
}
-
- return isWebServiceDeployment;
}
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifier.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifier.java 2009-07-02 11:22:52 UTC (rev 10290)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifier.java 2009-07-02 13:24:31 UTC (rev 10291)
@@ -33,7 +33,6 @@
{
static String PROPERTY_WEBAPP_CONTEXT_PARAMETERS = "org.jboss.ws.webapp.ContextParameterMap";
static String PROPERTY_WEBAPP_SERVLET_CLASS = "org.jboss.ws.webapp.ServletClass";
- static String PROPERTY_WEBAPP_SERVLET_CONTEXT_LISTENER = "org.jboss.ws.webapp.ServletContextListener";
- void modifyMetaData( Deployment dep ) throws ClassNotFoundException;
+ void modifyMetaData( Deployment dep );
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java 2009-07-02 11:22:52 UTC (rev 10290)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java 2009-07-02 13:24:31 UTC (rev 10291)
@@ -91,19 +91,6 @@
}
}
- String listenerClass = (String)dep.getProperty(PROPERTY_WEBAPP_SERVLET_CONTEXT_LISTENER);
- if (listenerClass != null)
- {
- List<ListenerMetaData> listeners = jbwmd.getListeners();
- if (listeners == null)
- {
- listeners = new ArrayList<ListenerMetaData>();
- jbwmd.setListeners(listeners);
- }
- ListenerMetaData listener = new ListenerMetaData();
- listener.setListenerClass(listenerClass);
- }
-
for (Iterator it = jbwmd.getServlets().iterator(); it.hasNext();)
{
JBossServletMetaData servlet = (JBossServletMetaData)it.next();
16 years, 4 months
- 1
- 0
JBossWS SVN: r10290 - in container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50: deployment/tomcat and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-02 07:22:52 -0400 (Thu, 02 Jul 2009)
New Revision: 10290
Removed:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/RewriteResults.java
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifier.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentAspect.java
Log:
[JBWS-2332][JBWS-2382] refactoring (WIP)
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java 2009-07-02 09:56:53 UTC (rev 10289)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java 2009-07-02 11:22:52 UTC (rev 10290)
@@ -46,10 +46,10 @@
import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.wsf.common.injection.resolvers.ResourceReferenceResolver;
+import org.jboss.wsf.container.jboss50.ASIntegrationHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.injection.InjectionMetaData;
@@ -83,11 +83,11 @@
List<InjectionMetaData> injectionMD = new LinkedList<InjectionMetaData>();
Map<Class<? extends Annotation>, ReferenceResolver> resolvers = createResolvers(unit);
- DeploymentType deploymentType = dep.getType();
try
{
- if (deploymentType == DeploymentType.JAXWS_JSE)
+
+ if ( ASIntegrationHelper.isJaxwsPojoDeployment( unit ) )
{
injectionMD.addAll(buildInjectionMetaData(webMD.getEnvironmentEntries()));
for (Endpoint endpoint : dep.getService().getEndpoints())
@@ -96,7 +96,7 @@
endpoint.addAttachment(InjectionsMetaData.class, injectionsMD);
}
}
- else if (deploymentType == DeploymentType.JAXWS_EJB3)
+ else if ( ASIntegrationHelper.isJaxwsEjbDeployment( unit ) )
{
JBossMetaData jbossMD = unit.getAttachment(JBossMetaData.class);
JBossEnterpriseBeansMetaData jebMDs = jbossMD.getEnterpriseBeans();
Deleted: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/RewriteResults.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/RewriteResults.java 2009-07-02 09:56:53 UTC (rev 10289)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/RewriteResults.java 2009-07-02 11:22:52 UTC (rev 10290)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jboss.wsf.container.jboss50.deployment.tomcat;
-
-import java.net.URL;
-import java.util.Map;
-import java.util.HashMap;
-
-/**
- * @author Heiko.Braun(a)jboss.com
- * Created: Jul 19, 2007
- */
-public class RewriteResults
-{
- // The URL to the rewritten web.xml
- public URL webXML;
- // Maps the servlet name to the target bean
- public Map<String, String> sepTargetMap = new HashMap<String, String>();
-}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifier.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifier.java 2009-07-02 09:56:53 UTC (rev 10289)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifier.java 2009-07-02 11:22:52 UTC (rev 10290)
@@ -27,15 +27,13 @@
* Modifies the web app according to the stack requirements.
*
* @author Thomas.Diesler(a)jboss.org
- * @since 19-May-2007
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
public interface WebMetaDataModifier
{
- final static String PROPERTY_GENERATED_WEBAPP = "org.jboss.ws.generated.webapp";
- final static String PROPERTY_WEBAPP_CONTEXT_PARAMETERS = "org.jboss.ws.webapp.ContextParameterMap";
- final static String PROPERTY_WEBAPP_SERVLET_CLASS = "org.jboss.ws.webapp.ServletClass";
- final static String PROPERTY_WEBAPP_SERVLET_CONTEXT_LISTENER = "org.jboss.ws.webapp.ServletContextListener";
- final static String PROPERTY_WEBAPP_URL = "org.jboss.ws.webapp.url";
+ static String PROPERTY_WEBAPP_CONTEXT_PARAMETERS = "org.jboss.ws.webapp.ContextParameterMap";
+ static String PROPERTY_WEBAPP_SERVLET_CLASS = "org.jboss.ws.webapp.ServletClass";
+ static String PROPERTY_WEBAPP_SERVLET_CONTEXT_LISTENER = "org.jboss.ws.webapp.ServletContextListener";
- RewriteResults modifyMetaData(Deployment dep) throws ClassNotFoundException;
+ void modifyMetaData( Deployment dep ) throws ClassNotFoundException;
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java 2009-07-02 09:56:53 UTC (rev 10289)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java 2009-07-02 11:22:52 UTC (rev 10290)
@@ -39,14 +39,14 @@
* The rewriter for web.xml
*
* @author Thomas.Diesler(a)jboss.org
- * @since 19-May-2007
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
public class WebMetaDataModifierImpl implements WebMetaDataModifier
{
// logging support
private static Logger log = Logger.getLogger(WebMetaDataModifierImpl.class);
- public RewriteResults modifyMetaData(Deployment dep)
+ public void modifyMetaData(Deployment dep)
{
JBossWebMetaData jbwmd = dep.getAttachment(JBossWebMetaData.class);
if (jbwmd == null)
@@ -54,8 +54,7 @@
try
{
- RewriteResults results = modifyMetaData(dep, jbwmd);
- return results;
+ modifyMetaData(dep, jbwmd);
}
catch (RuntimeException rte)
{
@@ -67,10 +66,8 @@
}
}
- private RewriteResults modifyMetaData(Deployment dep, JBossWebMetaData jbwmd) throws ClassNotFoundException
+ private void modifyMetaData(Deployment dep, JBossWebMetaData jbwmd) throws ClassNotFoundException
{
- RewriteResults results = new RewriteResults();
-
String servletClass = (String)dep.getProperty(PROPERTY_WEBAPP_SERVLET_CLASS);
if (servletClass == null)
throw new IllegalStateException("Cannot obtain context property: " + PROPERTY_WEBAPP_SERVLET_CLASS);
@@ -161,14 +158,6 @@
log.info("Ignore servlet: " + orgServletClassName);
continue;
}
- /*
- Legacy code: This shouldn't be used in recent AS 5 versions
-
- else if (orgServletClassName.endsWith("Servlet"))
- {
- log.info("Ignore <servlet-class> that ends with 'Servlet': " + orgServletClassName);
- continue;
- }*/
servlet.setServletClass(servletClass);
@@ -185,12 +174,7 @@
if (targetBeanName == null)
throw new IllegalStateException("Cannot obtain service endpoint bean for: " + linkName);
-
- // remember the target bean name
- results.sepTargetMap.put(linkName, targetBeanName);
}
-
- return results;
}
// Return true if the web.xml is already modified
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentAspect.java 2009-07-02 09:56:53 UTC (rev 10289)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentAspect.java 2009-07-02 11:22:52 UTC (rev 10290)
@@ -72,7 +72,6 @@
// Attaching it to the DeploymentUnit will cause a new webapp deployment
unit.addAttachment(JBossWebMetaData.class, jbwmd);
- unit.addAttachment(WebMetaDataModifier.PROPERTY_GENERATED_WEBAPP, Boolean.TRUE);
}
catch (Exception ex)
{
16 years, 4 months
- 1
- 0
JBossWS SVN: r10289 - in container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50: deployer and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-02 05:56:53 -0400 (Thu, 02 Jul 2009)
New Revision: 10289
Added:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/ASIntegrationHelper.java
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java
Log:
[JBWS-2332][JBWS-2382] refactoring (WIP)
Added: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/ASIntegrationHelper.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/ASIntegrationHelper.java (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/ASIntegrationHelper.java 2009-07-02 09:56:53 UTC (rev 10289)
@@ -0,0 +1,136 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.wsf.container.jboss50;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+
+/**
+ * JBoss AS integration helper class.
+ *
+ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public final class ASIntegrationHelper
+{
+
+ /**
+ * Forbidden constructor.
+ */
+ private ASIntegrationHelper()
+ {
+ super();
+ }
+
+ public static boolean isWebServiceDeployment( final DeploymentUnit unit )
+ {
+ return unit.getAttachment( DeploymentType.class ) != null;
+ }
+
+ public static boolean isPojoDeployment( final DeploymentUnit unit )
+ {
+ if ( ASIntegrationHelper.isWebServiceDeployment( unit ) )
+ {
+ final DeploymentType deploymentType = unit.getAttachment( DeploymentType.class );
+ final boolean isJaxrpcPojo = DeploymentType.JAXRPC_JSE.equals( deploymentType );
+ final boolean isJaxwsPojo = DeploymentType.JAXWS_JSE.equals( deploymentType );
+
+ return isJaxwsPojo || isJaxrpcPojo;
+ }
+
+ return false;
+ }
+
+ public static boolean isEjbDeployment( final DeploymentUnit unit )
+ {
+ if ( ASIntegrationHelper.isWebServiceDeployment( unit ) )
+ {
+ final DeploymentType deploymentType = unit.getAttachment( DeploymentType.class );
+ final boolean isJaxwsEjb3 = DeploymentType.JAXWS_EJB3.equals( deploymentType );
+ final boolean isJaxrpcEjb21 = DeploymentType.JAXRPC_EJB21.equals( deploymentType );
+
+ return isJaxwsEjb3 || isJaxrpcEjb21;
+ }
+
+ return false;
+ }
+
+ public static boolean isJaxwsDeployment( final DeploymentUnit unit )
+ {
+ if ( ASIntegrationHelper.isWebServiceDeployment( unit ) )
+ {
+ final DeploymentType deploymentType = unit.getAttachment( DeploymentType.class );
+ final boolean isJaxwsEjb3 = DeploymentType.JAXWS_EJB3.equals( deploymentType );
+ final boolean isJaxwsPojo = DeploymentType.JAXWS_JSE.equals( deploymentType );
+
+ return isJaxwsEjb3 || isJaxwsPojo;
+ }
+
+ return false;
+ }
+
+ public static boolean isJaxrpcDeployment( final DeploymentUnit unit )
+ {
+ if ( ASIntegrationHelper.isWebServiceDeployment( unit ) )
+ {
+ final DeploymentType deploymentType = unit.getAttachment( DeploymentType.class );
+ final boolean isJaxrpcEjb21 = DeploymentType.JAXRPC_EJB21.equals( deploymentType );
+ final boolean isJaxrpcPojo = DeploymentType.JAXRPC_JSE.equals( deploymentType );
+
+ return isJaxrpcEjb21 || isJaxrpcPojo;
+ }
+
+ return false;
+ }
+
+ public static boolean isJaxrpcPojoDeployment( final DeploymentUnit unit )
+ {
+ final boolean isJaxrpc = ASIntegrationHelper.isJaxrpcDeployment( unit );
+ final boolean isPojo = ASIntegrationHelper.isPojoDeployment( unit );
+
+ return isPojo && isJaxrpc;
+ }
+
+ public static boolean isJaxwsPojoDeployment( final DeploymentUnit unit )
+ {
+ final boolean isJaxws = ASIntegrationHelper.isJaxwsDeployment( unit );
+ final boolean isPojo = ASIntegrationHelper.isPojoDeployment( unit );
+
+ return isPojo && isJaxws;
+ }
+
+ public static boolean isJaxrpcEjbDeployment( final DeploymentUnit unit )
+ {
+ final boolean isJaxrpc = ASIntegrationHelper.isJaxrpcDeployment( unit );
+ final boolean isEjb = ASIntegrationHelper.isEjbDeployment( unit );
+
+ return isEjb && isJaxrpc;
+ }
+
+ public static boolean isJaxwsEjbDeployment( final DeploymentUnit unit )
+ {
+ final boolean isJaxws = ASIntegrationHelper.isJaxwsDeployment( unit );
+ final boolean isEjb = ASIntegrationHelper.isEjbDeployment( unit );
+
+ return isEjb && isJaxws;
+ }
+
+}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentDeployer.java 2009-07-02 09:09:19 UTC (rev 10288)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentDeployer.java 2009-07-02 09:56:53 UTC (rev 10289)
@@ -38,6 +38,7 @@
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.ServletMetaData;
import org.jboss.virtual.VirtualFile;
+import org.jboss.wsf.container.jboss50.ASIntegrationHelper;
import org.jboss.wsf.container.jboss50.invocation.InvocationHandlerEJB3;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
@@ -85,26 +86,22 @@
@Override
protected void internalDeploy( final DeploymentUnit unit ) throws DeploymentException
{
- final DeploymentType deploymentType = unit.getAttachment( DeploymentType.class );
- if ( deploymentType != null )
+ if ( ASIntegrationHelper.isJaxrpcEjbDeployment( unit ) )
{
- if ( DeploymentType.JAXRPC_EJB21.equals( deploymentType ) )
- {
- this.newJAXRPCEJB21Deployment( unit );
- }
- else if ( DeploymentType.JAXWS_EJB3.equals( deploymentType ) )
- {
- this.newJAXWSEJB3Deployment( unit );
- }
- else if ( DeploymentType.JAXRPC_JSE.equals( deploymentType ) )
- {
- this.newJAXRPCJSEDeployment( unit );
- }
- else if ( DeploymentType.JAXWS_JSE.equals( deploymentType ) )
- {
- this.newJAXWSJSEDeployment( unit );
- }
+ this.newJAXRPCEJB21Deployment( unit );
}
+ else if ( ASIntegrationHelper.isJaxwsEjbDeployment( unit ) )
+ {
+ this.newJAXWSEJB3Deployment( unit );
+ }
+ else if ( ASIntegrationHelper.isJaxrpcPojoDeployment( unit ) )
+ {
+ this.newJAXRPCJSEDeployment( unit );
+ }
+ else if ( ASIntegrationHelper.isJaxwsPojoDeployment( unit ) )
+ {
+ this.newJAXWSJSEDeployment( unit );
+ }
}
private void newJAXRPCEJB21Deployment( final DeploymentUnit unit )
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java 2009-07-02 09:09:19 UTC (rev 10288)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java 2009-07-02 09:56:53 UTC (rev 10289)
@@ -22,28 +22,19 @@
package org.jboss.wsf.container.jboss50.deployment.metadata;
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.logging.Logger;
-import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
-import org.jboss.wsf.container.jboss50.deployment.tomcat.WebMetaDataModifier;
+import org.jboss.wsf.container.jboss50.ASIntegrationHelper;
-import java.net.URL;
-
/**
* Build container independent deployment info.
*
* @author Thomas.Diesler(a)jboss.org
- * @since 05-May-2006
+ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
*/
public class ContainerMetaDataAdapter
{
- // logging support
- private static Logger log = Logger.getLogger(ContainerMetaDataAdapter.class);
private EJBArchiveMetaDataAdapterEJB3 ejbMetaDataAdapterEJB3 = new EJBArchiveMetaDataAdapterEJB3();
private EJBArchiveMetaDataAdapterEJB21 ejbMetaDataAdapterEJB21 = new EJBArchiveMetaDataAdapterEJB21();
@@ -66,38 +57,22 @@
public void buildContainerMetaData(Deployment dep, DeploymentUnit unit)
{
- dep.addAttachment(DeploymentUnit.class, unit);
-
try
{
- // JSE endpoints
- if (unit.getAttachment(JBossWebMetaData.class) != null)
+ if ( ASIntegrationHelper.isPojoDeployment( unit ) )
{
JSEArchiveMetaData webMetaData = webMetaDataAdapter.buildMetaData(dep, unit);
- if (webMetaData != null)
- dep.addAttachment(JSEArchiveMetaData.class, webMetaData);
-
- if (dep instanceof ArchiveDeployment)
- {
- URL webURL = ((ArchiveDeployment)dep).getRootFile().toURL();
- dep.setProperty(WebMetaDataModifier.PROPERTY_WEBAPP_URL, webURL);
- }
+ dep.addAttachment(JSEArchiveMetaData.class, webMetaData);
}
-
- // EJB3 endpoints
- else if (unit.getAttachment(Ejb3Deployment.class) != null)
+ else if ( ASIntegrationHelper.isJaxwsEjbDeployment(unit) )
{
EJBArchiveMetaData ejbMetaData = ejbMetaDataAdapterEJB3.buildMetaData(dep, unit);
- if (ejbMetaData != null)
- dep.addAttachment(EJBArchiveMetaData.class, ejbMetaData);
+ dep.addAttachment(EJBArchiveMetaData.class, ejbMetaData);
}
-
- // EJB21 endpoints
- else if (unit.getAttachment(JBossMetaData.class) != null)
+ else if ( ASIntegrationHelper.isJaxrpcEjbDeployment(unit) )
{
EJBArchiveMetaData ejbMetaData = ejbMetaDataAdapterEJB21.buildMetaData(dep, unit);
- if (ejbMetaData != null)
- dep.addAttachment(EJBArchiveMetaData.class, ejbMetaData);
+ dep.addAttachment(EJBArchiveMetaData.class, ejbMetaData);
}
}
catch (RuntimeException rte)
@@ -109,4 +84,5 @@
throw new IllegalStateException(ex);
}
}
+
}
16 years, 4 months
- 1
- 0
JBossWS SVN: r10288 - framework/trunk/hudson/jboss/bin.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-07-02 05:09:19 -0400 (Thu, 02 Jul 2009)
New Revision: 10288
Modified:
framework/trunk/hudson/jboss/bin/runjboss.sh
Log:
Adding check
Modified: framework/trunk/hudson/jboss/bin/runjboss.sh
===================================================================
--- framework/trunk/hudson/jboss/bin/runjboss.sh 2009-07-02 08:22:19 UTC (rev 10287)
+++ framework/trunk/hudson/jboss/bin/runjboss.sh 2009-07-02 09:09:19 UTC (rev 10288)
@@ -114,7 +114,13 @@
# This should be removed when JBoss configuration XML files can be validated JBAS-6744
JAVA_OPTS="$JAVA_OPTS -Dxb.builder.useUnorderedSequence=true"
-JAVA_OPTS="$JAVA_OPTS -Djava.io.tmpdir=/data/tmp"
+DATA_TMP="/data/tmp"
+if [ -d "$DATA_TMP" ]; then
+ JAVA_OPTS="$JAVA_OPTS -Djava.io.tmpdir=$DATA_TMP"
+else
+ echo "$DATA_TMP does not exist.";
+ exit -1;
+fi
# Setup the java endorsed dirs
JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
16 years, 4 months
- 1
- 0
JBossWS SVN: r10287 - in stack/native/branches/ropalka/modules: core/src/main/scripts and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-02 04:22:19 -0400 (Thu, 02 Jul 2009)
New Revision: 10287
Modified:
stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml
stack/native/branches/ropalka/modules/core/src/main/scripts/antrun-beans-config.xml
stack/native/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf
stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - renaming beans file (WIP)
Modified: stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml 2009-07-02 08:20:56 UTC (rev 10286)
+++ stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml 2009-07-02 08:22:19 UTC (rev 10287)
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
<!-- The registry for web service endpoints -->
<bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
@@ -166,3 +170,5 @@
</constructor>
<property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
+
+</deployment>
Modified: stack/native/branches/ropalka/modules/core/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/scripts/antrun-beans-config.xml 2009-07-02 08:20:56 UTC (rev 10286)
+++ stack/native/branches/ropalka/modules/core/src/main/scripts/antrun-beans-config.xml 2009-07-02 08:22:19 UTC (rev 10287)
@@ -11,72 +11,36 @@
<project default="main">
- <property name="project.resources.directory" value="${basedir}/src/main/resources"/>
- <property name="project.build.directory" value="${basedir}/target"/>
- <property name="project.build.resources.directory" value="${project.build.directory}/resources"/>
+ <property name="src.dir" value="${basedir}/src/main/resources"/>
+ <property name="dest.dir" value="${basedir}/target/resources"/>
- <property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/>
+ <target name="main">
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
+ <copy
+ file="${src.dir}/jbossws-native-config.xml"
+ tofile="${dest.dir}/jbossws-jboss500/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ />
- <target name="init">
- </target>
+ <copy
+ file="${src.dir}/jbossws-native-config.xml"
+ tofile="${dest.dir}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ />
- <!-- Compile resource files -->
- <target name="main" depends="init">
+ <copy
+ file="${src.dir}/jbossws-native-config.xml"
+ tofile="${dest.dir}/jbossws-jboss510/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ />
- <!-- Concat jbossws-jboss500/jbossws.beans -->
- <echo message="Concat jbossws-jboss500/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
+ <copy
+ file="${src.dir}/jbossws-native-config.xml"
+ tofile="${dest.dir}/jbossws-jboss520/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ />
- <!-- Concat jbossws-jboss501/jbossws.beans -->
- <echo message="Concat jbossws-jboss501/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
+ <copy
+ file="${src.dir}/jbossws-native-config.xml"
+ tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ />
- <!-- Concat jbossws-jboss510/jbossws.beans -->
- <echo message="Concat jbossws-jboss510/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss520/jbossws.beans -->
- <echo message="Concat jbossws-jboss520/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss520/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss600/jbossws.beans -->
- <echo message="Concat jbossws-jboss600/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss600/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
</target>
</project>
Modified: stack/native/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/native/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf 2009-07-02 08:20:56 UTC (rev 10286)
+++ stack/native/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf 2009-07-02 08:22:19 UTC (rev 10287)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native!
-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native!
-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/standard-*-config.xml lib/endorse!
d/jbossws-native-* lib/endorsed/jaxb-api.jar
Modified: stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-02 08:20:56 UTC (rev 10286)
+++ stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-02 08:22:19 UTC (rev 10287)
@@ -438,7 +438,7 @@
</copy>
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-jboss-beans.xml"/>
+ <include name="**/stack-agnostic-jboss-beans.xml"/>
</fileset>
</copy>
</sequential>
@@ -475,7 +475,7 @@
</copy>
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-jboss-beans.xml"/>
+ <include name="**/stack-agnostic-jboss-beans.xml"/>
</fileset>
</copy>
</sequential>
@@ -520,7 +520,7 @@
<!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-jboss-beans.xml"/>
+ <include name="**/stack-agnostic-jboss-beans.xml"/>
</fileset>
</copy>
-->
@@ -567,7 +567,7 @@
<!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-jboss-beans.xml"/>
+ <include name="**/stack-agnostic-jboss-beans.xml"/>
</fileset>
</copy>
-->
16 years, 4 months
- 1
- 0
JBossWS SVN: r10286 - stack/cxf/branches/ropalka/modules/server/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-02 04:20:56 -0400 (Thu, 02 Jul 2009)
New Revision: 10286
Modified:
stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring (WIP)
Modified: stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-02 08:18:38 UTC (rev 10285)
+++ stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-02 08:20:56 UTC (rev 10286)
@@ -11,36 +11,34 @@
<project default="main">
- <property name="project.resources.directory" value="${basedir}/src/main/resources"/>
- <property name="project.build.directory" value="${basedir}/target"/>
- <property name="project.build.resources.directory" value="${project.build.directory}/resources"/>
- <property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/>
+ <property name="src.dir" value="${basedir}/src/main/resources"/>
+ <property name="dest.dir" value="${basedir}/target/resources"/>
<target name="main">
<copy
- file="${project.resources.directory}/jbossws-cxf-config.xml"
- tofile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ file="${src.dir}/jbossws-cxf-config.xml"
+ tofile="${dest.dir}/jbossws-jboss500/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${project.resources.directory}/jbossws-cxf-config.xml"
- tofile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ file="${src.dir}/jbossws-cxf-config.xml"
+ tofile="${dest.dir}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${project.resources.directory}/jbossws-cxf-config.xml"
- tofile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ file="${src.dir}/jbossws-cxf-config.xml"
+ tofile="${dest.dir}/jbossws-jboss510/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${project.resources.directory}/jbossws-cxf-config.xml"
- tofile="${project.build.resources.directory}/jbossws-jboss520/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ file="${src.dir}/jbossws-cxf-config.xml"
+ tofile="${dest.dir}/jbossws-jboss520/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${project.resources.directory}/jbossws-cxf-config.xml"
- tofile="${project.build.resources.directory}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ file="${src.dir}/jbossws-cxf-config.xml"
+ tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
</target>
16 years, 4 months
- 1
- 0
JBossWS SVN: r10285 - stack/metro/branches/ropalka/modules/server/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-02 04:18:38 -0400 (Thu, 02 Jul 2009)
New Revision: 10285
Modified:
stack/metro/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring (WIP)
Modified: stack/metro/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-02 08:08:35 UTC (rev 10284)
+++ stack/metro/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-02 08:18:38 UTC (rev 10285)
@@ -11,36 +11,34 @@
<project default="main">
- <property name="project.resources.directory" value="${basedir}/src/main/resources"/>
- <property name="project.build.directory" value="${basedir}/target"/>
- <property name="project.build.resources.directory" value="${project.build.directory}/resources"/>
- <property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/>
+ <property name="src.dir" value="${basedir}/src/main/resources"/>
+ <property name="dest.dir" value="${basedir}/target/resources"/>
<target name="main">
<copy
- file="${project.resources.directory}/jbossws-metro-config.xml"
- tofile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ file="${src.dir}/jbossws-metro-config.xml"
+ tofile="${dest.dir}/jbossws-jboss500/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${project.resources.directory}/jbossws-metro-config.xml"
- tofile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ file="${src.dir}/jbossws-metro-config.xml"
+ tofile="${dest.dir}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${project.resources.directory}/jbossws-metro-config.xml"
- tofile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ file="${src.dir}/jbossws-metro-config.xml"
+ tofile="${dest.dir}/jbossws-jboss510/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${project.resources.directory}/jbossws-metro-config.xml"
- tofile="${project.build.resources.directory}/jbossws-jboss520/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ file="${src.dir}/jbossws-metro-config.xml"
+ tofile="${dest.dir}/jbossws-jboss520/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${project.resources.directory}/jbossws-metro-config.xml"
- tofile="${project.build.resources.directory}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ file="${src.dir}/jbossws-metro-config.xml"
+ tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
</target>
16 years, 4 months
- 1
- 0
JBossWS SVN: r10284 - stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-02 04:08:35 -0400 (Thu, 02 Jul 2009)
New Revision: 10284
Modified:
stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf
Log:
updating default deploy file
Modified: stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf 2009-07-02 08:07:52 UTC (rev 10283)
+++ stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf 2009-07-02 08:08:35 UTC (rev 10284)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native!
-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native!
-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/standard-*-config.xml lib/endorse!
d/jbossws-native-* lib/endorsed/jaxb-api.jar
16 years, 4 months
- 1
- 0
JBossWS SVN: r10283 - in stack/metro/branches/ropalka/modules: server/src/main/resources and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-02 04:07:52 -0400 (Thu, 02 Jul 2009)
New Revision: 10283
Modified:
stack/metro/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf
stack/metro/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml
stack/metro/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - renaming beans file (WIP)
Modified: stack/metro/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/metro/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf 2009-07-02 07:59:35 UTC (rev 10282)
+++ stack/metro/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf 2009-07-02 08:07:52 UTC (rev 10283)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native!
-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native!
-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/standard-*-config.xml lib/endorse!
d/jbossws-native-* lib/endorsed/jaxb-api.jar
Modified: stack/metro/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-02 07:59:35 UTC (rev 10282)
+++ stack/metro/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-02 08:07:52 UTC (rev 10283)
@@ -450,7 +450,7 @@
</copy>
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-jboss-beans.xml"/>
+ <include name="**/stack-agnostic-jboss-beans.xml"/>
</fileset>
</copy>
</sequential>
@@ -482,7 +482,7 @@
</copy>
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-jboss-beans.xml"/>
+ <include name="**/stack-agnostic-jboss-beans.xml"/>
</fileset>
</copy>
</sequential>
@@ -522,7 +522,7 @@
<!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-jboss-beans.xml"/>
+ <include name="**/stack-agnostic-jboss-beans.xml"/>
</fileset>
</copy>
-->
@@ -564,7 +564,7 @@
<!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-jboss-beans.xml"/>
+ <include name="**/stack-agnostic-jboss-beans.xml"/>
</fileset>
</copy>
-->
Modified: stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml 2009-07-02 07:59:35 UTC (rev 10282)
+++ stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml 2009-07-02 08:07:52 UTC (rev 10283)
@@ -1,4 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
<!-- The registry for web service endpoints -->
<bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
@@ -103,3 +106,5 @@
</constructor>
<property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
+
+</deployment>
Modified: stack/metro/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-02 07:59:35 UTC (rev 10282)
+++ stack/metro/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-02 08:07:52 UTC (rev 10283)
@@ -10,73 +10,39 @@
<!-- ====================================================================== -->
<project default="main">
-
+
<property name="project.resources.directory" value="${basedir}/src/main/resources"/>
<property name="project.build.directory" value="${basedir}/target"/>
<property name="project.build.resources.directory" value="${project.build.directory}/resources"/>
-
<property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="init">
+
+ <target name="main">
+
+ <copy
+ file="${project.resources.directory}/jbossws-metro-config.xml"
+ tofile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ />
+
+ <copy
+ file="${project.resources.directory}/jbossws-metro-config.xml"
+ tofile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ />
+
+ <copy
+ file="${project.resources.directory}/jbossws-metro-config.xml"
+ tofile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ />
+
+ <copy
+ file="${project.resources.directory}/jbossws-metro-config.xml"
+ tofile="${project.build.resources.directory}/jbossws-jboss520/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ />
+
+ <copy
+ file="${project.resources.directory}/jbossws-metro-config.xml"
+ tofile="${project.build.resources.directory}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ />
+
</target>
-
- <!-- Compile resource files -->
- <target name="main" depends="init">
-
- <!-- Concat jbossws-jboss500/jbossws.beans -->
- <echo message="Concat jbossws-jboss500/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss501/jbossws.beans -->
- <echo message="Concat jbossws-jboss501/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss510/jbossws.beans -->
- <echo message="Concat jbossws-jboss510/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss520/jbossws.beans -->
- <echo message="Concat jbossws-jboss520/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss520/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss600/jbossws.beans -->
- <echo message="Concat jbossws-jboss600/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss600/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- </target>
-
+
</project>
16 years, 4 months
- 1
- 0
JBossWS SVN: r10282 - framework/trunk/hudson/jboss/bin.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-07-02 03:59:35 -0400 (Thu, 02 Jul 2009)
New Revision: 10282
Modified:
framework/trunk/hudson/jboss/bin/runjboss.sh
Log:
Hudson tests on the new machine: setting java tmp dir on server side too
Modified: framework/trunk/hudson/jboss/bin/runjboss.sh
===================================================================
--- framework/trunk/hudson/jboss/bin/runjboss.sh 2009-07-02 07:57:22 UTC (rev 10281)
+++ framework/trunk/hudson/jboss/bin/runjboss.sh 2009-07-02 07:59:35 UTC (rev 10282)
@@ -114,6 +114,8 @@
# This should be removed when JBoss configuration XML files can be validated JBAS-6744
JAVA_OPTS="$JAVA_OPTS -Dxb.builder.useUnorderedSequence=true"
+JAVA_OPTS="$JAVA_OPTS -Djava.io.tmpdir=/data/tmp"
+
# Setup the java endorsed dirs
JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
16 years, 4 months
- 1
- 0