JBossWS SVN: r19153 - in stack/cxf/branches/jbossws-cxf-4.3.x: modules/server/src/main/java/org/jboss/wsf/stack/cxf and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-12-18 04:54:56 -0500 (Thu, 18 Dec 2014)
New Revision: 19153
Added:
stack/cxf/branches/jbossws-cxf-4.3.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/SecurityActions.java
Modified:
stack/cxf/branches/jbossws-cxf-4.3.x/
stack/cxf/branches/jbossws-cxf-4.3.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java
Log:
Merged revisions 19141 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r19141 | asoldano | 2014-12-15 11:20:45 +0100 (Mon, 15 Dec 2014) | 2 lines
[JBWS-3858] Misconfigured TCCL during endpoint method invocations when Spring integration is enabled
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.3.x
___________________________________________________________________
Modified: svnmerge-integrated
- /stack/cxf/trunk:1-18594,18609-18612,18616-18619,18621,18625-18652,18656-18658,18661,18663,18665-18668,18671-18683,18685-18687,18689-18693,18695,18698,18701,18703-18704,18706-18710,18712-18713,18715,18717-18721,18726-18730,18732,18735-18737,18742,18745-18746,18750-18752,18755-18759,18762,18770,18777-18779,18781-18787,18796,18798,18805-18808,18811-18814,18816,18822-18824,18832-18835,18837,18839-18840,18842-18843,18845,18847-18848,18852,18856-18857,18859-18864,18866,18883-18884,18933,18947,19024-19026,19028,19030,19032-19041,19121
+ /stack/cxf/trunk:1-18594,18609-18612,18616-18619,18621,18625-18652,18656-18658,18661,18663,18665-18668,18671-18683,18685-18687,18689-18693,18695,18698,18701,18703-18704,18706-18710,18712-18713,18715,18717-18721,18726-18730,18732,18735-18737,18742,18745-18746,18750-18752,18755-18759,18762,18770,18777-18779,18781-18787,18796,18798,18805-18808,18811-18814,18816,18822-18824,18832-18835,18837,18839-18840,18842-18843,18845,18847-18848,18852,18856-18857,18859-18864,18866,18883-18884,18933,18947,19024-19026,19028,19030,19032-19041,19121,19141
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/branches/jaspi:18054-18409
/stack/cxf/branches/ropalka:16301-16305,16966-17008
/stack/cxf/branches/ropalka_JBWS-3550:16747-16757
/stack/cxf/trunk:18609,18616-18619,18629,18695,18710,18715,18798,18814,18816,18847,18852,18856,18860-18864,18866,18883-18884,18933,18947,19024-19025,19028,19030,19032-19033,19036-19037,19040-19041,19121
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/branches/jaspi:18054-18409
/stack/cxf/branches/ropalka:16301-16305,16966-17008
/stack/cxf/branches/ropalka_JBWS-3550:16747-16757
/stack/cxf/trunk:18609,18616-18619,18629,18695,18710,18715,18798,18814,18816,18847,18852,18856,18860-18864,18866,18883-18884,18933,18947,19024-19025,19028,19030,19032-19033,19036-19037,19040-19041,19121,19141
Modified: stack/cxf/branches/jbossws-cxf-4.3.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2014-12-18 09:22:40 UTC (rev 19152)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2014-12-18 09:54:56 UTC (rev 19153)
@@ -171,10 +171,13 @@
BusFactory.setThreadDefaultBus(null);
setNamespaceContextSelector(exchange);
+ ClassLoader cl = SecurityActions.getContextClassLoader();
+ SecurityActions.setContextClassLoader(serviceObject.getClass().getClassLoader());
try {
invHandler.invoke(ep, inv);
return inv.getReturnValue();
} finally {
+ SecurityActions.setContextClassLoader(cl);
//make sure the right bus is restored after coming back from the endpoint method
BusFactory.setThreadDefaultBus(threadBus);
clearNamespaceContextSelector(exchange);
Copied: stack/cxf/branches/jbossws-cxf-4.3.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/SecurityActions.java (from rev 19141, stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/SecurityActions.java)
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/SecurityActions.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-4.3.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/SecurityActions.java 2014-12-18 09:54:56 UTC (rev 19153)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.stack.cxf;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 17-Feb-2010
+ *
+ */
+class SecurityActions
+{
+ /**
+ * Get context classloader.
+ *
+ * @return the current context classloader
+ */
+ static ClassLoader getContextClassLoader()
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null)
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ else
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+ }
+
+ /**
+ * Set context classloader.
+ *
+ * @param classLoader the classloader
+ */
+ static void setContextClassLoader(final ClassLoader classLoader)
+ {
+ if (System.getSecurityManager() == null)
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ }
+ else
+ {
+ AccessController.doPrivileged(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ return null;
+ }
+ });
+ }
+ }
+
+}
11 years
JBossWS SVN: r19152 - stack/cxf/branches/arquillian/modules/resources/src/main/resources/resources.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-12-18 04:22:40 -0500 (Thu, 18 Dec 2014)
New Revision: 19152
Removed:
stack/cxf/branches/arquillian/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
Removing file not needed anymore
Deleted: stack/cxf/branches/arquillian/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-12-17 15:29:10 UTC (rev 19151)
+++ stack/cxf/branches/arquillian/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-12-18 09:22:40 UTC (rev 19152)
@@ -1,376 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2014, Red Hat, Inc., 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.
- -->
-
-<project>
-
- <!-- ================================================================== -->
- <!-- Modules -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-modules-as9">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <attribute name="modules-jbossid"/>
- <sequential>
- <!-- libraries -->
- <copy todir="@{targetdir}/org/jboss/ws/jaxws-client/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-cxf-client.jar"/>
- <include name="**/jbossws-cxf-jaspi.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/jaxws-undertow-httpspi/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jaxws-undertow-httpspi.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-server/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-cxf-server.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-factories/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-cxf-factories.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-cxf-transports-undertow.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-cxf-transports-udp.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/cxf/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/cxf-core*.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/cxf/impl/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/cxf-*.jar"/>
- <exclude name="**/cxf-core*.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/api/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-api.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/common/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-common.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/tools/common/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-common-tools.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/spi/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-spi.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/httpcomponents/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/httpcore.jar"/>
- <include name="**/httpcore-nio.jar"/>
- <include name="**/httpasyncclient.jar"/>
- <include name="**/httpclient.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/neethi/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/neethi.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/santuario/xmlsec/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/xmlsec.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/ws/security/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/wss4j-*.jar"/>
- <include name="**/jasypt.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/ws/xmlschema/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/xmlschema-core.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/opensaml/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/opensaml.jar"/>
- <include name="**/openws.jar"/>
- <include name="**/xmltooling.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-cxf-resources-(a){jbossid}.jar"/>
- <include name="**/jbossws-(a){jbossid}-server-integration.jar"/>
- </fileset>
- </copy>
- <!-- module.xml files -->
- <installModules targetDir="@{targetdir}">
- <fileset dir="@{thirdpartydir}/modules/@{modules-jbossid}">
- <include name="**/module.xml"/>
- <exclude name="**/jboss/as/webservices/**/module.xml"/>
- <exclude name="**/spring/**/module.xml"/>
- </fileset>
- </installModules>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-deploy-jbossws-modules-as8">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <attribute name="modules-jbossid"/>
- <sequential>
- <!-- libraries -->
- <copy todir="@{targetdir}/org/jboss/ws/jaxws-client/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-cxf-client.jar"/>
- <include name="**/jbossws-cxf-jaspi.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/jaxws-undertow-httpspi/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jaxws-undertow-httpspi.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-server/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-cxf-server.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-factories/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-cxf-factories.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-cxf-transports-undertow.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-cxf-transports-udp.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/cxf/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/cxf-core*.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/cxf/impl/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/cxf-*.jar"/>
- <exclude name="**/cxf-core*.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/api/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-api.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/common/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-common.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/tools/common/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-common-tools.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/spi/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-spi.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/httpcomponents/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/httpcore.jar"/>
- <include name="**/httpcore-nio.jar"/>
- <include name="**/httpasyncclient.jar"/>
- <include name="**/httpclient.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/neethi/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/neethi.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/santuario/xmlsec/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/xmlsec.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/ws/security/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/wss4j-*.jar"/>
- <include name="**/jasypt.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/ws/xmlschema/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/xmlschema-core.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/opensaml/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/opensaml.jar"/>
- <include name="**/openws.jar"/>
- <include name="**/xmltooling.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-cxf-resources-(a){jbossid}.jar"/>
- <include name="**/jbossws-(a){jbossid}-server-integration.jar"/>
- </fileset>
- </copy>
- <!-- module.xml files -->
- <installModules targetDir="@{targetdir}">
- <fileset dir="@{thirdpartydir}/modules/@{modules-jbossid}">
- <include name="**/module.xml"/>
- <exclude name="**/jboss/as/webservices/**/module.xml"/>
- <exclude name="**/spring/**/module.xml"/>
- </fileset>
- </installModules>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy JBossWS -->
- <!-- ================================================================== -->
-
- <target name="check-parameters">
- <fail message="installserver must be specified" unless="installserver"/>
- <fail message="artifactsdir must be specified" unless="artifactsdir"/>
- <fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
- <fail message="modifyjbossintegration must be specified" unless="modifyjbossintegration"/>
- </target>
-
- <target name="deploy-jbossws-cxf-modules-as8">
- <fail message="installserver must be specified" unless="installserver"/>
- <fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
- <macro-deploy-jbossws-modules-as8 targetdir="${installserver}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/>
- </target>
-
- <target name="deploy-jbossws-cxf-modules-as9">
- <fail message="installserver must be specified" unless="installserver"/>
- <fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
- <macro-deploy-jbossws-modules-as9 targetdir="${installserver}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Install Spring -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-install-spring-modules">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="modules-jbossid"/>
- <sequential>
- <!-- libraries -->
- <copy todir="@{targetdir}/org/springframework/spring/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/spring-*.jar"/>
- </fileset>
- </copy>
- <!-- module.xml files -->
- <installModules targetDir="@{targetdir}">
- <fileset dir="@{thirdpartydir}/modules/@{modules-jbossid}">
- <include name="**/spring/**/module.xml"/>
- </fileset>
- </installModules>
- </sequential>
- </macrodef>
-
- <target name="deploy-spring-module">
- <fail message="installserver must be specified" unless="installserver"/>
- <fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
- <macro-install-spring-modules targetdir="${installserver}" thirdpartydir="${thirdpartydir}" modules-jbossid="${modules-jbossid}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Undeploy JBossWS -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-undeploy-jbossws-modules">
- <attribute name="defaultmodulesconf"/>
- <attribute name="targetdir"/>
- <attribute name="modifyjbossintegration"/>
-
- <sequential>
- <loadfile property="jbossws.modules.conf" srcfile="@{targetdir}/org/jboss/as/webservices/jbossws-modules.conf" failonerror="false"/>
- <loadfile property="jbossws.modules.conf" srcfile="@{defaultmodulesconf}" failonerror="false"/>
-
- <delete includeemptydirs="true" verbose="true">
- <fileset dir="@{targetdir}">
- <include name="**/org/jboss/as/webservices/main/jbossws-*-resources*"/>
- <include name="**/org/jboss/as/webservices/main/jbossws-jboss*"/>
- </fileset>
- </delete>
- <property name="jboss.modules" value="@{targetdir}"/>
- <antcall target="remove-jboss-integration-module">
- <param name="modifyjbossintegration" value="@{modifyjbossintegration}"/>
- </antcall>
-
- <!-- delete content of last deployment -->
- <delete includeemptydirs="true" verbose="true">
- <fileset dir="@{targetdir}" includes="${jbossws.modules.conf}"/>
- </delete>
- </sequential>
- </macrodef>
-
- <target name="remove-jboss-integration-module" depends="process-jboss-integration" if="fixintegration">
- <delete verbose="true">
- <fileset dir="${jboss.modules}">
- <include name="**/org/jboss/as/webservices/main/jboss-as-webservices-server-integration*"/>
- <include name="**/org/jboss/as/webservices/main/wildfly-webservices-server-integration*"/>
- </fileset>
- </delete>
- </target>
-
- <target name="process-jboss-integration">
- <condition property="fixintegration">
- <and>
- <istrue value="${modifyjbossintegration}"/>
- </and>
- </condition>
- </target>
-
-</project>
11 years
JBossWS SVN: r19151 - stack/cxf/branches/arquillian.
by jbossws-commits@lists.jboss.org
Author: rsearls
Date: 2014-12-17 10:29:10 -0500 (Wed, 17 Dec 2014)
New Revision: 19151
Modified:
stack/cxf/branches/arquillian/README
Log:
maven 3.2.2 or higher is required to bld and run this env
Modified: stack/cxf/branches/arquillian/README
===================================================================
--- stack/cxf/branches/arquillian/README 2014-12-16 12:42:42 UTC (rev 19150)
+++ stack/cxf/branches/arquillian/README 2014-12-17 15:29:10 UTC (rev 19151)
@@ -1,6 +1,8 @@
Building and running the testsuite
------------------------------------
+Building and running the testsuite requires maven version 3.2.2 or higher.
+
The build follows the usual Maven flow; a wilflyXYZ profile has to be specified to tell the project which target container to use for integration tests; if no wildflyXYZ profile is specified, the integration tests are skipped.
> mvn -PwildflyXYZ integration-test
11 years
JBossWS SVN: r19150 - in stack/cxf/branches/arquillian: modules/testsuite/cxf-tests and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-12-16 07:42:42 -0500 (Tue, 16 Dec 2014)
New Revision: 19150
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml
stack/cxf/branches/arquillian/pom.xml
Log:
Deal with wsdl4j bug with security manager enabled
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2014-12-16 09:59:42 UTC (rev 19149)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2014-12-16 12:42:42 UTC (rev 19150)
@@ -274,7 +274,7 @@
<goal>start</goal>
</goals>
<configuration>
- <jvmArgs>-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m</jvmArgs>
+ <jvmArgs>-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m ${additionalJvmArgs}</jvmArgs>
<serverConfig>jbws-testsuite-default.xml</serverConfig>
<jbossHome>${jboss.home}</jbossHome>
<port>9990</port>
@@ -287,7 +287,7 @@
<goal>start</goal>
</goals>
<configuration>
- <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=10000</jvmArgs>
+ <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=10000 ${additionalJvmArgs}</jvmArgs>
<serverConfig>jbws-testsuite-ssl-mutual-auth.xml</serverConfig>
<jbossHome>${jboss.home}</jbossHome>
<port>19990</port>
@@ -300,7 +300,7 @@
<goal>start</goal>
</goals>
<configuration>
- <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=20000</jvmArgs>
+ <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=20000 ${additionalJvmArgs}</jvmArgs>
<serverConfig>jbws-testsuite-default-config-tests.xml</serverConfig>
<jbossHome>${jboss.home}</jbossHome>
<port>29990</port>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml 2014-12-16 09:59:42 UTC (rev 19149)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml 2014-12-16 12:42:42 UTC (rev 19150)
@@ -6,6 +6,7 @@
<container qualifier="jboss" default="true">
<configuration>
<property name="jbossHome">${jboss.home}</property>
+ <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m ${additionalJvmArgs}</property>
<property name="serverConfig">jbws-testsuite-default.xml</property>
<property name="allowConnectingToRunningServer">true</property>
<property name="managementPort">${as.managementPort:9990}</property>
@@ -17,7 +18,7 @@
<container qualifier="ssl-mutual-auth" mode="manual">
<configuration>
<property name="jbossHome">${jboss.home}</property>
- <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=10000</property>
+ <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=10000 ${additionalJvmArgs}</property>
<property name="serverConfig">jbws-testsuite-ssl-mutual-auth.xml</property>
<property name="allowConnectingToRunningServer">true</property>
<property name="managementPort">${as.managementPort:19990}</property>
@@ -29,7 +30,7 @@
<container qualifier="default-config-tests" mode="manual">
<configuration>
<property name="jbossHome">${jboss.home}</property>
- <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=20000</property>
+ <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=20000 ${additionalJvmArgs}</property>
<property name="serverConfig">jbws-testsuite-default-config-tests.xml</property>
<property name="allowConnectingToRunningServer">true</property>
<property name="managementPort">${as.managementPort:29990}</property>
Modified: stack/cxf/branches/arquillian/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/pom.xml 2014-12-16 09:59:42 UTC (rev 19149)
+++ stack/cxf/branches/arquillian/pom.xml 2014-12-16 12:42:42 UTC (rev 19150)
@@ -1389,6 +1389,7 @@
<jbossws.integration.target>wildfly800</jbossws.integration.target>
<jboss.home>${server.home}</jboss.home>
<jboss.version>${wildfly800.version}</jboss.version>
+ <additionalJvmArgs>-Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</additionalJvmArgs>
</properties>
<modules>
<module>modules/dist</module>
@@ -1406,6 +1407,7 @@
<jbossws.integration.target>wildfly810</jbossws.integration.target>
<jboss.home>${server.home}</jboss.home>
<jboss.version>${wildfly810.version}</jboss.version>
+ <additionalJvmArgs>-Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</additionalJvmArgs>
</properties>
<modules>
<module>modules/dist</module>
@@ -1423,6 +1425,7 @@
<jbossws.integration.target>wildfly900</jbossws.integration.target>
<jboss.home>${server.home}</jboss.home>
<jboss.version>${wildfly900.version}</jboss.version>
+ <additionalJvmArgs></additionalJvmArgs>
</properties>
<modules>
<module>modules/dist</module>
11 years
JBossWS SVN: r19149 - stack/cxf/branches/arquillian/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-12-16 04:59:42 -0500 (Tue, 16 Dec 2014)
New Revision: 19149
Modified:
stack/cxf/branches/arquillian/modules/testsuite/pom.xml
Log:
Temporary disable spring tests, to have proper runs on hudson
Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2014-12-16 07:58:00 UTC (rev 19148)
+++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2014-12-16 09:59:42 UTC (rev 19149)
@@ -649,9 +649,9 @@
-->
<profile>
<id>spring</id>
- <modules>
+<!-- <modules>
<module>cxf-spring-tests</module>
- </modules>
+ </modules>-->
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
11 years
JBossWS SVN: r19148 - stack/cxf/branches/arquillian.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-12-16 02:58:00 -0500 (Tue, 16 Dec 2014)
New Revision: 19148
Modified:
stack/cxf/branches/arquillian/pom.xml
Log:
Move to cxf 3.0.3 final
Modified: stack/cxf/branches/arquillian/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/pom.xml 2014-12-15 18:13:02 UTC (rev 19147)
+++ stack/cxf/branches/arquillian/pom.xml 2014-12-16 07:58:00 UTC (rev 19148)
@@ -71,7 +71,7 @@
<wildfly810.version>8.1.0.Final</wildfly810.version>
<wildfly900.version>9.0.0.Alpha2-SNAPSHOT</wildfly900.version>
<ejb.api.version>1.0.2.Final</ejb.api.version>
- <cxf.version>3.0.3-SNAPSHOT</cxf.version>
+ <cxf.version>3.0.3</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>3.0.2</cxf.xjcplugins.version>
<jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
11 years
JBossWS SVN: r19147 - in hudson/branches/arquillian: hudson-home/jobs/CXF-CORE-AS-8.0.0-SECMGR and 8 other directories.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-12-15 13:13:02 -0500 (Mon, 15 Dec 2014)
New Revision: 19147
Modified:
hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0-SECMGR/config.xml
hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/config.xml
hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0/config.xml
hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0-SECMGR/config.xml
hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0-SPRING/config.xml
hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0/config.xml
hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml
hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml
hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml
hudson/branches/arquillian/scripts/jbossws-qa.sh
Log:
Fixing jobs to use new build commands
Modified: hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0/config.xml 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0/config.xml 2014-12-15 18:13:02 UTC (rev 19147)
@@ -15,8 +15,6 @@
STACK_DIR=$WORKSPACE/stack-cxf
TEST_OPTS=
JBOSS_TARGET=wildfly800
-JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.0.0/workspace/build/target/(a)hudson.jboss800.build@
#
# load test functions
Modified: hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0-SECMGR/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0-SECMGR/config.xml 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0-SECMGR/config.xml 2014-12-15 18:13:02 UTC (rev 19147)
@@ -15,7 +15,6 @@
STACK_DIR=$WORKSPACE/stack-cxf
TEST_OPTS=-Dsecmgr=true
JBOSS_TARGET=wildfly800
-JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.0.0-SECMGR/workspace/build/target/(a)hudson.jboss800.build@
#
Modified: hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/config.xml 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/config.xml 2014-12-15 18:13:02 UTC (rev 19147)
@@ -15,8 +15,6 @@
STACK_DIR=$WORKSPACE/stack-cxf
TEST_OPTS=
JBOSS_TARGET=wildfly800
-JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.0.0/workspace/build/target/(a)hudson.jboss800.build@
#
# load test functions
Modified: hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0/config.xml 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0/config.xml 2014-12-15 18:13:02 UTC (rev 19147)
@@ -15,8 +15,6 @@
STACK_DIR=$WORKSPACE/stack-cxf
TEST_OPTS=
JBOSS_TARGET=wildfly810
-JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.1.0/workspace/build/target/(a)hudson.jboss810.build@
#
# load test functions
Modified: hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0-SECMGR/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0-SECMGR/config.xml 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0-SECMGR/config.xml 2014-12-15 18:13:02 UTC (rev 19147)
@@ -15,7 +15,6 @@
STACK_DIR=$WORKSPACE/stack-cxf
TEST_OPTS=-Dsecmgr=true
JBOSS_TARGET=wildfly810
-JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.1.0-SECMGR/workspace/build/target/(a)hudson.jboss810.build@
#
Modified: hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0-SPRING/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0-SPRING/config.xml 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0-SPRING/config.xml 2014-12-15 18:13:02 UTC (rev 19147)
@@ -15,8 +15,6 @@
STACK_DIR=$WORKSPACE/stack-cxf
TEST_OPTS=
JBOSS_TARGET=wildfly810
-JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.1.0/workspace/build/target/(a)hudson.jboss810.build@
#
# load test functions
Modified: hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml 2014-12-15 18:13:02 UTC (rev 19147)
@@ -15,7 +15,6 @@
STACK_DIR=$WORKSPACE/stack-cxf
TEST_OPTS=
JBOSS_TARGET=wildfly900
-JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/dist/target/(a)hudson.jboss900.build@
#
Modified: hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml 2014-12-15 18:13:02 UTC (rev 19147)
@@ -15,7 +15,6 @@
STACK_DIR=$WORKSPACE/stack-cxf
TEST_OPTS=-Dsecmgr=true
JBOSS_TARGET=wildfly900
-JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0-SECMGR/workspace/dist/target/(a)hudson.jboss900.build@
#
Modified: hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml 2014-12-15 18:13:02 UTC (rev 19147)
@@ -15,7 +15,6 @@
STACK_DIR=$WORKSPACE/stack-cxf
TEST_OPTS=
JBOSS_TARGET=wildfly900
-JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/dist/target/(a)hudson.jboss900.build@
#
Modified: hudson/branches/arquillian/scripts/jbossws-qa.sh
===================================================================
--- hudson/branches/arquillian/scripts/jbossws-qa.sh 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/scripts/jbossws-qa.sh 2014-12-15 18:13:02 UTC (rev 19147)
@@ -7,14 +7,6 @@
fi
}
-setupJBossHome() {
- rm -rf $WORKSPACE/jboss-as
- cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-as
- export JBOSS_HOME=$WORKSPACE/jboss-as
- echo "Overwriting default application-users.properties / application-roles.properties on AS..."
- cp $STACK_DIR/etc/application-*.properties $JBOSS_HOME/standalone/configuration
-}
-
setupEnv() {
TMP_DIR_PROPERTY=
if [ -d /data/tmp ]; then
@@ -25,114 +17,27 @@
echo "Cannot detect temporary directory";
exit -1;
fi
-
- ENVIRONMENT="$TMP_DIR_PROPERTY -Dmaven.opts=-U -Djboss.bind.address=$JBOSS_BIND_ADDRESS -Djbossws.integration.target=$JBOSS_TARGET -D$JBOSS_TARGET.home=$JBOSS_HOME"
-}
-
-stopJBoss() {
- $SCRIPTS_DIR/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS
-}
-
-startJBoss() {
- $SCRIPTS_DIR/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS
-}
-
-copyJBossLogs() {
- if [ -e $JBOSS_HOME/standalone/log/boot.log ]; then
- cp $JBOSS_HOME/standalone/log/boot.log $WORKSPACE/jboss-boot.log
+ if [ "$JBOSS_INSTANCE" != "" ]; then
+ rm -rf $WORKSPACE/jboss-as
+ cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-as
+ export JBOSS_HOME=$WORKSPACE/jboss-as
+ ENVIRONMENT="$TMP_DIR_PROPERTY -Dmaven.opts=-U -Dserver.home=$JBOSS_HOME"
+ else
+ ENVIRONMENT="$TMP_DIR_PROPERTY -Dmaven.opts=-U"
fi
- cp $JBOSS_HOME/standalone/log/server.log $WORKSPACE/jboss-server.log
}
-copyTestLogs() {
- cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
- cat $STACK_DIR/modules/dist/target/exclude-file/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
-}
-
-removeJBossLogs() {
- rm -f $JBOSS_HOME/standalone/log/boot.log
- rm -f $JBOSS_HOME/standalone/log/server.log
-}
-
-ensureRunningJBoss() {
- $SCRIPTS_DIR/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE
- if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_HOME/standalone/log/server.log
- stopJBoss
- copyJBossLogs
- exit 1
- fi
-# sleep 5
-}
-
logMavenDependencies() {
- mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
-}
-
-deployCoreDistributionWithSpring() {
cd $STACK_DIR
- mvn -Ptestsuite,dist,spring clean
- ant $ENVIRONMENT -Dspring=true deploy-$JBOSS_TARGET
-}
-
-deployCoreDistribution() {
- cd $STACK_DIR
mvn -Ptestsuite,dist clean
- ant $ENVIRONMENT deploy-$JBOSS_TARGET
+ mvn -P$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
}
-deployBinaryDistributionWithSpring() {
- cd $STACK_DIR
- mvn -Ptestsuite,dist clean
- ant $ENVIRONMENT build-bin-dist
- cd target
- rm -rf jbossws-$STACK_ID-bin-dist
- unzip jbossws-$STACK_ID-bin-dist.zip
- cd jbossws-$STACK_ID-bin-dist
- cp ant.properties.example ant.properties
- ant $ENVIRONMENT -Dspring=true deploy-$JBOSS_TARGET
+copyTestLogs() {
+ cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+ cat $STACK_DIR/modules/dist/target/exclude-file/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
}
-deployBinaryDistribution() {
- cd $STACK_DIR
- mvn -Ptestsuite,dist clean
- ant $ENVIRONMENT build-bin-dist
- cd target
- rm -rf jbossws-$STACK_ID-bin-dist
- unzip jbossws-$STACK_ID-bin-dist.zip
- cd jbossws-$STACK_ID-bin-dist
- cp ant.properties.example ant.properties
- ant $ENVIRONMENT deploy-$JBOSS_TARGET
-}
-
-redeployBinaryDistribution() {
- cd $STACK_DIR/target/jbossws-$STACK_ID-bin-dist
- ant clean
- ant $ENVIRONMENT deploy-$JBOSS_TARGET
-}
-
-deploySourceDistributionWithSpring() {
- cd $STACK_DIR
- mvn -Ptestsuite,dist,spring clean
- ant $ENVIRONMENT build-src-dist
- cd target
- rm -rf jbossws-$STACK_ID-src-dist
- unzip jbossws-$STACK_ID-src-dist.zip
- cd jbossws-$STACK_ID-src-dist
- ant $ENVIRONMENT -Dspring=true deploy-$JBOSS_TARGET
-}
-
-deploySourceDistribution() {
- cd $STACK_DIR
- mvn -Ptestsuite,dist clean
- ant $ENVIRONMENT build-src-dist
- cd target
- rm -rf jbossws-$STACK_ID-src-dist
- unzip jbossws-$STACK_ID-src-dist.zip
- cd jbossws-$STACK_ID-src-dist
- ant $ENVIRONMENT deploy-$JBOSS_TARGET
-}
-
detectFailures() {
#rm -rf $WORKSPACE/jboss-as
cat $WORKSPACE/tests.log | egrep "BUILD FAILURE|BUILD ERROR|java.lang.OutOfMemoryError" | tee $WORKSPACE/failure.log
@@ -143,123 +48,30 @@
}
runTestsViaMavenWithSpring() {
- mvn $ENVIRONMENT -Ptestsuite,hudson,spring,$JBOSS_TARGET $TEST_OPTS integration-test 2>&1 | tee $WORKSPACE/tests.log
+ mvn $ENVIRONMENT -Phudson,spring,$JBOSS_TARGET $TEST_OPTS integration-test 2>&1 | tee $WORKSPACE/tests.log
}
runTestsViaMaven() {
- mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET $TEST_OPTS integration-test 2>&1 | tee $WORKSPACE/tests.log
+ mvn $ENVIRONMENT -Phudson,$JBOSS_TARGET $TEST_OPTS integration-test 2>&1 | tee $WORKSPACE/tests.log
}
-runTestsViaAnt() {
- ant $ENVIRONMENT tests-clean tests $TEST_OPTS 2>&1 | tee $WORKSPACE/tests.log
-}
-
-addTestQueue() {
- if [ "$JBOSS_TARGET" != "jboss710" ] && [ "$JBOSS_TARGET" != "jboss711" ]; then
- sleep 10
- $JBOSS_HOME/bin/jboss-cli.sh -c command="/subsystem=messaging/hornetq-server=default/jms-queue=testQueue/:add(entries=[\"queue/test\",\"java:jboss/exported/jms/queue/test\"])"
- fi
-}
-
coreTestWithSpring() {
- setupJBossHome
setupEnv
ensureJavaExists
- stopJBoss
- deployCoreDistributionWithSpring
- removeJBossLogs
- startJBoss
- ensureRunningJBoss
- addTestQueue
+# addTestQueue TODO
logMavenDependencies
runTestsViaMavenWithSpring
copyTestLogs
- stopJBoss
- copyJBossLogs
detectFailures
}
coreTest() {
- setupJBossHome
setupEnv
ensureJavaExists
- stopJBoss
- deployCoreDistribution
- removeJBossLogs
- startJBoss
- ensureRunningJBoss
logMavenDependencies
runTestsViaMaven
copyTestLogs
- stopJBoss
- copyJBossLogs
detectFailures
}
-binaryDistributionTestWithSpring() {
- setupJBossHome
- setupEnv
- ensureJavaExists
- stopJBoss
- deployBinaryDistributionWithSpring
- removeJBossLogs
- startJBoss
- ensureRunningJBoss
- addTestQueue
- runTestsViaAnt
- copyTestLogs
- stopJBoss
- copyJBossLogs
- detectFailures
-}
-binaryDistributionTest() {
- setupJBossHome
- setupEnv
- ensureJavaExists
- stopJBoss
- deployBinaryDistribution
- removeJBossLogs
- startJBoss
- ensureRunningJBoss
- runTestsViaAnt
- copyTestLogs
- stopJBoss
- copyJBossLogs
- detectFailures
-}
-
-sourceDistributionTestWithSpring() {
- setupJBossHome
- setupEnv
- ensureJavaExists
- stopJBoss
- deploySourceDistributionWithSpring
- removeJBossLogs
- startJBoss
- ensureRunningJBoss
- addTestQueue
- logMavenDependencies
- runTestsViaMavenWithSpring
- copyTestLogs
- stopJBoss
- copyJBossLogs
- detectFailures
-}
-
-sourceDistributionTest() {
- setupJBossHome
- setupEnv
- ensureJavaExists
- stopJBoss
- deploySourceDistribution
- removeJBossLogs
- startJBoss
- ensureRunningJBoss
- logMavenDependencies
- runTestsViaMaven
- copyTestLogs
- stopJBoss
- copyJBossLogs
- detectFailures
-}
11 years
JBossWS SVN: r19145 - in hudson/branches/arquillian: hudson-home and 4 other directories.
by jbossws-commits@lists.jboss.org
Author: asoldano
Date: 2014-12-15 09:15:55 -0500 (Mon, 15 Dec 2014)
New Revision: 19145
Removed:
hudson/branches/arquillian/hudson-home/jobs/AS-8.0.0/
hudson/branches/arquillian/hudson-home/jobs/AS-8.1.0/
hudson/branches/arquillian/hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SPRING/
hudson/branches/arquillian/hudson-home/jobs/CXF-BINDIST-AS-8.0.0/
hudson/branches/arquillian/hudson-home/jobs/CXF-BINDIST-AS-8.1.0-SPRING/
hudson/branches/arquillian/hudson-home/jobs/CXF-BINDIST-AS-8.1.0/
hudson/branches/arquillian/hudson-home/jobs/CXF-BINDIST-AS-9.0.0-SPRING/
hudson/branches/arquillian/hudson-home/jobs/CXF-BINDIST-AS-9.0.0/
hudson/branches/arquillian/hudson-home/jobs/CXF-LIGHT/
hudson/branches/arquillian/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SPRING/
hudson/branches/arquillian/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0/
hudson/branches/arquillian/hudson-home/jobs/CXF-SRCDIST-AS-8.1.0-SPRING/
hudson/branches/arquillian/hudson-home/jobs/CXF-SRCDIST-AS-8.1.0/
hudson/branches/arquillian/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0-SPRING/
hudson/branches/arquillian/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0/
Modified:
hudson/branches/arquillian/ant.properties.example
hudson/branches/arquillian/hudson-home/config.xml
hudson/branches/arquillian/hudson-home/jobs/AS-ALL/config.xml
hudson/branches/arquillian/hudson-home/jobs/CXF-ALL/config.xml
hudson/branches/arquillian/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml
Log:
Removing useless jobs
Modified: hudson/branches/arquillian/ant.properties.example
===================================================================
--- hudson/branches/arquillian/ant.properties.example 2014-12-15 14:13:51 UTC (rev 19144)
+++ hudson/branches/arquillian/ant.properties.example 2014-12-15 14:15:55 UTC (rev 19145)
@@ -17,7 +17,7 @@
hudson.admin.port=8150
hudson.http.port=8180
-hudson.cxf.url=http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk
+hudson.cxf.url=http://anonsvn.jboss.org/repos/jbossws/stack/cxf/branches/arquillian
hudson.jboss800.url=https://github.com/wildfly/wildfly
hudson.jboss800.build=wildfly-8.0.0.Final
Modified: hudson/branches/arquillian/hudson-home/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/config.xml 2014-12-15 14:13:51 UTC (rev 19144)
+++ hudson/branches/arquillian/hudson-home/config.xml 2014-12-15 14:15:55 UTC (rev 19145)
@@ -54,9 +54,7 @@
<no-comparator/>
<string>AS-ALL</string>
<string>AS-LIGHT</string>
- <string>AS-8.0.0</string>
<string>AS-8.0.0-SECMGR</string>
- <string>AS-8.1.0</string>
<string>AS-8.1.0-SECMGR</string>
<string>AS-9.0.0</string>
<string>AS-9.0.0-SECMGR</string>
@@ -75,7 +73,6 @@
<jobNames class="tree-set">
<no-comparator/>
<string>CXF-ALL</string>
- <string>CXF-LIGHT</string>
<string>CXF-CORE-AS-8.0.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.0.0-SECMGR</string>
<string>CXF-CORE-AS-8.1.0-SUN-JDK-6</string>
@@ -85,18 +82,6 @@
<string>CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.1.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-9.0.0-SPRING-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-8.0.0-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-8.1.0-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-9.0.0-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-8.1.0-SPRING-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-9.0.0-SPRING-SUN-JDK-6</string>
- <string>CXF-SRCDIST-AS-8.0.0-SUN-JDK-6</string>
- <string>CXF-SRCDIST-AS-8.1.0-SUN-JDK-6</string>
- <string>CXF-SRCDIST-AS-9.0.0-SUN-JDK-6</string>
- <string>CXF-SRCDIST-AS-8.0.0-SPRING-SUN-JDK-6</string>
- <string>CXF-SRCDIST-AS-8.1.0-SPRING-SUN-JDK-6</string>
- <string>CXF-SRCDIST-AS-9.0.0-SPRING-SUN-JDK-6</string>
</jobNames>
<name>CXF Tests</name>
<description>
@@ -108,37 +93,5 @@
</description>
</view>
- <!-- Working days tests-->
- <view>
- <owner reference="../../.."/>
- <jobNames class="tree-set">
- <no-comparator/>
- <string>CXF-LIGHT</string>
- <string>CXF-CORE-AS-8.0.0-SUN-JDK-6</string>
- <string>CXF-CORE-AS-8.0.0-SECMGR</string>
- <string>CXF-CORE-AS-8.1.0-SUN-JDK-6</string>
- <string>CXF-CORE-AS-9.0.0-SECMGR</string>
- <string>CXF-CORE-AS-9.0.0-SUN-JDK-6</string>
- <string>CXF-CORE-AS-8.1.0-SECMGR</string>
- <string>CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6</string>
- <string>CXF-CORE-AS-8.1.0-SPRING-SUN-JDK-6</string>
- <string>CXF-CORE-AS-9.0.0-SPRING-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-8.0.0-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-8.1.0-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-9.0.0-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-8.1.0-SPRING-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-9.0.0-SPRING-SUN-JDK-6</string>
- </jobNames>
- <name>Working Days Tests</name>
- <description>
- <![CDATA[
- Run the working days tests; these include Core and Distro tests for all stacks.
- <p/>
- Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a>
-]]>
- </description>
- </view>
-
</views>
</hudson>
Modified: hudson/branches/arquillian/hudson-home/jobs/AS-ALL/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/AS-ALL/config.xml 2014-12-15 14:13:51 UTC (rev 19144)
+++ hudson/branches/arquillian/hudson-home/jobs/AS-ALL/config.xml 2014-12-15 14:15:55 UTC (rev 19145)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-8.0.0, AS-8.1.0, AS-9.0.0, AS-8.0.0-SECMGR, AS-8.1.0-SECMGR, AS-9.0.0-SECMGR</childProjects>
+ <childProjects>AS-9.0.0, AS-8.0.0-SECMGR, AS-8.1.0-SECMGR, AS-9.0.0-SECMGR</childProjects>
<threshold>
<name>UNSTABLE</name>
<ordinal>1</ordinal>
Modified: hudson/branches/arquillian/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/CXF-ALL/config.xml 2014-12-15 14:13:51 UTC (rev 19144)
+++ hudson/branches/arquillian/hudson-home/jobs/CXF-ALL/config.xml 2014-12-15 14:15:55 UTC (rev 19145)
@@ -21,30 +21,6 @@
, CXF-CORE-AS-8.1.0-SECMGR
, CXF-CORE-AS-9.0.0-SECMGR
-
-, CXF-BINDIST-AS-8.0.0
-
-, CXF-BINDIST-AS-8.1.0
-
-, CXF-BINDIST-AS-9.0.0
-
-, CXF-BINDIST-AS-8.0.0-SPRING
-
-, CXF-BINDIST-AS-8.1.0-SPRING
-
-, CXF-BINDIST-AS-9.0.0-SPRING
-
-, CXF-SRCDIST-AS-8.0.0
-
-, CXF-SRCDIST-AS-8.1.0
-
-, CXF-SRCDIST-AS-9.0.0
-
-, CXF-SRCDIST-AS-8.0.0-SPRING
-
-, CXF-SRCDIST-AS-8.1.0-SPRING
-
-, CXF-SRCDIST-AS-9.0.0-SPRING
</childProjects>
<threshold>
<name>UNSTABLE</name>
Modified: hudson/branches/arquillian/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml 2014-12-15 14:13:51 UTC (rev 19144)
+++ hudson/branches/arquillian/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml 2014-12-15 14:15:55 UTC (rev 19145)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-LIGHT, CXF-LIGHT</childProjects>
+ <childProjects>AS-LIGHT, CXF-ALL</childProjects>
<threshold>
<name>UNSTABLE</name>
<ordinal>1</ordinal>
11 years