JBossWS SVN: r6244 - in stack/native/trunk/src: main/java/org/jboss/ws/metadata/builder/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-07 09:23:23 -0400 (Mon, 07 Apr 2008)
New Revision: 6244
Removed:
stack/native/trunk/src/main/java/org/jboss/annotation/
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java
stack/native/trunk/src/test/resources/test-excludes-jboss500.txt
stack/native/trunk/src/test/resources/test-excludes-jboss501.txt
Log:
[JBWS-2107] Resolve dependency on @SecurityDomain
Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2008-04-07 10:43:00 UTC (rev 6243)
+++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2008-04-07 13:23:23 UTC (rev 6244)
@@ -27,7 +27,6 @@
import javax.jws.WebService;
import javax.xml.ws.WebServiceProvider;
-import org.jboss.annotation.security.SecurityDomain;
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
@@ -77,7 +76,8 @@
String ejbLink = beanMetaData.getEjbName();
JAXWSServerMetaDataBuilder.setupProviderOrWebService(dep, wsMetaData, beanClass, ejbLink);
- // setup the security domain
+ /* Resolve dependency on @SecurityDomain
+ * http://jira.jboss.org/jira/browse/JBWS-2107
if (beanClass.isAnnotationPresent(SecurityDomain.class))
{
SecurityDomain anSecurityDomain = (SecurityDomain)beanClass.getAnnotation(SecurityDomain.class);
@@ -88,6 +88,7 @@
wsMetaData.setSecurityDomain(securityDomain);
}
+ */
}
}
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-07 10:43:00 UTC (rev 6243)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-07 13:23:23 UTC (rev 6244)
@@ -21,3 +21,8 @@
# [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime
org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.*
+# [JBWS-2107] Resolve dependency on @SecurityDomain
+org/jboss/test/ws/jaxws/webserviceref/Secure**
+org/jboss/test/ws/jaxws/samples/dar/**
+org/jboss/test/ws/jaxws/samples/news/**
+org/jboss/test/ws/jaxws/jbws1840/**
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-07 10:43:00 UTC (rev 6243)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-07 13:23:23 UTC (rev 6244)
@@ -30,3 +30,8 @@
# [JBAS-5257] jboss:service=defaultClassLoader is not registered with dynamic webapp deployment
org/jboss/test/ws/jaxws/endpoint/**
+# [JBWS-2107] Resolve dependency on @SecurityDomain
+org/jboss/test/ws/jaxws/webserviceref/Secure**
+org/jboss/test/ws/jaxws/samples/dar/**
+org/jboss/test/ws/jaxws/samples/news/**
+org/jboss/test/ws/jaxws/jbws1840/**
16 years, 9 months
- 1
- 0
JBossWS SVN: r6243 - in framework/trunk/hudson/hudson-home/jobs: AS-4.2.2 and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-07 06:43:00 -0400 (Mon, 07 Apr 2008)
New Revision: 6243
Modified:
framework/trunk/hudson/hudson-home/jobs/AS-4.2.1/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-5.0.1/config.xml
Log:
Remove build trigger to AS tests
Modified: framework/trunk/hudson/hudson-home/jobs/AS-4.2.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-4.2.1/config.xml 2008-04-07 10:33:44 UTC (rev 6242)
+++ framework/trunk/hudson/hudson-home/jobs/AS-4.2.1/config.xml 2008-04-07 10:43:00 UTC (rev 6243)
@@ -40,9 +40,7 @@
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
<sendToIndividuals>true</sendToIndividuals>
</hudson.tasks.Mailer>
- <hudson.tasks.BuildTrigger>
- <childProjects>AS-Tests-AS-4.2.1</childProjects>
- </hudson.tasks.BuildTrigger>
+ <hudson.tasks.BuildTrigger/>
</publishers>
<buildWrappers class="vector"/>
<scm class="hudson.scm.SubversionSCM">
Modified: framework/trunk/hudson/hudson-home/jobs/AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-4.2.2/config.xml 2008-04-07 10:33:44 UTC (rev 6242)
+++ framework/trunk/hudson/hudson-home/jobs/AS-4.2.2/config.xml 2008-04-07 10:43:00 UTC (rev 6243)
@@ -40,9 +40,7 @@
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
<sendToIndividuals>true</sendToIndividuals>
</hudson.tasks.Mailer>
- <hudson.tasks.BuildTrigger>
- <childProjects>AS-Tests-AS-4.2.2</childProjects>
- </hudson.tasks.BuildTrigger>
+ <hudson.tasks.BuildTrigger/>
</publishers>
<buildWrappers class="vector"/>
<scm class="hudson.scm.SubversionSCM">
Modified: framework/trunk/hudson/hudson-home/jobs/AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-4.2.3/config.xml 2008-04-07 10:33:44 UTC (rev 6242)
+++ framework/trunk/hudson/hudson-home/jobs/AS-4.2.3/config.xml 2008-04-07 10:43:00 UTC (rev 6243)
@@ -40,9 +40,7 @@
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
<sendToIndividuals>true</sendToIndividuals>
</hudson.tasks.Mailer>
- <hudson.tasks.BuildTrigger>
- <childProjects>AS-Tests-AS-4.2.3</childProjects>
- </hudson.tasks.BuildTrigger>
+ <hudson.tasks.BuildTrigger/>
</publishers>
<buildWrappers class="vector"/>
<scm class="hudson.scm.SubversionSCM">
Modified: framework/trunk/hudson/hudson-home/jobs/AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-5.0.0/config.xml 2008-04-07 10:33:44 UTC (rev 6242)
+++ framework/trunk/hudson/hudson-home/jobs/AS-5.0.0/config.xml 2008-04-07 10:43:00 UTC (rev 6243)
@@ -40,9 +40,7 @@
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
<sendToIndividuals>true</sendToIndividuals>
</hudson.tasks.Mailer>
- <hudson.tasks.BuildTrigger>
- <childProjects>AS-Tests-AS-5.0.0</childProjects>
- </hudson.tasks.BuildTrigger>
+ <hudson.tasks.BuildTrigger/>
</publishers>
<buildWrappers class="vector"/>
<scm class="hudson.scm.SubversionSCM">
Modified: framework/trunk/hudson/hudson-home/jobs/AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-5.0.1/config.xml 2008-04-07 10:33:44 UTC (rev 6242)
+++ framework/trunk/hudson/hudson-home/jobs/AS-5.0.1/config.xml 2008-04-07 10:43:00 UTC (rev 6243)
@@ -39,9 +39,7 @@
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
<sendToIndividuals>true</sendToIndividuals>
</hudson.tasks.Mailer>
- <hudson.tasks.BuildTrigger>
- <childProjects>AS-Tests-AS-5.0.1</childProjects>
- </hudson.tasks.BuildTrigger>
+ <hudson.tasks.BuildTrigger/>
</publishers>
<buildWrappers class="vector"/>
<scm class="hudson.scm.SubversionSCM">
16 years, 9 months
- 1
- 0
JBossWS SVN: r6242 - in framework/trunk/hudson/hudson-home/jobs: AS-4.2.2 and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-07 06:33:44 -0400 (Mon, 07 Apr 2008)
New Revision: 6242
Modified:
framework/trunk/hudson/hudson-home/jobs/AS-4.2.1/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-5.0.1/config.xml
Log:
Fix maven build for AS501, Fix build dependency for AS tests
Modified: framework/trunk/hudson/hudson-home/jobs/AS-4.2.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-4.2.1/config.xml 2008-04-07 09:24:29 UTC (rev 6241)
+++ framework/trunk/hudson/hudson-home/jobs/AS-4.2.1/config.xml 2008-04-07 10:33:44 UTC (rev 6242)
@@ -41,7 +41,7 @@
<sendToIndividuals>true</sendToIndividuals>
</hudson.tasks.Mailer>
<hudson.tasks.BuildTrigger>
- <childProjects>JBAS-Tests-AS-4.2.1</childProjects>
+ <childProjects>AS-Tests-AS-4.2.1</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: framework/trunk/hudson/hudson-home/jobs/AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-4.2.2/config.xml 2008-04-07 09:24:29 UTC (rev 6241)
+++ framework/trunk/hudson/hudson-home/jobs/AS-4.2.2/config.xml 2008-04-07 10:33:44 UTC (rev 6242)
@@ -41,7 +41,7 @@
<sendToIndividuals>true</sendToIndividuals>
</hudson.tasks.Mailer>
<hudson.tasks.BuildTrigger>
- <childProjects>JBAS-Tests-AS-4.2.2</childProjects>
+ <childProjects>AS-Tests-AS-4.2.2</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: framework/trunk/hudson/hudson-home/jobs/AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-4.2.3/config.xml 2008-04-07 09:24:29 UTC (rev 6241)
+++ framework/trunk/hudson/hudson-home/jobs/AS-4.2.3/config.xml 2008-04-07 10:33:44 UTC (rev 6242)
@@ -41,7 +41,7 @@
<sendToIndividuals>true</sendToIndividuals>
</hudson.tasks.Mailer>
<hudson.tasks.BuildTrigger>
- <childProjects>JBAS-Tests-AS-4.2.3</childProjects>
+ <childProjects>AS-Tests-AS-4.2.3</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: framework/trunk/hudson/hudson-home/jobs/AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-5.0.0/config.xml 2008-04-07 09:24:29 UTC (rev 6241)
+++ framework/trunk/hudson/hudson-home/jobs/AS-5.0.0/config.xml 2008-04-07 10:33:44 UTC (rev 6242)
@@ -41,7 +41,7 @@
<sendToIndividuals>true</sendToIndividuals>
</hudson.tasks.Mailer>
<hudson.tasks.BuildTrigger>
- <childProjects>JBAS-Tests-AS-5.0.0</childProjects>
+ <childProjects>AS-Tests-AS-5.0.0</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: framework/trunk/hudson/hudson-home/jobs/AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-5.0.1/config.xml 2008-04-07 09:24:29 UTC (rev 6241)
+++ framework/trunk/hudson/hudson-home/jobs/AS-5.0.1/config.xml 2008-04-07 10:33:44 UTC (rev 6242)
@@ -21,7 +21,6 @@
# build jboss
#
cd $SVNBASE
-rm -rf thirdparty/*
./build/build.sh clean main
#
@@ -41,7 +40,7 @@
<sendToIndividuals>true</sendToIndividuals>
</hudson.tasks.Mailer>
<hudson.tasks.BuildTrigger>
- <childProjects>JBAS-Tests-AS-5.0.1</childProjects>
+ <childProjects>AS-Tests-AS-5.0.1</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
16 years, 9 months
- 1
- 0
JBossWS SVN: r6241 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-07 05:24:29 -0400 (Mon, 07 Apr 2008)
New Revision: 6241
Modified:
stack/cxf/trunk/.classpath
Log:
fix eclipse project classpath
Modified: stack/cxf/trunk/.classpath
===================================================================
--- stack/cxf/trunk/.classpath 2008-04-04 19:07:07 UTC (rev 6240)
+++ stack/cxf/trunk/.classpath 2008-04-07 09:24:29 UTC (rev 6241)
@@ -32,10 +32,10 @@
<classpathentry kind="lib" path="thirdparty/xbean-2.2.0.jar"/>
<classpathentry kind="lib" path="thirdparty/xml-resolver-1.2.jar"/>
<classpathentry kind="lib" path="thirdparty/XmlSchema-1.3.2.jar"/>
- <classpathentry kind="lib" path="thirdparty/cxf-2.0.3-incubator.jar" sourcepath="apache-cxf"/>
<classpathentry kind="lib" path="thirdparty/jaxws-api-2.0.jar"/>
<classpathentry kind="lib" path="tools/ant/lib/junit.jar"/>
<classpathentry kind="lib" path="thirdparty/activation.jar"/>
<classpathentry kind="lib" path="thirdparty/jbossws-common.jar" sourcepath="thirdparty/jbossws-common-src.zip"/>
+ <classpathentry kind="lib" path="thirdparty/cxf-2.0.4-incubator.jar" sourcepath="apache-cxf"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
16 years, 9 months
- 1
- 0
JBossWS SVN: r6240 - in framework/branches/hbraun/src/main/java/org/jboss/wsf/framework: deployment and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-04-04 15:07:07 -0400 (Fri, 04 Apr 2008)
New Revision: 6240
Added:
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/DefaultWSFRuntimeLocator.java
Modified:
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointLifecycleDeploymentAspect.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java
Log:
Added DeploymentLifecycle and WSFRuntimeLocator
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2008-04-04 19:06:38 UTC (rev 6239)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2008-04-04 19:07:07 UTC (rev 6240)
@@ -35,6 +35,7 @@
import org.jboss.wsf.framework.transport.DefaultTransportManagerFactory;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.WSFException;
+import org.jboss.wsf.spi.WSFRuntimeLocator;
import org.jboss.wsf.spi.transport.TransportManagerFactory;
import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory;
import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
@@ -118,6 +119,10 @@
{
returnType = (T)loadService(spiType, ServerConfigFactoryImpl.class.getName());
}
+ else if (WSFRuntimeLocator.class.equals(spiType))
+ {
+ returnType = (T)loadService(spiType, DefaultWSFRuntimeLocator.class.getName());
+ }
// SPI provided by either container or stack integration
Added: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/DefaultWSFRuntimeLocator.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/DefaultWSFRuntimeLocator.java (rev 0)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/DefaultWSFRuntimeLocator.java 2008-04-04 19:07:07 UTC (rev 6240)
@@ -0,0 +1,40 @@
+/*
+ * 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.framework;
+
+import org.jboss.wsf.spi.WSFRuntimeLocator;
+import org.jboss.wsf.spi.WSFRuntime;
+import org.jboss.wsf.common.KernelAwareSPIFactory;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class DefaultWSFRuntimeLocator implements WSFRuntimeLocator
+{
+
+ public WSFRuntime locateRuntime(String runtimeName)
+ {
+ return new KernelAwareSPIFactory().getKernelProvidedSPI(
+ runtimeName, WSFRuntime.class
+ );
+ }
+}
Property changes on: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/DefaultWSFRuntimeLocator.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java 2008-04-04 19:06:38 UTC (rev 6239)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java 2008-04-04 19:07:07 UTC (rev 6240)
@@ -23,6 +23,7 @@
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.WSFRuntime;
import java.util.Iterator;
import java.util.Map;
@@ -50,7 +51,7 @@
}
@Override
- public void create(Deployment dep)
+ public void create(Deployment dep, WSFRuntime runtime)
{
if (contextProperties != null)
{
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2008-04-04 19:06:38 UTC (rev 6239)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2008-04-04 19:07:07 UTC (rev 6240)
@@ -30,6 +30,7 @@
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
+import org.jboss.wsf.spi.WSFRuntime;
/**
* A deployer that assigns the context root to the service
@@ -40,7 +41,7 @@
public class ContextRootDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void create(Deployment dep, WSFRuntime runtime)
{
String contextRoot = dep.getService().getContextRoot();
if (contextRoot == null)
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2008-04-04 19:06:38 UTC (rev 6239)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2008-04-04 19:07:07 UTC (rev 6240)
@@ -38,9 +38,12 @@
import org.jboss.wsf.spi.WSFRuntime;
/**
- * A general service deployment manger.
+ * Process an ordered chain of {@link org.jboss.wsf.spi.deployment.DeploymentAspect}'s
+ * on a {@link org.jboss.wsf.spi.deployment.DeploymentLifecycle}
*
* @author Thomas.Diesler(a)jboss.com
+ * @author Heiko.Braun(a)jboss.com
+ *
* @since 20-Apr-2007
*/
public class DeploymentAspectManagerImpl implements DeploymentAspectManager
@@ -116,9 +119,8 @@
throw new IllegalStateException("Required conditions '" + aspect.getRequires() + "' not satisfied by '" + providedConditions + "' for: " + aspect);
*/
- logInvocation(aspect, "Create");
- aspect.setRuntimeAssociation(runtime);
- aspect.create(dep);
+ logInvocation(aspect, "Create");
+ aspect.create(dep, runtime);
providedConditions.addAll(aspect.getProvidesAsSet());
}
@@ -141,14 +143,14 @@
try
{
logInvocation(aspect, "Start");
- aspect.start(dep);
+ aspect.start(dep, runtime);
}
catch (RuntimeException rte)
{
while (i-- >= 0)
{
// destroy the deployment
- failsafeDestroy(aspect, dep);
+ failsafeDestroy(aspect, dep, runtime);
}
throw rte;
}
@@ -163,7 +165,7 @@
for (int i = getDeploymentAspects().size(); 0 < i; i--)
{
DeploymentAspect aspect = getDeploymentAspects().get(i - 1);
- failsafeStop(aspect, dep);
+ failsafeStop(aspect, dep, runtime);
}
dep.setState(DeploymentState.STOPPED);
@@ -176,18 +178,18 @@
for (int i = getDeploymentAspects().size(); 0 < i; i--)
{
DeploymentAspect aspect = getDeploymentAspects().get(i - 1);
- failsafeDestroy(aspect, dep);
+ failsafeDestroy(aspect, dep, runtime);
}
dep.setState(DeploymentState.DESTROYED);
}
- private void failsafeStop(DeploymentAspect aspect, Deployment dep)
+ private void failsafeStop(DeploymentAspect aspect, Deployment dep, WSFRuntime runtime)
{
try
{
logInvocation(aspect, "Stop");
- aspect.stop(dep);
+ aspect.stop(dep, runtime);
}
catch (RuntimeException rte)
{
@@ -195,12 +197,12 @@
}
}
- private void failsafeDestroy(DeploymentAspect aspect, Deployment dep)
+ private void failsafeDestroy(DeploymentAspect aspect, Deployment dep, WSFRuntime runtime)
{
try
{
logInvocation(aspect, "Destroy");
- aspect.destroy(dep);
+ aspect.destroy(dep, runtime);
}
catch (RuntimeException rte)
{
@@ -214,4 +216,9 @@
name = name.substring(name.lastIndexOf(".") + 1);
log.debug(name + ":" + method);
}
+
+ public String toString()
+ {
+ return this.name + " :" + super.toString();
+ }
}
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java 2008-04-04 19:06:38 UTC (rev 6239)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java 2008-04-04 19:07:07 UTC (rev 6240)
@@ -30,6 +30,7 @@
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.WSFRuntime;
/**
* A deployment aspect for JAXWS Endpoint API endpoints.
@@ -40,7 +41,7 @@
public class EndpointAPIDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void create(Deployment dep, WSFRuntime runtime)
{
dep.setType(DeploymentType.JAXWS_JSE);
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2008-04-04 19:06:38 UTC (rev 6239)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2008-04-04 19:07:07 UTC (rev 6240)
@@ -25,6 +25,7 @@
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.WSFRuntime;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -40,7 +41,7 @@
public class EndpointAddressDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void create(Deployment dep, WSFRuntime runtime)
{
String contextRoot = dep.getService().getContextRoot();
if (contextRoot == null)
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2008-04-04 19:06:38 UTC (rev 6239)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2008-04-04 19:07:07 UTC (rev 6240)
@@ -25,6 +25,7 @@
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.WSFRuntime;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -56,7 +57,7 @@
}
@Override
- public void create(Deployment dep)
+ public void create(Deployment dep, WSFRuntime runtime)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointLifecycleDeploymentAspect.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointLifecycleDeploymentAspect.java 2008-04-04 19:06:38 UTC (rev 6239)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointLifecycleDeploymentAspect.java 2008-04-04 19:07:07 UTC (rev 6240)
@@ -22,6 +22,7 @@
package org.jboss.wsf.framework.deployment;
import org.jboss.wsf.spi.deployment.*;
+import org.jboss.wsf.spi.WSFRuntime;
//$Id$
@@ -35,7 +36,7 @@
public class EndpointLifecycleDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void create(Deployment dep, WSFRuntime runtime)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
@@ -44,7 +45,7 @@
}
@Override
- public void start(Deployment dep)
+ public void start(Deployment dep, WSFRuntime runtime)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
@@ -53,7 +54,7 @@
}
@Override
- public void stop(Deployment dep)
+ public void stop(Deployment dep, WSFRuntime runtime)
{
Service service = dep.getService();
if (service != null)
@@ -68,7 +69,7 @@
}
@Override
- public void destroy(Deployment dep)
+ public void destroy(Deployment dep, WSFRuntime runtime)
{
Service service = dep.getService();
if (service != null)
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java 2008-04-04 19:06:38 UTC (rev 6239)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java 2008-04-04 19:07:07 UTC (rev 6240)
@@ -25,6 +25,7 @@
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.WSFRuntime;
import org.jboss.wsf.spi.management.EndpointMetrics;
import org.jboss.wsf.spi.management.EndpointMetricsFactory;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
@@ -40,7 +41,7 @@
public class EndpointMetricsDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void create(Deployment dep, WSFRuntime runtime)
{
SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
EndpointMetricsFactory factory = provider.getSPI(EndpointMetricsFactory.class);
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java 2008-04-04 19:06:38 UTC (rev 6239)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java 2008-04-04 19:07:07 UTC (rev 6240)
@@ -29,6 +29,7 @@
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.WSFRuntime;
import org.jboss.wsf.common.ObjectNameFactory;
/**
@@ -40,7 +41,7 @@
public class EndpointNameDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void create(Deployment dep, WSFRuntime runtime)
{
String contextRoot = dep.getService().getContextRoot();
if (contextRoot == null || contextRoot.startsWith("/") == false)
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java 2008-04-04 19:06:38 UTC (rev 6239)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java 2008-04-04 19:07:07 UTC (rev 6240)
@@ -35,6 +35,7 @@
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.management.recording.RecordProcessor;
+import org.jboss.wsf.spi.WSFRuntime;
/**
* A deployer that sets the record processors for each endpoint
@@ -53,7 +54,7 @@
}
@Override
- public void start(Deployment dep)
+ public void start(Deployment dep, WSFRuntime runtime)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
@@ -79,7 +80,7 @@
}
@Override
- public void destroy(Deployment dep)
+ public void destroy(Deployment dep, WSFRuntime runtime)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java 2008-04-04 19:06:38 UTC (rev 6239)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java 2008-04-04 19:07:07 UTC (rev 6240)
@@ -28,6 +28,7 @@
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.WSFRuntime;
/**
* A deployer that registers the endpoints
@@ -39,7 +40,7 @@
{
private EndpointRegistry registry;
- public void create(Deployment dep)
+ public void create(Deployment dep, WSFRuntime runtime)
{
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
EndpointRegistry registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
@@ -49,7 +50,7 @@
}
}
- public void destroy(Deployment dep)
+ public void destroy(Deployment dep, WSFRuntime runtime)
{
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
EndpointRegistry registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2008-04-04 19:06:38 UTC (rev 6239)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2008-04-04 19:07:07 UTC (rev 6240)
@@ -30,6 +30,7 @@
import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
+import org.jboss.wsf.spi.WSFRuntime;
/**
* A deployer that assigns the URLPattern to endpoints.
@@ -40,7 +41,7 @@
public class URLPatternDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void create(Deployment dep, WSFRuntime runtime)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2008-04-04 19:06:38 UTC (rev 6239)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2008-04-04 19:07:07 UTC (rev 6240)
@@ -36,6 +36,7 @@
import org.dom4j.io.XMLWriter;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.WSFRuntime;
import org.jboss.wsf.spi.annotation.WebContext;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -71,7 +72,7 @@
}
@Override
- public void create(Deployment dep)
+ public void create(Deployment dep, WSFRuntime runtime)
{
String typeStr = dep.getType().toString();
if (typeStr.endsWith("EJB21"))
16 years, 9 months
- 1
- 0
JBossWS SVN: r6239 - in spi/branches/hbraun/src/main/java/org/jboss/wsf/spi: deployment and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-04-04 15:06:38 -0400 (Fri, 04 Apr 2008)
New Revision: 6239
Added:
spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/WSFRuntimeLocator.java
spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/deployment/DeploymentLifecycle.java
Modified:
spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/WSFRuntime.java
spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java
spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java
Log:
Added DeploymentLifecycle and WSFRuntimeLocator
Modified: spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/WSFRuntime.java
===================================================================
--- spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/WSFRuntime.java 2008-04-04 12:51:49 UTC (rev 6238)
+++ spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/WSFRuntime.java 2008-04-04 19:06:38 UTC (rev 6239)
@@ -26,7 +26,7 @@
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
-public interface WSFRuntime
+public interface WSFRuntime
{
void create(Deployment deployment);
void start(Deployment deployment);
Added: spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/WSFRuntimeLocator.java
===================================================================
--- spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/WSFRuntimeLocator.java (rev 0)
+++ spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/WSFRuntimeLocator.java 2008-04-04 19:06:38 UTC (rev 6239)
@@ -0,0 +1,35 @@
+/*
+ * 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.spi;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface WSFRuntimeLocator
+{
+ /**
+ * Locate a web service runtime by logical name
+ * @param runtimeName
+ * @return
+ */
+ WSFRuntime locateRuntime(String runtimeName);
+}
Property changes on: spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/WSFRuntimeLocator.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java
===================================================================
--- spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2008-04-04 12:51:49 UTC (rev 6238)
+++ spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2008-04-04 19:06:38 UTC (rev 6239)
@@ -40,7 +40,7 @@
* @author Thomas.Diesler(a)jboss.com
* @since 20-Apr-2007
*/
-public abstract class DeploymentAspect implements RuntimeAware
+public abstract class DeploymentAspect implements DeploymentLifecycle
{
// provide logging
protected final Logger log = Logger.getLogger(getClass());
@@ -49,16 +49,6 @@
private String provides;
private String requires;
-
- private WSFRuntime runtime;
-
- public void setRuntimeAssociation(WSFRuntime runtime)
- {
- if(this.runtime!=null)
- throw new IllegalArgumentException("Already associated with a WSFRuntime:" + runtime);
-
- this.runtime = runtime;
- }
public String getProvides()
{
@@ -80,20 +70,20 @@
this.requires = requires;
}
- public void create(Deployment dep)
+ public void create(Deployment dep, WSFRuntime runtime)
{
- assert runtime!=null;
+
}
- public void destroy(Deployment dep)
+ public void destroy(Deployment dep, WSFRuntime runtime)
{
}
- public void start(Deployment dep)
+ public void start(Deployment dep, WSFRuntime runtime)
{
}
- public void stop(Deployment dep)
+ public void stop(Deployment dep, WSFRuntime runtime)
{
}
Modified: spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java
===================================================================
--- spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java 2008-04-04 12:51:49 UTC (rev 6238)
+++ spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java 2008-04-04 19:06:38 UTC (rev 6239)
@@ -28,12 +28,15 @@
import java.util.List;
/**
- * A general service deployment manger.
+ * Process an ordered chain of {@link org.jboss.wsf.spi.deployment.DeploymentAspect}'s
+ * on a {@link org.jboss.wsf.spi.deployment.DeploymentLifecycle}
*
* @author Thomas.Diesler(a)jboss.com
+ * @author Heiko.Braun(a)jboss.com
+ *
* @since 20-Apr-2007
*/
-public interface DeploymentAspectManager
+public interface DeploymentAspectManager extends DeploymentLifecycle
{
/** Get the name for this aspect manager */
String getName();
@@ -50,12 +53,5 @@
/** Set the list of registered deployment aspects */
void setDeploymentAspects(List<DeploymentAspect> aspects);
- void create(Deployment dep, WSFRuntime runtime);
-
- void start(Deployment dep, WSFRuntime runtime);
-
- void stop(Deployment dep, WSFRuntime runtime);
-
- void destroy(Deployment dep, WSFRuntime runtime);
}
Added: spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/deployment/DeploymentLifecycle.java
===================================================================
--- spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/deployment/DeploymentLifecycle.java (rev 0)
+++ spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/deployment/DeploymentLifecycle.java 2008-04-04 19:06:38 UTC (rev 6239)
@@ -0,0 +1,38 @@
+/*
+ * 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.spi.deployment;
+
+import org.jboss.wsf.spi.WSFRuntime;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface DeploymentLifecycle
+{
+ void create(Deployment dep, WSFRuntime runtime);
+
+ void start(Deployment dep, WSFRuntime runtime);
+
+ void stop(Deployment dep, WSFRuntime runtime);
+
+ void destroy(Deployment dep, WSFRuntime runtime);
+}
Property changes on: spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/deployment/DeploymentLifecycle.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 9 months
- 1
- 0
JBossWS SVN: r6238 - in stack/cxf/trunk: ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-04 08:51:49 -0400 (Fri, 04 Apr 2008)
New Revision: 6238
Added:
stack/cxf/trunk/ant-import-tests/
stack/cxf/trunk/ant-import-tests/build-jars-jaxws.xml
stack/cxf/trunk/ant-import-tests/build-testsuite.xml
Removed:
stack/cxf/trunk/ant-import/build-testsuite-jars.xml
stack/cxf/trunk/ant-import/build-testsuite.xml
Modified:
stack/cxf/trunk/build.xml
Log:
Allign tests build with metro
Deleted: stack/cxf/trunk/ant-import/build-testsuite-jars.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-testsuite-jars.xml 2008-04-04 12:44:45 UTC (rev 6237)
+++ stack/cxf/trunk/ant-import/build-testsuite-jars.xml 2008-04-04 12:51:49 UTC (rev 6238)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ============================================================ -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- ============================================================ -->
-
-<!-- $Id$ -->
-
-<project>
-
- <description>JBossWS test archive builder</description>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <target name="build-testsuite-jars" description="Build the deployments.">
-
- <mkdir dir="${tests.output.dir}/libs"/>
-
- <!-- jaxws-cxf-descriptor -->
- <war warfile="${tests.output.dir}/libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF">
- <include name="jbossws-cxf.xml"/>
- </webinf>
- </war>
-
- <!-- jaxws-cxf-wsrm-basic-doc -->
- <war warfile="${tests.output.dir}/libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF">
- <include name="jbossws-cxf.xml"/>
- </webinf>
- </war>
-
- <!-- jaxws-cxf-wsrm-basic-rpc -->
- <war warfile="${tests.output.dir}/libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF">
- <include name="jbossws-cxf.xml"/>
- </webinf>
- </war>
-
- <!-- Please add alphabetically -->
-
- </target>
-
-</project>
Deleted: stack/cxf/trunk/ant-import/build-testsuite.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-testsuite.xml 2008-04-04 12:44:45 UTC (rev 6237)
+++ stack/cxf/trunk/ant-import/build-testsuite.xml 2008-04-04 12:51:49 UTC (rev 6238)
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ============================================================ -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- ============================================================ -->
-
-<!-- $Id$ -->
-
-<project>
-
- <property name="tests.output.dir" value="${int.cxf.dir}/output/tests"/>
-
- <import file="${int.cxf.dir}/src/test-framework/ant-import/build-testsuite.xml"/>
-
- <!-- Define excludesfile -->
- <property name="excludesfile" value="${int.cxf.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="tests-init" depends="tests-classpath">
-
- <path id="ws.stack.classpath">
- <pathelement location="${int.cxf.dir}/thirdparty/jbossws-common.jar"/>
- <pathelement location="${int.cxf.dir}/thirdparty/jbossws-spi.jar"/>
- <pathelement location="${int.cxf.dir}/thirdparty/geronimo-javamail_${cxf.geronimo.javamail}.jar"/>
- <pathelement location="${int.cxf.dir}/thirdparty/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/>
- <pathelement location="${int.cxf.dir}/thirdparty/jaxb-api.jar"/>
- <pathelement location="${int.cxf.dir}/thirdparty/jaxws-api-${cxf.jaxws.api}.jar"/>
- <pathelement location="${int.cxf.dir}/thirdparty/jdom-${cxf.jdom}.jar"/>
- <pathelement location="${int.cxf.dir}/thirdparty/neethi-${cxf.neethi}.jar"/>
- <pathelement location="${int.cxf.dir}/thirdparty/saaj-api-${cxf.saaj}.jar"/>
- <pathelement location="${int.cxf.dir}/thirdparty/saaj-impl-${cxf.saaj}.jar"/>
- <pathelement location="${int.cxf.dir}/thirdparty/spring-beans-${cxf.spring}.jar"/>
- <pathelement location="${int.cxf.dir}/thirdparty/spring-context-${cxf.spring}.jar"/>
- <pathelement location="${int.cxf.dir}/thirdparty/spring-core-${cxf.spring}.jar"/>
- <pathelement location="${int.cxf.dir}/thirdparty/wsdl4j.jar"/>
- <pathelement location="${int.cxf.dir}/thirdparty/wstx.jar"/>
- <pathelement location="${int.cxf.dir}/thirdparty/xml-resolver-${cxf.xml.resolver}.jar"/>
- <pathelement location="${int.cxf.dir}/thirdparty/XmlSchema-${cxf.xmlschema}.jar"/>
- </path>
-
- <path id="tests.extra.classpath">
- <pathelement location="${int.cxf.dir}/output/lib/cxf-${cxf.version}.jar"/>
- <pathelement location="${int.cxf.dir}/output/lib/jbossws-cxf-client.jar"/>
- <pathelement location="${int.cxf.dir}/thirdparty/jbossws-framework.jar"/>
- <pathelement location="${int.cxf.dir}/thirdparty/jaxws-tools.jar"/>
- </path>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Generating sources -->
- <!-- ================================================================== -->
-
- <target name="wsconsume" depends="tests-init" unless="noconsume" description="Consume JAX-WS contracts">
-
- <!-- Define the JAX-WS wsconsume task - ->
- <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask">
- <classpath refid="tests.client.classpath"/>
- </taskdef>
-
- <wsconsume wsdl="${tests.framework.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.framework.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
- -->
- </target>
-
- <!-- ================================================================== -->
- <!-- Compiling -->
- <!-- ================================================================== -->
-
- <target name="tests-compile" depends="wsconsume" description="Compile sources">
- <macro-compile-classes srcdir="${int.cxf.dir}/src/test-framework/java" excludesfile="${excludesfile}"/>
- <macro-compile-classes srcdir="${int.cxf.dir}/src/test/java" excludesfile="${excludesfile}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <!-- Copy resources -->
- <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
- <macro-copy-resources srcdir="${int.cxf.dir}/src/test-framework"/>
- <macro-copy-resources srcdir="${int.cxf.dir}/src/test"/>
- </target>
-
- <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">
- <ant antfile="${int.cxf.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
- <ant antfile="${int.cxf.dir}/ant-import/build-testsuite-jars.xml" target="build-testsuite-jars"/>
- </target>
-
- <target name="tests-main" depends="tests-jars" description="Build the deployments."/>
-
-</project>
Added: stack/cxf/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/ant-import-tests/build-jars-jaxws.xml (rev 0)
+++ stack/cxf/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-04 12:51:49 UTC (rev 6238)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <description>JBossWS test archive builder</description>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="build-testsuite-jars" description="Build the deployments.">
+
+ <mkdir dir="${tests.output.dir}/libs"/>
+
+ <!-- jaxws-cxf-descriptor -->
+ <war warfile="${tests.output.dir}/libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-cxf-wsrm-basic-doc -->
+ <war warfile="${tests.output.dir}/libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-cxf-wsrm-basic-rpc -->
+ <war warfile="${tests.output.dir}/libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ </webinf>
+ </war>
+
+ <!-- Please add alphabetically -->
+
+ </target>
+
+</project>
Property changes on: stack/cxf/trunk/ant-import-tests/build-jars-jaxws.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: stack/cxf/trunk/ant-import-tests/build-testsuite.xml (from rev 6234, stack/cxf/trunk/ant-import/build-testsuite.xml)
===================================================================
--- stack/cxf/trunk/ant-import-tests/build-testsuite.xml (rev 0)
+++ stack/cxf/trunk/ant-import-tests/build-testsuite.xml 2008-04-04 12:51:49 UTC (rev 6238)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <property name="tests.output.dir" value="${int.cxf.dir}/output/tests"/>
+
+ <import file="${int.cxf.dir}/src/test-framework/ant-import/build-testsuite.xml"/>
+
+ <!-- Define excludesfile -->
+ <property name="excludesfile" value="${int.cxf.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="tests-init" depends="tests-classpath">
+
+ <path id="ws.stack.classpath">
+ <pathelement location="${int.cxf.dir}/thirdparty/jbossws-common.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/jbossws-spi.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/geronimo-javamail_${cxf.geronimo.javamail}.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/jaxb-api.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/jaxws-api-${cxf.jaxws.api}.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/jdom-${cxf.jdom}.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/neethi-${cxf.neethi}.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/saaj-api-${cxf.saaj}.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/saaj-impl-${cxf.saaj}.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/spring-beans-${cxf.spring}.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/spring-context-${cxf.spring}.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/spring-core-${cxf.spring}.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/wsdl4j.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/wstx.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/xml-resolver-${cxf.xml.resolver}.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/XmlSchema-${cxf.xmlschema}.jar"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ <pathelement location="${int.cxf.dir}/output/lib/cxf-${cxf.version}.jar"/>
+ <pathelement location="${int.cxf.dir}/output/lib/jbossws-cxf-client.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/jbossws-framework.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/jaxws-tools.jar"/>
+ </path>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Generating sources -->
+ <!-- ================================================================== -->
+
+ <target name="wsconsume" depends="tests-init" unless="noconsume" description="Consume JAX-WS contracts">
+
+ <!-- Define the JAX-WS wsconsume task - ->
+ <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask">
+ <classpath refid="tests.client.classpath"/>
+ </taskdef>
+
+ <wsconsume wsdl="${tests.framework.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.framework.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+ -->
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compiling -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="wsconsume" description="Compile sources">
+ <macro-compile-classes srcdir="${int.cxf.dir}/src/test-framework/java" excludesfile="${excludesfile}"/>
+ <macro-compile-classes srcdir="${int.cxf.dir}/src/test/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
+ <macro-copy-resources srcdir="${int.cxf.dir}/src/test-framework"/>
+ <macro-copy-resources srcdir="${int.cxf.dir}/src/test"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">
+ <ant antfile="${int.cxf.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="${int.cxf.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-testsuite-jars"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the deployments."/>
+
+</project>
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2008-04-04 12:44:45 UTC (rev 6237)
+++ stack/cxf/trunk/build.xml 2008-04-04 12:51:49 UTC (rev 6238)
@@ -20,7 +20,6 @@
<import file="${basedir}/ant-import/build-prepare-deploy.xml"/>
<import file="${basedir}/ant-import/build-deploy.xml"/>
<import file="${basedir}/ant-import/build-release.xml"/>
- <import file="${basedir}/ant-import/build-testsuite.xml"/>
<import file="${basedir}/ant-import/build-thirdparty.xml"/>
<import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/>
@@ -47,6 +46,8 @@
<property name="deploy.structure.jboss50" value="${cxf.output.deploy.dir}-jboss50"/>
<property name="jbossws.default.deploy.conf" value="${cxf.dir}/ant-import/jbossws-default-deploy.conf"/>
+ <import file="${basedir}/ant-import-tests/build-testsuite.xml"/>
+
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
16 years, 9 months
- 1
- 0
JBossWS SVN: r6237 - in stack/metro/trunk: ant-import and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-04 08:44:45 -0400 (Fri, 04 Apr 2008)
New Revision: 6237
Modified:
stack/metro/trunk/ant-import-tests/build-testsuite.xml
stack/metro/trunk/ant-import/build-thirdparty.xml
stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt
stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt
stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt
stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt
stack/metro/trunk/version.properties
Log:
[JBWS-2096] Migrate common jax-ws tests to framework (WIP)
Modified: stack/metro/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-04-04 12:32:03 UTC (rev 6236)
+++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-04-04 12:44:45 UTC (rev 6237)
@@ -97,7 +97,10 @@
<!-- The compile classpath for jboss50 integration -->
<path id="metro.integration.classpath">
- <!-- A stack MUST NOT have a compile time dependency on jbossws-framework.jar -->
+ <!--
+ A stack MUST NOT have a compile time dependency on framework
+ http://www.jboss.org/index.html?module=bb&op=viewtopic&t=133071
+ -->
<pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
<pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-04-04 12:32:03 UTC (rev 6236)
+++ stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-04-04 12:44:45 UTC (rev 6237)
@@ -22,6 +22,9 @@
<property name="tests.java.dir" value="${tests.dir}/java"/>
<property name="tests.resources.dir" value="${tests.dir}/resources"/>
+ <property name="tests.framework.dir" value="${metro.dir}/src/test-framework"/>
+ <property name="tests.framework.resources.dir" value="${tests.framework.dir}/resources"/>
+
<!--
Init the various classpaths
-->
@@ -55,44 +58,31 @@
<pathelement location="${int.metro.dir}/thirdparty/jbossws-framework.jar"/>
</path>
- <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport">
- <classpath refid="ws.stack.classpath"/>
- </taskdef>
-
</target>
- <!-- ================================================================== -->
- <!-- Generating sources -->
- <!-- ================================================================== -->
-
- <target name="wsimport" depends="tests-init" description="Consume JAX-WS contracts">
+ <!-- ================================================================== -->
+ <!-- Generating sources -->
+ <!-- ================================================================== -->
+
+ <target name="wsconsume" depends="tests-init" unless="noconsume" description="Consume JAX-WS contracts">
+
+ <!-- Define the JAX-WS wsconsume task -->
+ <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask">
+ <classpath refid="tests.client.classpath"/>
+ </taskdef>
- <mkdir dir="${tests.output.dir}/wsimport"/>
+ <wsconsume wsdl="${tests.resources.dir}/wsit/rm/WEB-INF/wsdl/Calc.wsdl" package="org.jboss.test.ws.wsit.rm" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
- <wsimport wsdl="${tests.resources.dir}/wsit/rm/WEB-INF/wsdl/Calc.wsdl" destdir="${tests.output.dir}/wsimport" sourcedestdir="${tests.output.dir}/wsimport" keep="true"
- verbose="false" package="org.jboss.test.ws.wsit.rm" target="2.0"/>
-
- </target>
-
- <!--
- Generate JAX-WS sources
- -->
- <target name="wsgen" depends="tests-compile" description="Provide the JAX-WS contracts.">
-
- <!-- placeholder for jaxws tools extension points -->
-
- </target>
-
- <target name="tests-compile-generated-resources" depends="wsgen">
-
- </target>
-
+ <wsconsume wsdl="${tests.framework.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.framework.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+ </target>
+
<!-- ================================================================== -->
<!-- Compiling -->
<!-- ================================================================== -->
- <target name="tests-compile" depends="wsimport,tests-classpath" description="Compile sources">
- <macro-compile-classes srcdir="${tests.output.dir}/wsimport" excludesfile="${excludesfile}"/>
+ <target name="tests-compile" depends="wsconsume,tests-classpath" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.output.dir}/wsconsume/java" excludesfile="${excludesfile}"/>
<macro-compile-classes srcdir="${metro.dir}/src/test-framework/java" excludesfile="${excludesfile}"/>
<macro-compile-classes srcdir="${metro.dir}/src/test/java" excludesfile="${excludesfile}"/>
</target>
@@ -107,7 +97,7 @@
<macro-copy-resources srcdir="${metro.dir}/src/test"/>
</target>
- <target name="tests-jars" depends="wsimport,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments.">
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">
<ant antfile="${metro.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/>
<ant antfile="${int.metro.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
</target>
Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt 2008-04-04 12:32:03 UTC (rev 6236)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt 2008-04-04 12:44:45 UTC (rev 6237)
@@ -2,8 +2,26 @@
# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $
#
+# [JBWS-1674] Fix @WebServiceRef with Metro
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/webserviceref/**
+
+# [JBWS-2105] Remove dependency on native wsdl model
+org/jboss/test/ws/jaxws/binding/**
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/jbws1190/**
+org/jboss/test/ws/jaxws/jbws1505/**
+org/jboss/test/ws/jaxws/jbws1529/**
+org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/jbws1665/**
+org/jboss/test/ws/jaxws/jbws1809/**
+org/jboss/test/ws/jaxws/jbws1904/**
+org/jboss/test/ws/jaxws/jbws1909/**
+org/jboss/test/ws/jaxws/jbws1969/**
+org/jboss/test/ws/jaxws/jbws860/**
+org/jboss/test/ws/jaxws/jbws944/**
+org/jboss/test/ws/jaxws/webfault/**
+
# [JBWS-1673] Fix JAXR samples for Metro
org/jboss/test/ws/jaxws/samples/jaxr/**
-# [JBWS-1674] Fix @WebServiceRef with Metro
-org/jboss/test/ws/jaxws/samples/webserviceref/**
Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt 2008-04-04 12:32:03 UTC (rev 6236)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt 2008-04-04 12:44:45 UTC (rev 6237)
@@ -2,8 +2,26 @@
# $Id$
#
+# [JBWS-1674] Fix @WebServiceRef with Metro
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/webserviceref/**
+
+# [JBWS-2105] Remove dependency on native wsdl model
+org/jboss/test/ws/jaxws/binding/**
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/jbws1190/**
+org/jboss/test/ws/jaxws/jbws1505/**
+org/jboss/test/ws/jaxws/jbws1529/**
+org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/jbws1665/**
+org/jboss/test/ws/jaxws/jbws1809/**
+org/jboss/test/ws/jaxws/jbws1904/**
+org/jboss/test/ws/jaxws/jbws1909/**
+org/jboss/test/ws/jaxws/jbws1969/**
+org/jboss/test/ws/jaxws/jbws860/**
+org/jboss/test/ws/jaxws/jbws944/**
+org/jboss/test/ws/jaxws/webfault/**
+
# [JBWS-1673] Fix JAXR samples for Metro
org/jboss/test/ws/jaxws/samples/jaxr/**
-# [JBWS-1674] Fix @WebServiceRef with Metro
-org/jboss/test/ws/jaxws/samples/webserviceref/**
Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-04 12:32:03 UTC (rev 6236)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-04 12:44:45 UTC (rev 6237)
@@ -2,6 +2,22 @@
# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $
#
+# [JBWS-2105] Remove dependency on native wsdl model
+org/jboss/test/ws/jaxws/binding/**
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/jbws1190/**
+org/jboss/test/ws/jaxws/jbws1505/**
+org/jboss/test/ws/jaxws/jbws1529/**
+org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/jbws1665/**
+org/jboss/test/ws/jaxws/jbws1809/**
+org/jboss/test/ws/jaxws/jbws1904/**
+org/jboss/test/ws/jaxws/jbws1909/**
+org/jboss/test/ws/jaxws/jbws1969/**
+org/jboss/test/ws/jaxws/jbws860/**
+org/jboss/test/ws/jaxws/jbws944/**
+org/jboss/test/ws/jaxws/webfault/**
+
# [JBWS-1673] Fix JAXR samples for Metro
org/jboss/test/ws/jaxws/samples/jaxr/**
Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-04 12:32:03 UTC (rev 6236)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-04 12:44:45 UTC (rev 6237)
@@ -2,6 +2,22 @@
# $Id$
#
+# [JBWS-2105] Remove dependency on native wsdl model
+org/jboss/test/ws/jaxws/binding/**
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/jbws1190/**
+org/jboss/test/ws/jaxws/jbws1505/**
+org/jboss/test/ws/jaxws/jbws1529/**
+org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/jbws1665/**
+org/jboss/test/ws/jaxws/jbws1809/**
+org/jboss/test/ws/jaxws/jbws1904/**
+org/jboss/test/ws/jaxws/jbws1909/**
+org/jboss/test/ws/jaxws/jbws1969/**
+org/jboss/test/ws/jaxws/jbws860/**
+org/jboss/test/ws/jaxws/jbws944/**
+org/jboss/test/ws/jaxws/webfault/**
+
# [JBWS-1673] Fix JAXR samples for Metro
org/jboss/test/ws/jaxws/samples/jaxr/**
@@ -13,4 +29,5 @@
# TODO: Fix classpath to ClientLauncher
org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/webserviceref/**
Modified: stack/metro/trunk/version.properties
===================================================================
--- stack/metro/trunk/version.properties 2008-04-04 12:32:03 UTC (rev 6236)
+++ stack/metro/trunk/version.properties 2008-04-04 12:44:45 UTC (rev 6237)
@@ -15,8 +15,8 @@
# Thirdparty library versions
jbossws-spi=1.0.2.GA
-jbossws-common=1.0.4.GA
-jbossws-framework=3.0.1.GA
+jbossws-common=snapshot
+jbossws-framework=snapshot
jbossws-jboss42=4.2.1.GA
junit=3.8.1
16 years, 9 months
- 1
- 0
JBossWS SVN: r6236 - framework/trunk/hudson/hudson-home.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-04 08:32:03 -0400 (Fri, 04 Apr 2008)
New Revision: 6236
Modified:
framework/trunk/hudson/hudson-home/config.xml
Log:
Add core cxf tests
Modified: framework/trunk/hudson/hudson-home/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/config.xml 2008-04-04 12:11:17 UTC (rev 6235)
+++ framework/trunk/hudson/hudson-home/config.xml 2008-04-04 12:32:03 UTC (rev 6236)
@@ -128,6 +128,10 @@
<jobNames class="tree-set">
<no-comparator/>
<string>CXF-ALL</string>
+ <string>CXF-Core-AS-4.2.2</string>
+ <string>CXF-Core-AS-4.2.3</string>
+ <string>CXF-Core-AS-5.0.0</string>
+ <string>CXF-Core-AS-5.0.1</string>
<string>CXF-Distro-AS-4.2.2</string>
<string>CXF-Distro-AS-4.2.3</string>
<string>CXF-Distro-AS-5.0.0</string>
16 years, 9 months
- 1
- 0
JBossWS SVN: r6235 - in framework/trunk/hudson/hudson-home/jobs: CXF-ALL and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-04 08:11:17 -0400 (Fri, 04 Apr 2008)
New Revision: 6235
Added:
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.2/
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/
Modified:
framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml
Log:
Add core cxf tests
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2008-04-04 11:58:14 UTC (rev 6234)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2008-04-04 12:11:17 UTC (rev 6235)
@@ -4,7 +4,8 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
- CXF-Distro-AS-4.2.2, CXF-Distro-AS-4.2.3, CXF-Distro-AS-5.0.0, CXF-Distro-AS-5.0.1
+ CXF-Core-AS-4.2.2, CXF-Core-AS-4.2.3, CXF-Core-AS-5.0.0, CXF-Core-AS-5.0.1
+ , CXF-Distro-AS-4.2.2, CXF-Distro-AS-4.2.3, CXF-Distro-AS-5.0.0, CXF-Distro-AS-5.0.1
, CXF-Integration-AS-4.2.2, CXF-Integration-AS-4.2.3, CXF-Integration-AS-5.0.0, CXF-Integration-AS-5.0.1
</childProjects>
</hudson.tasks.BuildTrigger>
Added: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.2/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.2/config.xml 2008-04-04 12:11:17 UTC (rev 6235)
@@ -0,0 +1,98 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-Core-AS-4.2.2
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build and deploy
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss422
+
+#
+# start jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/boot.log
+cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/server.log
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/output/tests/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ against AS-4.2.2</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.2/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml 2008-04-04 12:11:17 UTC (rev 6235)
@@ -0,0 +1,98 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-Core-AS-4.2.3
+
+WORKSPACE=`pwd`
+FRAMEWORKDIR=$WORKSPACE/framework
+STACKCXF=$WORKSPACE/stack-cxf
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE"
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# build and deploy
+#
+cd $STACKCXF
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
+
+#
+# start jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$FRAMEWORKDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/boot.log
+cp $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/server.log
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/output/tests/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.framework.url@</remote>
+ <local>framework</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ against AS-4.2.3</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0 (from rev 6233, framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0)
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-04-04 11:17:34 UTC (rev 6233)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml 2008-04-04 12:11:17 UTC (rev 6235)
@@ -6,15 +6,14 @@
#
# Module settings
#
-MODULE=Metro-Core-AS-5.0.0
+MODULE=CXF-Core-AS-5.0.0
WORKSPACE=`pwd`
-CVS_USER=`whoami`
FRAMEWORKDIR=$WORKSPACE/framework
-STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -24,7 +23,7 @@
#
# build and deploy
#
-cd $STACKMETRO
+cd $STACKCXF
cp ant.properties.example ant.properties
./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500
@@ -58,7 +57,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>stack-metro/output/tests/reports/*.xml</testResults>
+ <testResults>stack-cxf/output/tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
@@ -74,8 +73,8 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.metro.url@</remote>
- <local>stack-metro</local>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
@@ -94,6 +93,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Build and test jbossws-metro-(a)version.id@ against AS-5.0.0</description>
+ <description>Build and test jbossws-cxf-(a)version.id@ against AS-5.0.0</description>
<actions class="vector"/>
</project>
\ No newline at end of file
Copied: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1 (from rev 6233, framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1)
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml 2008-04-04 11:17:34 UTC (rev 6233)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml 2008-04-04 12:11:17 UTC (rev 6235)
@@ -6,15 +6,14 @@
#
# Module settings
#
-MODULE=Metro-Core-AS-5.0.1
+MODULE=CXF-Core-AS-5.0.1
WORKSPACE=`pwd`
-CVS_USER=`whoami`
FRAMEWORKDIR=$WORKSPACE/framework
-STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@
-ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE -Dcvs.user=$CVS_USER"
+ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE"
#
# stop jbossas
@@ -24,7 +23,7 @@
#
# build and deploy
#
-cd $STACKMETRO
+cd $STACKCXF
cp ant.properties.example ant.properties
./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss501
@@ -58,7 +57,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>stack-metro/output/tests/reports/*.xml</testResults>
+ <testResults>stack-cxf/output/tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
@@ -74,8 +73,8 @@
<local>framework</local>
</hudson.scm.SubversionSCM-ModuleLocation>
<hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@hudson.metro.url@</remote>
- <local>stack-metro</local>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
</hudson.scm.SubversionSCM-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
@@ -94,6 +93,6 @@
</logRotator>
<keepDependencies>false</keepDependencies>
<properties/>
- <description>Build and test jbossws-metro-(a)version.id@ against AS-5.0.1</description>
+ <description>Build and test jbossws-cxf-(a)version.id@ against AS-5.0.1</description>
<actions class="vector"/>
</project>
\ No newline at end of file
16 years, 9 months
- 1
- 0