JBossWS SVN: r15111 - in stack/cxf/trunk/modules: testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-17 06:05:09 -0400 (Mon, 17 Oct 2011)
New Revision: 15111
Removed:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java
Modified:
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
Log:
[JBWS-3205] getting rid of org.jboss.ws.common.logging package
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2011-10-17 09:25:32 UTC (rev 15110)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2011-10-17 10:05:09 UTC (rev 15111)
@@ -10,15 +10,6 @@
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
</bean>
- <!-- Logging redirector -->
- <bean name="JDKLogRedirector" class="org.jboss.ws.common.logging.JDKLogRedirector">
- <property name="namespaces">
- <list class="java.util.LinkedList" elementClass="java.lang.String">
- <value>org.apache.cxf</value>
- </list>
- </property>
- </bean>
-
<!-- This should actually be in the stack-agnostic config file, it's here to avoid installing a CI -->
<bean name="WSDescriptorParser" class="org.jboss.ws.common.deployment.WebservicesDescriptorParserImpl">
<property name="descriptorName">webservices.xml</property>
Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java 2011-10-17 09:25:32 UTC (rev 15110)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java 2011-10-17 10:05:09 UTC (rev 15111)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.cxf.logging;
-
-import java.util.logging.Handler;
-import java.util.logging.Logger;
-
-import org.jboss.ws.common.logging.JDKLogHandler;
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- * Test redirection of JDK logging on the client side
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 18-Dec-2007
- */
-public class JDKLoggingTestCase extends JBossWSTest
-{
- public void testLogging() throws Exception
- {
- Logger log = Logger.getLogger(JDKLoggingTestCase.class.getName());
- assertHandlers(log);
-
- log = Logger.getLogger(JDKLoggingTestCase.class.getName());
- assertHandlers(log);
-
- log.info("test message");
- }
-
- private void assertHandlers(Logger log)
- {
- int found = 0;
- for (Handler handler : log.getHandlers())
- {
- if (handler instanceof JDKLogHandler)
- found++;
- }
- assertEquals("Expected one jboss handler", 1, found);
- }
-}
12 years, 7 months
JBossWS SVN: r15110 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-17 05:25:32 -0400 (Mon, 17 Oct 2011)
New Revision: 15110
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-17 09:17:19 UTC (rev 15109)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-17 09:25:32 UTC (rev 15110)
@@ -1296,9 +1296,12 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
- <!-- # [JBWS-3232][JBMETA-339] waiting for jboss metadata beta14 release -->
+ <!-- # [JBWS-3232][JBMETA-339] waiting for jboss metadata Beta14 release -->
<exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
+ <!-- # [JBWS-3227][MODULES-109] waiting for jboss modules 1.0.3.GA release -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude>
+
<!-- TODO: EJB3 DD driven deployments -->
<exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
@@ -1328,9 +1331,6 @@
<!-- # [JBWS-3205] JDKLogManager not used -->
<exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase*</exclude>
- <!-- # [JBWS-3227] handlers config file not found on classpath -->
- <exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude>
-
<!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude>
12 years, 7 months
JBossWS SVN: r15109 - hudson/trunk/scripts.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-17 05:17:19 -0400 (Mon, 17 Oct 2011)
New Revision: 15109
Modified:
hudson/trunk/scripts/jboss.sh
Log:
remove preview config - we're part of standart config now
Modified: hudson/trunk/scripts/jboss.sh
===================================================================
--- hudson/trunk/scripts/jboss.sh 2011-10-14 13:00:30 UTC (rev 15108)
+++ hudson/trunk/scripts/jboss.sh 2011-10-17 09:17:19 UTC (rev 15109)
@@ -12,7 +12,7 @@
if [ -f "$JBOSS_HOME/bin/run.sh" ]; then
RUN_CMD="$DIRNAME/runjboss.sh -b $BINDADDR"
else
- RUN_CMD="$JBOSS_HOME/bin/standalone.sh -server-config standalone-preview.xml"
+ RUN_CMD="$JBOSS_HOME/bin/standalone.sh"
export LAUNCH_JBOSS_IN_BACKGROUND="true"
export JBOSS_PIDFILE=$PIDFILE
fi
12 years, 7 months
JBossWS SVN: r15108 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-14 09:00:30 -0400 (Fri, 14 Oct 2011)
New Revision: 15108
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-14 12:58:24 UTC (rev 15107)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-14 13:00:30 UTC (rev 15108)
@@ -1296,6 +1296,9 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
+ <!-- # [JBWS-3232][JBMETA-339] waiting for jboss metadata beta14 release -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
+
<!-- TODO: EJB3 DD driven deployments -->
<exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
@@ -1307,9 +1310,6 @@
<!-- TODO: will we support wars bundled in jars on AS7? -->
<exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
- <!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' -->
- <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
-
<!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher -->
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
12 years, 7 months
JBossWS SVN: r15107 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-14 08:58:24 -0400 (Fri, 14 Oct 2011)
New Revision: 15107
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-10-14 12:36:18 UTC (rev 15106)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-10-14 12:58:24 UTC (rev 15107)
@@ -1016,6 +1016,9 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
+ <!-- # [JBWS-3232][JBMETA-339] waiting for metadata beta14 release -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
+
<!-- # [JBWS-3308] Extends AS7 RemoteDeployer for supporting deployment of different security domains -->
<exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
@@ -1033,9 +1036,6 @@
<!-- TODO: will we support wars bundled in jars on AS7? -->
<exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
- <!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' -->
- <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
-
<!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher -->
<exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
@@ -1157,7 +1157,7 @@
<exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude>
-
+
<!-- # webservices-description in jboss-web.xml / jboss.xml -->
<exclude>org/jboss/test/ws/jaxrpc/samples/jsr109pojo/**</exclude>
<exclude>org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**</exclude>
@@ -1170,15 +1170,15 @@
<exclude>org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase*</exclude>
<exclude>org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase*</exclude>
-
+
<!-- # unpackaged EAR deployment failure -->
<exclude>org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase*</exclude>
-
+
<!-- # javaType [javax.xml.transform.Source] is not assignable from attachment content: java.lang.String -->
<exclude>org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase*</exclude>
-
+
</excludes>
</configuration>
</plugin>
12 years, 7 months
JBossWS SVN: r15106 - shared-testsuite/trunk/testsuite/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-14 08:36:18 -0400 (Fri, 14 Oct 2011)
New Revision: 15106
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
Log:
fixing test case - include all necessary sources so AS7 WS deployer don't complain
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-10-14 10:28:23 UTC (rev 15105)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-10-14 12:36:18 UTC (rev 15106)
@@ -1033,7 +1033,7 @@
<war warfile="${tests.output.dir}/test-libs/jbws3140-server.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3140/WEB-INF-Server/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws3140/*.class" />
- <include name="org/jboss/test/ws/jaxws/jbws3140/server*.xml" />
+ <include name="org/jboss/test/ws/jaxws/jbws3140/*.xml" />
<exclude name="org/jboss/test/ws/jaxws/jbws3140/*EndpointService.class" />
<exclude name="org/jboss/test/ws/jaxws/jbws3140/*TestCase.class" />
<exclude name="org/jboss/test/ws/jaxws/jbws3140/*TestClient.class" />
@@ -1045,7 +1045,7 @@
<war warfile="${tests.output.dir}/test-libs/jbws3140-responses-server.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3140/WEB-INF-Server/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws3140/*.class" />
- <include name="org/jboss/test/ws/jaxws/jbws3140/server*.xml" />
+ <include name="org/jboss/test/ws/jaxws/jbws3140/*.xml" />
<exclude name="org/jboss/test/ws/jaxws/jbws3140/*TestCase.class" />
<exclude name="org/jboss/test/ws/jaxws/jbws3140/*TestClient.class" />
</classes>
@@ -1059,7 +1059,7 @@
<war warfile="${tests.output.dir}/test-libs/jbws3140-client.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3140/WEB-INF-Client/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws3140/*.class" />
- <include name="org/jboss/test/ws/jaxws/jbws3140/client*.xml" />
+ <include name="org/jboss/test/ws/jaxws/jbws3140/*.xml" />
<exclude name="org/jboss/test/ws/jaxws/jbws3140/*TestCase.class" />
</classes>
<classes dir="${tests.output.dir}/test-resources/jaxws/jbws3140">
12 years, 7 months
JBossWS SVN: r15105 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes.
by jbossws-commits＠lists.jboss.org
Author: rsvoboda(a)redhat.com
Date: 2011-10-14 06:28:23 -0400 (Fri, 14 Oct 2011)
New Revision: 15105
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJOWrappedDocImpl.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJOWrappedRPCImpl.java
Log:
JBWS-3368: POJO endpoinds contained @Stateless annotation
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJOWrappedDocImpl.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJOWrappedDocImpl.java 2011-10-14 09:44:53 UTC (rev 15104)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJOWrappedDocImpl.java 2011-10-14 10:28:23 UTC (rev 15105)
@@ -28,7 +28,6 @@
import java.util.Date;
import java.util.List;
-import javax.ejb.Stateless;
import javax.jws.WebService;
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
@@ -43,7 +42,6 @@
* @since 09-Mar-2010
*/
@WebService(serviceName = "EndpointWrappedDocService", portName = "EndpointWrappedDocPort", endpointInterface = "org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedDoc")
-@Stateless
public class EndpointPOJOWrappedDocImpl implements EndpointDoc
{
private static Duration dayDuration;
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJOWrappedRPCImpl.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJOWrappedRPCImpl.java 2011-10-14 09:44:53 UTC (rev 15104)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes/EndpointPOJOWrappedRPCImpl.java 2011-10-14 10:28:23 UTC (rev 15105)
@@ -28,7 +28,6 @@
import java.util.Date;
import java.util.List;
-import javax.ejb.Stateless;
import javax.jws.WebService;
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
@@ -43,7 +42,6 @@
* @since 09-Mar-2010
*/
@WebService(serviceName = "EndpointWrappedRPCService", portName = "EndpointWrappedRPCPort", endpointInterface = "org.jboss.test.ws.jaxws.benchmark.test.datatypes.EndpointWrappedRPC")
-@Stateless
public class EndpointPOJOWrappedRPCImpl implements EndpointRPC
{
private static Duration dayDuration;
12 years, 7 months
JBossWS SVN: r15104 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-14 05:44:53 -0400 (Fri, 14 Oct 2011)
New Revision: 15104
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanJSE.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEndpoint.java
Log:
fixing test case - it was failing on CXF integration
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanJSE.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanJSE.java 2011-10-14 08:55:47 UTC (rev 15103)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryBeanJSE.java 2011-10-14 09:44:53 UTC (rev 15104)
@@ -28,7 +28,7 @@
import org.jboss.logging.Logger;
-@WebService(serviceName = "EnvEntryService", targetNamespace = "http://org.jboss.ws/enventry")
+@WebService(serviceName = "EnvEntryService", portName="EnvEntryPort", targetNamespace = "http://org.jboss.ws/enventry")
@SOAPBinding(style = SOAPBinding.Style.RPC)
public class EnvEntryBeanJSE
{
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEndpoint.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEndpoint.java 2011-10-14 08:55:47 UTC (rev 15103)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryEndpoint.java 2011-10-14 09:44:53 UTC (rev 15104)
@@ -26,7 +26,7 @@
import javax.jws.soap.SOAPBinding;
-@WebService(serviceName="EnvEntryService", targetNamespace = "http://org.jboss.ws/enventry")
+@WebService(serviceName="EnvEntryService", portName="EnvEntryPort", targetNamespace = "http://org.jboss.ws/enventry")
@SOAPBinding(style = SOAPBinding.Style.RPC)
public interface EnvEntryEndpoint
{
12 years, 7 months
JBossWS SVN: r15103 - in stack/cxf/trunk/modules: dist/management/src/main and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-14 04:55:47 -0400 (Fri, 14 Oct 2011)
New Revision: 15103
Removed:
stack/cxf/trunk/modules/dist/management/src/main/pclwebapp/
Modified:
stack/cxf/trunk/modules/dist/management/pom.xml
stack/cxf/trunk/modules/dist/management/src/main/webapp/WEB-INF/web.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3225] resuscitating JBossWS console for CXF integration - it is possible because since now JBossWS Native is present on AS7 and we're able to reference it's PortLinkServlet
Modified: stack/cxf/trunk/modules/dist/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/management/pom.xml 2011-10-14 08:11:53 UTC (rev 15102)
+++ stack/cxf/trunk/modules/dist/management/pom.xml 2011-10-14 08:55:47 UTC (rev 15103)
@@ -55,45 +55,20 @@
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
- <executions>
- <execution>
- <id>console</id>
- <phase>package</phase>
- <goals>
- <goal>war</goal>
- </goals>
- <configuration>
- <warName>jbossws-cxf-management</warName>
- <warSourceDirectory>${basedir}/src/main/webapp</warSourceDirectory>
- <webappDirectory>${project.build.directory}/jbossws-cxf-management</webappDirectory>
- <webResources>
- <webResource>
- <directory>${basedir}/src/main/webapp</directory>
- <filtering>true</filtering>
- </webResource>
- </webResources>
- </configuration>
- </execution>
- <execution>
- <id>pcl</id>
- <phase>package</phase>
- <goals>
- <goal>war</goal>
- </goals>
- <configuration>
- <warName>jbossws-cxf-management-pcl</warName>
- <warSourceDirectory>${basedir}/src/main/pclwebapp</warSourceDirectory>
- <webappDirectory>${project.build.directory}/jbossws-cxf-management-pcl</webappDirectory>
- <webResources>
- <webResource>
- <directory>${basedir}/src/main/pclwebapp</directory>
- <filtering>true</filtering>
- </webResource>
- </webResources>
- </configuration>
- </execution>
- </executions>
+ <configuration>
+ <warName>jbossws-cxf-management</warName>
+ <webResources>
+ <resource>
+ <directory>src/main/webapp</directory>
+ <filtering>true</filtering>
+ </resource>
+ </webResources>
+ <archive>
+ <manifestEntries>
+ <Dependencies>org.jboss.as.webservices services,org.jboss.ws.native.jbossws-native-core services,org.jboss.ws.common</Dependencies>
+ </manifestEntries>
+ </archive>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: stack/cxf/trunk/modules/dist/management/src/main/webapp/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/dist/management/src/main/webapp/WEB-INF/web.xml 2011-10-14 08:11:53 UTC (rev 15102)
+++ stack/cxf/trunk/modules/dist/management/src/main/webapp/WEB-INF/web.xml 2011-10-14 08:55:47 UTC (rev 15103)
@@ -15,6 +15,11 @@
<servlet-class>org.jboss.ws.common.management.ContextServlet</servlet-class>
</servlet>
+ <servlet>
+ <servlet-name>PortComponentLinkServlet</servlet-name>
+ <servlet-class>org.jboss.ws.core.server.PortComponentLinkServlet</servlet-class>
+ </servlet>
+
<!-- now the mappings -->
<servlet-mapping>
@@ -22,6 +27,11 @@
<url-pattern>/services/*</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>PortComponentLinkServlet</servlet-name>
+ <url-pattern>/pclink</url-pattern>
+ </servlet-mapping>
+
<!-- A security constraint that restricts access
<security-constraint>
<web-resource-collection>
@@ -45,7 +55,7 @@
<security-role>
<role-name>friend</role-name>
</security-role>
-
+
<!--
currently the W3C haven't settled on a media type for WSDL;
http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-10-14 08:11:53 UTC (rev 15102)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-10-14 08:55:47 UTC (rev 15103)
@@ -455,6 +455,8 @@
<fail message="installserver must be specified" unless="installserver"/>
<fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
<macro-deploy-jbossws-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deployment targetdir="${installserver}/standalone/deployments/jbossws-console.war" thirdpartydir="${thirdpartydir}"/>
+ <touch file="${installserver}/standalone/deployments/jbossws-console.war.dodeploy"/>
</target>
<!-- ================================================================== -->
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-14 08:11:53 UTC (rev 15102)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-14 08:55:47 UTC (rev 15103)
@@ -1328,9 +1328,6 @@
<!-- # [JBWS-3205] JDKLogManager not used -->
<exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase*</exclude>
- <!-- # [JBWS-3225] jbossws console not yet available -->
- <exclude>org/jboss/test/ws/console/**</exclude>
-
<!-- # [JBWS-3227] handlers config file not found on classpath -->
<exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude>
12 years, 7 months