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>