JBossWS SVN: r6394 - in stack/cxf/branches/tdiesler/trunk: context and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-12 17:49:15 -0400 (Sat, 12 Apr 2008)
New Revision: 6394
Added:
stack/cxf/branches/tdiesler/trunk/context/
stack/cxf/branches/tdiesler/trunk/context/pom.xml
stack/cxf/branches/tdiesler/trunk/context/src/
stack/cxf/branches/tdiesler/trunk/context/src/main/
stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/
stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/WEB-INF/
stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/WEB-INF/jboss-web.xml
stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/WEB-INF/web.xml
stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/index.html
stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/styles.css
Removed:
stack/cxf/branches/tdiesler/trunk/src/main/resources/jbossws-context.war/
Modified:
stack/cxf/branches/tdiesler/trunk/build.xml
stack/cxf/branches/tdiesler/trunk/pom.xml
Log:
Separate module for context
Modified: stack/cxf/branches/tdiesler/trunk/build.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-12 21:24:21 UTC (rev 6393)
+++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-12 21:49:15 UTC (rev 6394)
@@ -118,26 +118,6 @@
<arg value="package"/>
</exec>
- <!-- Build jbossws-context.war -->
- <copy todir="${cxf.output.resources.dir}/jbossws-context.war" overwrite="true" filtering="true">
- <fileset dir="${cxf.resources.dir}/jbossws-context.war"/>
- <filterset>
- <filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="${cxf.dir}/version.properties"/>
- </filterset>
- </copy>
- <war warfile="${cxf.output.lib.dir}/jbossws-context.war" webxml="${cxf.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml"
- manifest="${cxf.output.etc.dir}/default.mf">
- <fileset dir="${cxf.output.resources.dir}/jbossws-context.war">
- <include name="index.html"/>
- <include name="styles.css"/>
- </fileset>
- <webinf dir="${cxf.output.resources.dir}/jbossws-context.war/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
</target>
<!-- ================================================================== -->
Property changes on: stack/cxf/branches/tdiesler/trunk/context
___________________________________________________________________
Name: svn:ignore
+ target
Added: stack/cxf/branches/tdiesler/trunk/context/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/context/pom.xml (rev 0)
+++ stack/cxf/branches/tdiesler/trunk/context/pom.xml 2008-04-12 21:49:15 UTC (rev 6394)
@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-cxf-context</artifactId>
+ <packaging>war</packaging>
+ <version>3.0.2-SNAPSHOT</version>
+ <name>JBoss Web Services - Stack CXF</name>
+ <organization>
+ <name>JBoss, a division of Red Hat</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <url>http://maven.apache.org</url>
+
+</project>
Property changes on: stack/cxf/branches/tdiesler/trunk/context/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/WEB-INF/jboss-web.xml (rev 0)
+++ stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/WEB-INF/jboss-web.xml 2008-04-12 21:49:15 UTC (rev 6394)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE jboss-web
+ PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd">
+
+<jboss-web>
+
+ <!--
+ <security-domain>java:/jaas/jbossws</security-domain>
+ -->
+ <context-root>jbossws</context-root>
+
+</jboss-web>
Property changes on: stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/WEB-INF/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/WEB-INF/web.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/WEB-INF/web.xml 2008-04-12 21:49:15 UTC (rev 6394)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ A web application that installs the JBossWS servlets
+
+ $Id$
+-->
+
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <display-name>JBossWS</display-name>
+
+ <servlet>
+ <servlet-name>ContextServlet</servlet-name>
+ <servlet-class>org.jboss.wsf.framework.management.ContextServlet</servlet-class>
+ </servlet>
+
+ <!-- now the mappings -->
+
+ <servlet-mapping>
+ <servlet-name>ContextServlet</servlet-name>
+ <url-pattern>/services/*</url-pattern>
+ </servlet-mapping>
+
+ <!--
+ currently the W3C haven't settled on a media type for WSDL;
+ http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
+ for now we go with the basic 'it's XML' response
+ -->
+ <mime-mapping>
+ <extension>wsdl</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+ <mime-mapping>
+ <extension>xsd</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+ <welcome-file-list id="WelcomeFileList">
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+
+</web-app>
Property changes on: stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/index.html
===================================================================
--- stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/index.html (rev 0)
+++ stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/index.html 2008-04-12 21:49:15 UTC (rev 6394)
@@ -0,0 +1,66 @@
+<html><head>
+<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'>
+<title>JBossWS (@implementation.version@)</title>
+<link rel='stylesheet' href='./styles.css'>
+</head>
+<body>
+
+<div class='pageHeader'>JBossWS</div>
+
+<div class="pageSection">
+<h2>Welcome to JBoss Web Services</h2>
+JBossWS is a JAX-WS compliant web service stack developed to be part of JBoss' JavaEE5 offering.
+</div>
+
+<div class="pageSection">
+<h3>Administration</h3>
+
+<fieldset>
+ <legend><b>Runtime information</b></legend>
+<ul>
+ <li><b>Revision: @implementation.version@</b></li>
+ <li><b>Build: @build.id@</b></li>
+ <li><a href="services">View a list of deployed services</a></li>
+ <!--li><a href="depends">View installed dependencies</a></li-->
+ <li><a href="/jmx-console/">Access JMX console</a></li>
+</ul>
+</fieldset>
+</div>
+
+<div class="pageSection">
+<h3>Project information</h3>
+
+<fieldset>
+ <legend><b>Documentation</b></legend>
+
+<ul>
+ <li><a href="http://labs.jboss.com/portal/jbossws/downloads">Latest download and samples</a></li>
+ <li><a href="http://jbws.dyndns.org/mediawiki/index.php/JBossWS_FAQs">FAQ</a></li>
+ <li><a href="http://jbws.dyndns.org/mediawiki/index.php/JAX-WS_User_Guide">User guide</a></li>
+ <li><a href="http://jbws.dyndns.org/mediawiki/index.php/Main_Page">JBossWS WIKI</a></li>
+ <li><a href="http://jbws.dyndns.org/mediawiki/index.php?title=Records_management">Records management</a></li>
+</ul>
+</fieldset>
+
+</br>
+<fieldset>
+ <legend><b>Community</b></legend>
+<ul>
+ <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=276">User forum</a></li>
+ <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=174">Design forum</a></li>
+ <li><a href="https://lists.jboss.org/mailman/listinfo/jbossws-users">Mailing list</a></li>
+</ul>
+</fieldset>
+
+</br>
+<fieldset>
+ <legend><b>Source repository</b></legend>
+<ul>
+ <li><a href="http://jbws.dyndns.org/mediawiki/index.php?title=Subversion">Subversion repository</a></li>
+ <li><a href="http://fisheye.jboss.com/viewrep/JBossWS">Browse sources online</a></li>
+</ul>
+</fieldset>
+</div>
+
+</body>
+</html>
Added: stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/styles.css
===================================================================
--- stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/styles.css (rev 0)
+++ stack/cxf/branches/tdiesler/trunk/context/src/main/webapp/styles.css 2008-04-12 21:49:15 UTC (rev 6394)
@@ -0,0 +1,186 @@
+
+/* table for list views */
+.table_list {
+}
+
+/* table for detail views */
+.table_form {
+}
+
+.pageHeader {
+ font-size: 14pt;
+ font-weight: BOLD;
+ color: #ffffff;
+ border-bottom-width:1px;
+ border-bottom-style:solid;
+ border-color:#000066;
+ margin-bottom:15px;
+ padding-left:15px;
+ padding-top:5px;
+ padding-bottom:5px;
+ background-color: #3b4f66;
+ max-width: 900px;
+}
+
+.pageSection {
+ padding-left:15px;
+ margin-bottom: 5px;
+ max-width: 900px;
+}
+
+.metrics
+{
+ font-size: 6pt;
+ background-color: #dddddd;
+ width: 100%;
+}
+
+/* table row header */
+.list_tr_head {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ font-weight: 600;
+ text-align: center;
+ background-color: #3b4f66;
+}
+
+/* table row list view */
+.list_tr {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #ffffff;
+}
+
+/* table row list view odd lines */
+.list_tr_even {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #ffffff;
+}
+
+/* table row list view even lines */
+.list_tr_odd {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #dddddd;
+}
+
+/* form label */
+.form_label {
+ font-family: Verdana, sans-serif;
+ font-weight: 500;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #dddddd;
+ padding-top: 2px;
+ padding-bottom: 2px;
+}
+
+/* form value */
+.form_value {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: baseline;
+}
+
+/* tiny writing */
+.tiny {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #666666;
+}
+
+/* required input fields */
+.inputmust {
+ background-color: #dddddd;
+}
+
+/* error message */
+.error {
+ font-family: Courier New;
+ color: #990000;
+}
+
+/* error message */
+.error_trace {
+ font-family: Courier New;
+}
+
+/* active tree node */
+.tree_active_label {
+ font-weight: bold;
+}
+
+body {
+ font-family: Verdana,, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ background-color: #ffffff;
+}
+
+/* title style */
+h1 {
+ font-family: Verdana, sans-serif;
+ font-size: 14pt;
+ font-weight: 600;
+ color: #000066;
+}
+
+h2 {
+ font-family: Verdana, sans-serif;
+ font-size: 12pt;
+ font-weight: 600;
+ color: #000066;
+}
+
+h3 {
+ font-family: Verdana, sans-serif;
+ font-size: 10pt;
+ font-weight: 600;
+ color: #000066;
+}
+
+h4 {
+ font-family: Verdana, sans-serif;
+ font-size: 10pt;
+ font-weight: 500;
+ color: #000066;
+}
+
+/* table desk */
+td {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+input, textarea, select, option {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+}
+
+a {
+ font-family: Verdana, sans-serif;
+ color: #3b4f66;
+ text-decoration: none;
+}
+
+a:hover{
+ font-family: Verdana, sans-serif;
+ color: #cc0000;
+ text-decoration: none;
+}
+
+pre {
+ background:#dddddd
+}
\ No newline at end of file
Modified: stack/cxf/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-12 21:24:21 UTC (rev 6393)
+++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-12 21:49:15 UTC (rev 6394)
@@ -128,5 +128,10 @@
<enabled>false</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/1/</url>
+ <layout>legacy</layout>
+ </repository>
</repositories>
</project>
16 years, 9 months
JBossWS SVN: r6393 - framework/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-12 17:24:21 -0400 (Sat, 12 Apr 2008)
New Revision: 6393
Modified:
framework/trunk/
framework/trunk/pom.xml
Log:
Fix dependency on jsr250
Property changes on: framework/trunk
___________________________________________________________________
Name: svn:ignore
- output*
thirdparty
version.properties.md5
ant.properties
target
+ ant.properties
target
Modified: framework/trunk/pom.xml
===================================================================
--- framework/trunk/pom.xml 2008-04-12 21:08:30 UTC (rev 6392)
+++ framework/trunk/pom.xml 2008-04-12 21:24:21 UTC (rev 6393)
@@ -21,6 +21,11 @@
<!-- Dependencies -->
<dependencies>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
<groupId>javax.xml</groupId>
<artifactId>jaxrpc-api</artifactId>
<version>1.1</version>
16 years, 9 months
JBossWS SVN: r6392 - in spi/trunk: src/main/java/org/jboss/wsf/spi/invocation and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-12 17:08:30 -0400 (Sat, 12 Apr 2008)
New Revision: 6392
Modified:
spi/trunk/
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/ExtensibleWebServiceContext.java
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java
Log:
Implement jaxws-api-2.1
Property changes on: spi/trunk
___________________________________________________________________
Name: svn:ignore
- ant.properties
version.properties.md5
output*
thirdparty
target
+ ant.properties
target
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/ExtensibleWebServiceContext.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/ExtensibleWebServiceContext.java 2008-04-12 15:36:24 UTC (rev 6391)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/ExtensibleWebServiceContext.java 2008-04-12 21:08:30 UTC (rev 6392)
@@ -25,10 +25,10 @@
import javax.xml.ws.EndpointReference;
import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.WebServiceException;
import javax.xml.ws.handler.MessageContext;
import org.jboss.wsf.spi.deployment.AbstractExtensible;
-import org.w3c.dom.Element;
/**
* A WebServiceContext makes it possible for a web service endpoint implementation
@@ -57,13 +57,13 @@
public abstract boolean isUserInRole(String role);
- public EndpointReference getEndpointReference(Element... referenceParameters)
+ public EndpointReference getEndpointReference()
{
- throw new IllegalArgumentException("Not implemented");
+ throw new WebServiceException("Not implemented");
}
- public <T extends EndpointReference> T getEndpointReference(Class<T> clazz, Element... referenceParameters)
+ public <T extends EndpointReference> T getEndpointReference(Class<T> arg0)
{
- throw new IllegalArgumentException("Not implemented");
+ throw new WebServiceException("Not implemented");
}
}
\ No newline at end of file
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java 2008-04-12 15:36:24 UTC (rev 6391)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java 2008-04-12 21:08:30 UTC (rev 6392)
@@ -23,8 +23,6 @@
// $Id$
-import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext;
-
import java.security.Principal;
import javax.servlet.http.HttpServletRequest;
16 years, 9 months
JBossWS SVN: r6391 - in stack/cxf/branches/tdiesler/trunk: ant-import and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-12 11:36:24 -0400 (Sat, 12 Apr 2008)
New Revision: 6391
Added:
stack/cxf/branches/tdiesler/trunk/pom.xml
Removed:
stack/cxf/branches/tdiesler/trunk/src/main/etc/component-info50.xml
Modified:
stack/cxf/branches/tdiesler/trunk/
stack/cxf/branches/tdiesler/trunk/.classpath
stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml
stack/cxf/branches/tdiesler/trunk/ant-import/build-bin-dist.xml
stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml
stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml
stack/cxf/branches/tdiesler/trunk/build.xml
stack/cxf/branches/tdiesler/trunk/src/main/etc/default.mf
stack/cxf/branches/tdiesler/trunk/version.properties
Log:
Switch to maven build
Property changes on: stack/cxf/branches/tdiesler/trunk
___________________________________________________________________
Name: svn:ignore
- ant.properties
apache-cxf
output*
thirdparty
version.properties.md5
clipboard.*
+ ant.properties
apache-cxf
version.properties.md5
clipboard.*
target
thirdparty
Modified: stack/cxf/branches/tdiesler/trunk/.classpath
===================================================================
--- stack/cxf/branches/tdiesler/trunk/.classpath 2008-04-12 12:43:28 UTC (rev 6390)
+++ stack/cxf/branches/tdiesler/trunk/.classpath 2008-04-12 15:36:24 UTC (rev 6391)
@@ -4,38 +4,11 @@
<classpathentry kind="src" path="src/test-framework/java"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/>
- <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
- <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-common-core-sources.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossws-framework.jar" sourcepath="thirdparty/jbossws-framework-src.zip"/>
- <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar" sourcepath="thirdparty/jbossws-spi-src.zip"/>
- <classpathentry kind="lib" path="thirdparty/jdom-1.0.jar"/>
- <classpathentry kind="lib" path="thirdparty/neethi-2.0.2.jar"/>
- <classpathentry kind="lib" path="thirdparty/resolver.jar"/>
- <classpathentry kind="lib" path="thirdparty/saaj-api-1.3.jar" sourcepath="apache-cxf"/>
- <classpathentry kind="lib" path="thirdparty/saaj-impl-1.3.jar"/>
- <classpathentry kind="lib" path="thirdparty/wsdl4j.jar"/>
- <classpathentry kind="lib" path="thirdparty/wsdl4j-src.jar"/>
- <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/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/geronimo-javamail_1.4_spec-1.2.jar"/>
- <classpathentry kind="lib" path="thirdparty/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
- <classpathentry kind="lib" path="thirdparty/geronimo-ws-metadata_2.0_spec-1.1.2.jar"/>
- <classpathentry kind="lib" path="thirdparty/spring-beans-2.0.8.jar"/>
- <classpathentry kind="lib" path="thirdparty/spring-context-2.0.8.jar"/>
- <classpathentry kind="lib" path="thirdparty/spring-core-2.0.8.jar"/>
- <classpathentry kind="lib" path="thirdparty/wstx-asl-3.2.4.jar"/>
- <classpathentry kind="lib" path="thirdparty/cxf-2.0.5-incubator.jar"/>
- <classpathentry kind="output" path="output/eclipse"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/common"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.0.5-incubator/cxf-rt-transports-http-2.0.5-incubator.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/2.0.5-incubator/cxf-rt-frontend-jaxws-2.0.5-incubator.jar"/>
+ <classpathentry kind="output" path="target/eclipse"/>
</classpath>
Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/ant-import/build-bin-dist.xml 2008-04-12 12:43:28 UTC (rev 6390)
+++ stack/cxf/branches/tdiesler/trunk/ant-import/build-bin-dist.xml 2008-04-12 15:36:24 UTC (rev 6391)
@@ -17,7 +17,7 @@
<!-- Binary distribution -->
<!-- ================================================================== -->
- <target name="build-bin-dist" depends="jars,javadoc,prepare-deploy" description="Build the binary distribution">
+ <target name="build-bin-dist" depends="jars,prepare-deploy" description="Build the binary distribution">
<property name="bindist.dir" value="${cxf.output.dir}/jbossws-cxf-dist"/>
<property name="bindist.build.dir" value="${bindist.dir}/build"/>
Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml 2008-04-12 12:43:28 UTC (rev 6390)
+++ stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml 2008-04-12 15:36:24 UTC (rev 6391)
@@ -24,9 +24,6 @@
<target name="thirdparty-init" depends="prepare">
- <property name="apache.cxf.dir" value="${cxf.dir}/apache-cxf"/>
- <available property="apache.cxf.available" file="${apache.cxf.dir}"/>
-
<checksum file="${int.cxf.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
<property name="checksum.ok.${checksum.ok}" value="true"/>
@@ -49,35 +46,13 @@
<!--
thirdpartry-get
-->
- <target name="thirdparty-get" depends="thirdparty-delete,cxf-copy-jars" if="force.thirdparty.get"
+ <target name="thirdparty-get" depends="thirdparty-delete" if="force.thirdparty.get"
description="Gets the thirdparty libraries">
<mkdir dir="${thirdparty.dir}"/>
- <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common-src.zip" dest="${thirdparty.dir}/jbossws-common-src.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-src.zip" dest="${thirdparty.dir}/jbossws-framework-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
-
- <get src="${jboss.repository}/apache-xml-commons/${apache-xml-commons}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/>
<checksum file="${int.cxf.dir}/version.properties" fileext=".md5"/>
</target>
@@ -105,150 +80,5 @@
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
</path>
</target>
-
- <!-- Build CXF from source -->
- <target name="cxf-build" depends="cxf-copy-jars" description="Build Apache CXF from source">
- </target>
- <!-- SVN checkout the Apache CXF sources -->
- <target name="cxf-checkout-dir" depends="thirdparty-init" unless="apache.cxf.available">
- <property name="cxf.checkout.required" value="true"/>
- <echo message="cxf.checkout.required=${cxf.checkout.required}"/>
- </target>
-
- <target name="cxf-checkout-required" depends="cxf-checkout-dir" if="apache.cxf.available">
- <exec dir="${apache.cxf.dir}" executable="svn" failonerror="true" output="${apache.cxf.dir}/svn-info.xml">
- <arg line="info"/>
- <arg line="--xml"/>
- </exec>
- <xmlproperty file="${apache.cxf.dir}/svn-info.xml"/>
- <property name="cxf.entry.url" value="${info.entry.url}"/>
- <condition property="cxf.checkout.required">
- <not>
- <equals arg1="${cxf.entry.url}" arg2="${cxf.svn.url}"/>
- </not>
- </condition>
- <echo message="cxf.checkout.required=${cxf.checkout.required}"/>
- </target>
-
- <target name="cxf-checkout" depends="cxf-checkout-required" if="cxf.checkout.required">
- <delete dir="${apache.cxf.dir}"/>
- <echo message="svn checkout -r${cxf.svn.rev} ${cxf.svn.url}"/>
- <exec dir="${cxf.dir}" executable="svn" failonerror="true">
- <arg value="checkout"/>
- <arg value="-r${cxf.svn.rev}"/>
- <arg value="${cxf.svn.url}"/>
- <arg value="apache-cxf"/>
- </exec>
- </target>
-
- <!-- SVN update the Apache CXF sources -->
- <target name="cxf-update-required" depends="thirdparty-init" if="apache.cxf.available" unless="skip-cxf-update">
- <exec dir="${apache.cxf.dir}" executable="svn" failonerror="true" output="${apache.cxf.dir}/svn-info.xml">
- <arg line="info"/>
- <arg line="--xml"/>
- </exec>
- <xmlproperty file="${apache.cxf.dir}/svn-info.xml"/>
- <property name="cxf.entry.url" value="${info.entry.url}"/>
- <condition property="cxf.update.required">
- <equals arg1="${cxf.entry.url}" arg2="${cxf.svn.url}"/>
- </condition>
- <echo message="cxf.update.required=${cxf.update.required}"/>
- </target>
-
- <target name="cxf-update" depends="cxf-update-required" if="cxf.update.required" unless="cxf.checkout.required">
- <echo message="svn update -r${cxf.svn.rev} ${cxf.svn.url}"/>
- <exec dir="${apache.cxf.dir}" executable="svn" failonerror="true">
- <arg value="update"/>
- <arg value="-r${cxf.svn.rev}"/>
- </exec>
- </target>
-
- <!-- SVN get commit revision -->
- <target name="cxf-svn-info" depends="cxf-checkout,cxf-update">
- <exec dir="${apache.cxf.dir}" executable="svn" failonerror="true" output="${apache.cxf.dir}/svn-info.xml">
- <arg line="info"/>
- <arg line="--xml"/>
- </exec>
- <xmlproperty file="${apache.cxf.dir}/svn-info.xml"/>
- <property name="cxf.entry.commit.revision" value="${info.entry.commit(revision)}"/>
- <available property="cxf.build.available" file="${apache.cxf.dir}/build-${cxf.entry.commit.revision}.rev"/>
- </target>
-
- <!-- Build using maven -->
- <target name="cxf-maven-build" depends="cxf-svn-info" unless="cxf.build.available">
- <exec dir="${apache.cxf.dir}" executable="mvn" failonerror="true">
- <arg value="clean"/>
- <arg value="install"/>
- <arg value="-Pfastinstall,everything"/>
- </exec>
- <exec dir="${apache.cxf.dir}" executable="svn" failonerror="true" output="${apache.cxf.dir}/svn-info.xml">
- <arg line="info"/>
- <arg line="--xml"/>
- </exec>
- <touch file="${apache.cxf.dir}/build-${cxf.entry.commit.revision}.rev"/>
- </target>
-
- <!-- Copy the cxf jars -->
- <target name="cxf-copy-jars" depends="cxf-maven-build">
- <mkdir dir="${thirdparty.dir}"/>
-
- <property name="cxf.distribution.lib" value="${apache.cxf.dir}/distribution/target/apache-cxf-${cxf.version}.dir/apache-cxf-${cxf.version}/lib"/>
-
- <available property="cxf.available" filepath="${cxf.distribution.lib}" file="cxf-${cxf.version}.jar"/>
- <available property="geronimo-javamail.available" filepath="${cxf.distribution.lib}" file="geronimo-javamail_${cxf.geronimo.javamail}.jar"/>
- <available property="geronimo-ws-metadata.available" filepath="${cxf.distribution.lib}" file="geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/>
- <available property="jaxws-api.available" filepath="${cxf.distribution.lib}" file="jaxws-api-${cxf.jaxws.api}.jar"/>
- <available property="jetty.available" filepath="${cxf.distribution.lib}" file="jetty-${cxf.jetty}.jar"/>
- <available property="jetty-util.available" filepath="${cxf.distribution.lib}" file="jetty-util-${cxf.jetty}.jar"/>
- <available property="jdom.available" filepath="${cxf.distribution.lib}" file="jdom-${cxf.jdom}.jar"/>
- <available property="neethi.available" filepath="${cxf.distribution.lib}" file="neethi-${cxf.neethi}.jar"/>
- <available property="saaj-api.available" filepath="${cxf.distribution.lib}" file="saaj-api-${cxf.saaj}.jar"/>
- <available property="saaj-impl.available" filepath="${cxf.distribution.lib}" file="saaj-impl-${cxf.saaj}.jar"/>
- <available property="spring-beans.available" filepath="${cxf.distribution.lib}" file="spring-beans-${cxf.spring}.jar"/>
- <available property="spring-context.available" filepath="${cxf.distribution.lib}" file="spring-context-${cxf.spring}.jar"/>
- <available property="spring-core.available" filepath="${cxf.distribution.lib}" file="spring-core-${cxf.spring}.jar"/>
- <available property="xbean.available" filepath="${cxf.distribution.lib}" file="xbean-${cxf.xbean}.jar"/>
- <available property="xml-resolver.available" filepath="${cxf.distribution.lib}" file="xml-resolver-${cxf.xml.resolver}.jar"/>
- <available property="XmlSchema.available" filepath="${cxf.distribution.lib}" file="XmlSchema-${cxf.xmlschema}.jar"/>
-
- <fail message="cxf-${cxf.version}.jar not available" unless="cxf.available"/>
- <fail message="geronimo-javamail_${cxf.geronimo.javamail}.jar not available" unless="geronimo-javamail.available"/>
- <fail message="geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar not available" unless="geronimo-ws-metadata.available"/>
- <fail message="jaxws-api-${cxf.jaxws.api}.jar not available" unless="jaxws-api.available"/>
- <fail message="jetty-${cxf.jetty}.jar not available" unless="jetty.available"/>
- <fail message="jetty-util-${cxf.jetty}.jar not available" unless="jetty-util.available"/>
- <fail message="jdom-${cxf.jdom}.jar not available" unless="jdom.available"/>
- <fail message="neethi-${cxf.neethi}.jar not available" unless="neethi.available"/>
- <fail message="saaj-api-${cxf.saaj}.jar not available" unless="saaj-api.available"/>
- <fail message="saaj-impl-${cxf.saaj}.jar not available" unless="saaj-impl.available"/>
- <fail message="spring-beans-${cxf.spring}.jar not available" unless="spring-beans.available"/>
- <fail message="spring-context-${cxf.spring}.jar not available" unless="spring-context.available"/>
- <fail message="spring-core-${cxf.spring}.jar not available" unless="spring-core.available"/>
- <fail message="xbean-${cxf.xbean}.jar not available" unless="xbean.available"/>
- <fail message="xml-resolver-${cxf.xml.resolver}.jar not available" unless="xml-resolver.available"/>
- <fail message="XmlSchema-${cxf.xmlschema}.jar not available" unless="XmlSchema.available"/>
-
- <copy todir="${thirdparty.dir}">
- <fileset dir="${cxf.distribution.lib}">
- <include name="cxf-${cxf.version}.jar"/>
- <include name="geronimo-javamail_${cxf.geronimo.javamail}.jar"/>
- <include name="geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/>
- <include name="jaxws-api-${cxf.jaxws.api}.jar"/>
- <include name="jetty-${cxf.jetty}.jar"/>
- <include name="jetty-util-${cxf.jetty}.jar"/>
- <include name="jdom-${cxf.jdom}.jar"/>
- <include name="neethi-${cxf.neethi}.jar"/>
- <include name="saaj-api-${cxf.saaj}.jar"/>
- <include name="saaj-impl-${cxf.saaj}.jar"/>
- <include name="spring-beans-${cxf.spring}.jar"/>
- <include name="spring-context-${cxf.spring}.jar"/>
- <include name="spring-core-${cxf.spring}.jar"/>
- <include name="xbean-${cxf.xbean}.jar"/>
- <include name="xml-resolver-${cxf.xml.resolver}.jar"/>
- <include name="XmlSchema-${cxf.xmlschema}.jar"/>
- </fileset>
- </copy>
- </target>
-
</project>
Modified: stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-12 12:43:28 UTC (rev 6390)
+++ stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-12 15:36:24 UTC (rev 6391)
@@ -26,29 +26,31 @@
</patternset>
<patternset id="jbossws.client.patternset">
- <include name="**/cxf-${cxf.version}.jar"/>
+ <include name="**/cxf-api.jar"/>
+ <include name="**/cxf-common-utilities.jar"/>
+ <include name="**/cxf-rt-core.jar"/>
<include name="**/geronimo-javamail_${cxf.geronimo.javamail}.jar"/>
<include name="**/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/>
<include name="**/jaxb-api.jar"/>
<include name="**/jaxb-impl.jar"/>
<include name="**/jaxb-xjc.jar"/>
- <include name="**/jaxws-api-${cxf.jaxws.api}.jar"/>
+ <include name="**/jaxws-api.jar"/>
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-cxf-client.jar"/>
<include name="**/jbossws-framework.jar"/>
<include name="**/jbossws-spi.jar"/>
- <include name="**/jdom-${cxf.jdom}.jar"/>
- <include name="**/neethi-${cxf.neethi}.jar"/>
- <include name="**/saaj-api-${cxf.saaj}.jar"/>
- <include name="**/saaj-impl-${cxf.saaj}.jar"/>
- <include name="**/spring-beans-${cxf.spring}.jar"/>
- <include name="**/spring-context-${cxf.spring}.jar"/>
- <include name="**/spring-core-${cxf.spring}.jar"/>
+ <include name="**/jdom.jar"/>
+ <include name="**/neethi.jar"/>
+ <include name="**/saaj-api.jar"/>
+ <include name="**/saaj-impl.jar"/>
+ <include name="**/spring-beans.jar"/>
+ <include name="**/spring-context.jar"/>
+ <include name="**/spring-core.jar"/>
<include name="**/stax-api.jar"/>
<include name="**/wsdl4j.jar"/>
<include name="**/wstx.jar"/>
- <include name="**/xml-resolver-${cxf.xml.resolver}.jar"/>
- <include name="**/XmlSchema-${cxf.xmlschema}.jar"/>
+ <include name="**/xml-resolver.jar"/>
+ <include name="**/XmlSchema.jar"/>
</patternset>
<patternset id="jbossws.lib.patternset">
@@ -63,28 +65,28 @@
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
<include name="**/jbossws-spi.jar"/>
- <include name="**/jaxws-api-${cxf.jaxws.api}.jar"/>
- <include name="**/saaj-api-${cxf.saaj}.jar"/>
+ <include name="**/jaxws-api.jar"/>
+ <include name="**/saaj-api.jar"/>
</patternset>
<patternset id="jbossws.service.lib.patternset">
- <include name="**/cxf-${cxf.version}.jar"/>
+ <include name="**/cxf-*.jar"/>
<include name="**/geronimo-javamail_${cxf.geronimo.javamail}.jar"/>
<include name="**/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/>
<include name="**/jaxrpc-api.jar"/>
- <include name="**/jaxws-api-${cxf.jaxws.api}.jar"/>
+ <include name="**/jaxws-api.jar"/>
<include name="**/jbossws-cxf.jar"/>
- <include name="**/jdom-${cxf.jdom}.jar"/>
- <include name="**/neethi-${cxf.neethi}.jar"/>
- <include name="**/saaj-api-${cxf.saaj}.jar"/>
- <include name="**/saaj-impl-${cxf.saaj}.jar"/>
- <include name="**/spring-beans-${cxf.spring}.jar"/>
- <include name="**/spring-context-${cxf.spring}.jar"/>
- <include name="**/spring-core-${cxf.spring}.jar"/>
+ <include name="**/jdom.jar"/>
+ <include name="**/neethi.jar"/>
+ <include name="**/saaj-api.jar"/>
+ <include name="**/saaj-impl.jar"/>
+ <include name="**/spring-beans.jar"/>
+ <include name="**/spring-context.jar"/>
+ <include name="**/spring-core.jar"/>
<include name="**/wsdl4j.jar"/>
- <include name="**/xbean-${cxf.xbean}.jar"/>
- <include name="**/xml-resolver-${cxf.xml.resolver}.jar"/>
- <include name="**/XmlSchema-${cxf.xmlschema}.jar"/>
+ <include name="**/xbean.jar"/>
+ <include name="**/xml-resolver.jar"/>
+ <include name="**/XmlSchema.jar"/>
</patternset>
<!-- ================================================================== -->
Modified: stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml 2008-04-12 12:43:28 UTC (rev 6390)
+++ stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml 2008-04-12 15:36:24 UTC (rev 6391)
@@ -26,26 +26,27 @@
<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/cxf-api.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/cxf-common-utilities.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/cxf-rt-core.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/jaxws-api.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/jdom.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/neethi.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/saaj-api.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/saaj-impl.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/spring-beans.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/spring-context.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/spring-core.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"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/xml-resolver.jar"/>
+ <pathelement location="${int.cxf.dir}/thirdparty/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>
Modified: stack/cxf/branches/tdiesler/trunk/build.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-12 12:43:28 UTC (rev 6390)
+++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-12 15:36:24 UTC (rev 6391)
@@ -33,7 +33,7 @@
<property name="cxf.distro.dir" value="${cxf.src.dir}/distro"/>
<property name="cxf.java.dir" value="${cxf.src.dir}/java"/>
<property name="cxf.resources.dir" value="${cxf.src.dir}/resources"/>
- <property name="cxf.output.dir" value="${cxf.dir}/output"/>
+ <property name="cxf.output.dir" value="${cxf.dir}/target"/>
<property name="cxf.output.apidocs.dir" value="${cxf.output.dir}/apidocs"/>
<property name="cxf.output.classes.dir" value="${cxf.output.dir}/classes"/>
<property name="cxf.output.deploy.dir" value="${cxf.output.dir}/deploy"/>
@@ -44,8 +44,10 @@
<property name="deploy.artifacts.dir" value="${cxf.output.deploy.dir}-artifacts"/>
<property name="deploy.structure.jboss42" value="${cxf.output.deploy.dir}-jboss42"/>
<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"/>
-
+ <property name="jbossws.default.deploy.conf" value="${cxf.dir}/ant-import/jbossws-default-deploy.conf"/>
+
+ <property name="thirdparty.dir" value="${basedir}/thirdparty"/>
+
<import file="${basedir}/ant-import-tests/build-testsuite.xml"/>
<!-- ================================================================== -->
@@ -53,7 +55,7 @@
<!-- ================================================================== -->
<target name="init" depends="prepare,thirdparty">
- <mkdir dir="${cxf.output.apidocs.dir}"/>
+ <mkdir dir="${cxf.output.apidocs.dir}"/>
</target>
<!-- ================================================================== -->
@@ -68,37 +70,8 @@
| documentation compiles.
-->
- <target name="compile" depends="init,compile-classes,compile-etc,compile-resources" description="Compile all source files."/>
+ <target name="compile" depends="init,compile-resources" description="Compile all source files."/>
- <!-- Compile java sources -->
- <target name="compile-classes" depends="compile-classes-cxf"/>
- <target name="compile-classes-cxf" depends="init">
- <mkdir dir="${cxf.output.classes.dir}"/>
- <javac srcdir="${cxf.java.dir}" sourcepath="" destdir="${cxf.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <include name="org/jboss/wsf/stack/cxf/**"/>
- <classpath refid="cxf.integration.classpath"/>
- </javac>
- </target>
-
- <!-- Compile etc files (manifests and such) -->
- <target name="compile-etc" depends="init">
- <mkdir dir="${cxf.output.etc.dir}"/>
- <copy todir="${cxf.output.etc.dir}" filtering="yes" overwrite="true">
- <fileset dir="${cxf.etc.dir}">
- <include name="component-info.xml"/>
- <include name="default.mf"/>
- </fileset>
- <filterset>
- <filter token="java.vm.version" value="${java.vm.version}"/>
- <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
- <filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="${int.cxf.dir}/version.properties"/>
- </filterset>
- </copy>
- </target>
-
<!-- Compile resource files -->
<target name="compile-resources" depends="init">
@@ -106,25 +79,22 @@
<mkdir dir="${cxf.output.resources.dir}"/>
<concat destfile="${cxf.output.resources.dir}/jbossws-cxf50-beans.xml">
<header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0">
- </header>
+ <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
<fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/>
<footer trimleading="yes">
- </deployment>
- </footer>
+ </deployment> </footer>
</concat>
<!-- Concat jboss-beans.xml -->
<unzip dest="${cxf.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
<concat destfile="${cxf.output.resources.dir}/jbossws-cxf42-beans.xml">
<header trimleading="yes">
- <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
- </header>
+ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer"> </header>
<fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/>
<fileset file="${cxf.output.resources.dir}/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
- </deployment>
- </footer>
+ </deployment> </footer>
</concat>
<copy todir="${cxf.output.resources.dir}">
@@ -133,7 +103,7 @@
</fileset>
</copy>
</target>
-
+
<!-- ================================================================== -->
<!-- Archives -->
<!-- ================================================================== -->
@@ -143,22 +113,11 @@
-->
<target name="jars" depends="compile" description="Builds all jar files.">
- <!-- Build jbossws-cxf.jar -->
- <mkdir dir="${cxf.output.lib.dir}"/>
- <jar jarfile="${cxf.output.lib.dir}/jbossws-cxf.jar" manifest="${cxf.output.etc.dir}/default.mf">
- <fileset dir="${cxf.output.classes.dir}">
- <include name="org/jboss/wsf/stack/cxf/**"/>
- </fileset>
- <metainf dir="${cxf.resources.dir}/jbossws-cxf.jar/META-INF"/>
- </jar>
+ <!-- Run the maven build -->
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="package"/>
+ </exec>
- <jar jarfile="${cxf.output.lib.dir}/jbossws-cxf-client.jar" manifest="${cxf.output.etc.dir}/default.mf">
- <fileset dir="${cxf.output.classes.dir}">
- <include name="org/jboss/wsf/stack/cxf/client/**"/>
- </fileset>
- <metainf dir="${cxf.resources.dir}/jbossws-cxf-client.jar/META-INF"/>
- </jar>
-
<!-- Build jbossws-context.war -->
<copy todir="${cxf.output.resources.dir}/jbossws-context.war" overwrite="true" filtering="true">
<fileset dir="${cxf.resources.dir}/jbossws-context.war"/>
@@ -168,8 +127,7 @@
<filtersfile file="${cxf.dir}/version.properties"/>
</filterset>
</copy>
- <war warfile="${cxf.output.lib.dir}/jbossws-context.war"
- webxml="${cxf.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml"
+ <war warfile="${cxf.output.lib.dir}/jbossws-context.war" webxml="${cxf.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml"
manifest="${cxf.output.etc.dir}/default.mf">
<fileset dir="${cxf.output.resources.dir}/jbossws-context.war">
<include name="index.html"/>
@@ -180,48 +138,8 @@
</webinf>
</war>
- <!-- Remove config files from cxf-${cxf.version}.jar -->
- <unjar src="${thirdparty.dir}/cxf-${cxf.version}.jar" dest="${cxf.output.lib.dir}/cxf-${cxf.version}"/>
- <jar destfile="${cxf.output.lib.dir}/cxf-${cxf.version}.jar" manifest="${cxf.output.lib.dir}/cxf-${cxf.version}/META-INF/MANIFEST.MF">
- <fileset dir="${cxf.output.lib.dir}/cxf-${cxf.version}">
- <exclude name="META-INF/**"/>
- </fileset>
- </jar>
-
- <!-- Build jbossws-cxf-src.zip -->
- <zip zipfile="${cxf.output.lib.dir}/jbossws-cxf-src.zip" >
- <fileset dir="${cxf.java.dir}"/>
- </zip>
</target>
- <!-- Generate the JavaDoc -->
- <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc">
-
- <!-- expand the cxf sources -->
- <mkdir dir="${cxf.output.dir}/thirdparty-sources"/>
- <unzip src="${thirdparty.dir}/cxf-distribution-sources.jar" dest="${cxf.output.dir}/thirdparty-sources"/>
-
-
- <javadoc destdir="${cxf.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API ${version.id} ">
- <classpath>
- <pathelement path="${cxf.integration.classpath}"/>
- </classpath>
- <packageset dir="${cxf.java.dir}" defaultexcludes="yes">
- <include name="org/jboss/wsf/**"/>
- </packageset>
- <packageset dir="${cxf.output.dir}/thirdparty-sources" defaultexcludes="yes">
- <include name="org/codehaus/**"/>
- </packageset>
- <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration CXF</h1>]]></doctitle>
- <tag name="todo" scope="all" description="To do:"/>
- <!--group title="Native SOAP stack" packages="org.jboss.ws,org.jboss.ws.core*, org.jboss.ws.metadata*, org.jboss.ws.extensions*, org.jboss.ws.tools*, org.jboss.ws.annotation*, org.jboss.ws.jaxrpc*, org.jboss.ws.soap*"/-->
- <group title="Stack integration" packages="org.jboss.wsf.stack*"/>
- <group title="SPI" packages="org.jboss.wsf.spi*, org.jboss.ws.integration*"/>
- <group title="Container integration" packages="org.jboss.wsf.container*"/>
- <tag name="todo" scope="all" description="To do:"/>
- </javadoc>
- </target>
-
<!-- ================================================================== -->
<!-- Miscellaneous -->
<!-- ================================================================== -->
Added: stack/cxf/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/pom.xml (rev 0)
+++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-12 15:36:24 UTC (rev 6391)
@@ -0,0 +1,132 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-cxf</artifactId>
+ <packaging>jar</packaging>
+ <version>3.0.2-SNAPSHOT</version>
+ <name>JBoss Web Services - Stack CXF</name>
+ <organization>
+ <name>JBoss, a division of Red Hat</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <url>http://maven.apache.org</url>
+
+ <!-- Properties -->
+ <properties>
+ <cxf-version>2.0.5-incubator</cxf-version>
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxrpc-api</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${cxf-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>3</version>
+ </parent>
+
+ <!-- Plugins -->
+ <build>
+ <resources>
+ <resource>
+ <targetPath>../etc</targetPath>
+ <directory>src/main/etc</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>./thirdparty</outputDirectory>
+ <stripVersion>true</stripVersion>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/jboss/test/ws/jaxws/cxf/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Repositories -->
+ <repositories>
+ <repository>
+ <id>apache.incubating.repository</id>
+ <url>http://people.apache.org/repo/m2-incubating-repository</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+</project>
Property changes on: stack/cxf/branches/tdiesler/trunk/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: stack/cxf/branches/tdiesler/trunk/src/main/etc/component-info50.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/src/main/etc/component-info50.xml 2008-04-12 12:43:28 UTC (rev 6390)
+++ stack/cxf/branches/tdiesler/trunk/src/main/etc/component-info50.xml 2008-04-12 15:36:24 UTC (rev 6391)
@@ -1,23 +0,0 @@
-<project name="jboss/jbossws-cxf50">
-
- <component id="jboss/jbossws-cxf50"
- description="JBossWS an implementation of J2EE Web Services"
- version="@repository.id@"
- licenseType="lgpl">
-
- <artifact id="jbossws-cxf50.sar"/>
- <artifact id="jbossws-cxf50-deployer.zip"/>
-
- <import componentref="jboss/microcontainer">
- <compatible version="@jboss-microcontainer@"/>
- </import>
- <import componentref="jboss/jbossws-spi">
- <compatible version="@repository.id@"/>
- </import>
-
- <export>
- </export>
-
- </component>
-
-</project>
Modified: stack/cxf/branches/tdiesler/trunk/src/main/etc/default.mf
===================================================================
--- stack/cxf/branches/tdiesler/trunk/src/main/etc/default.mf 2008-04-12 12:43:28 UTC (rev 6390)
+++ stack/cxf/branches/tdiesler/trunk/src/main/etc/default.mf 2008-04-12 15:36:24 UTC (rev 6391)
@@ -8,8 +8,7 @@
Implementation-Version: @implementation.version@ (build=(a)build.id@)
Implementation-Vendor: @implementation.vendor@
Implementation-Vendor-Id: @implementation.vendor.id@
-Class-Path: cxf-@cxf.version@.jar geronimo-javamail_@cxf.geronimo.javamail@.jar geronimo-ws-metadata_@cxf.geronimo.ws.metadata@.jar
- jaxb-api.jar jaxb-impl.jar jaxws-api-@cxf.jaxws.api@.jar jbossws-common.jar jbossws-framework.jar jbossws-spi.jar
- jdom-@cxf.jdom@.jar neethi-@cxf.neethi@.jar saaj-api-@cxf.saaj@.jar saaj-impl-@cxf.saaj@.jar
- spring-beans-@cxf.spring@.jar spring-context-@cxf.spring@.jar spring-core-@cxf.spring@.jar
- stax-api.jar wsdl4j.jar wstx.jar xml-resolver-@cxf.xml.resolver@.jar XmlSchema-@cxf.xmlschema@.jar
\ No newline at end of file
+Class-Path: cxf-rt-core.jar geronimo-javamail_@cxf.geronimo.javamail@.jar geronimo-ws-metadata_@cxf.geronimo.ws.metadata@.jar
+ jaxb-api.jar jaxb-impl.jar jaxws-api.jar jbossws-common.jar jbossws-framework.jar jbossws-spi.jar
+ neethi.jar saaj-api.jar saaj-impl.jar spring-beans.jar spring-context.jar spring-core.jar
+ stax-api.jar wsdl4j.jar wstx.jar xml-resolver.jar XmlSchema.jar
\ No newline at end of file
Modified: stack/cxf/branches/tdiesler/trunk/version.properties
===================================================================
--- stack/cxf/branches/tdiesler/trunk/version.properties 2008-04-12 12:43:28 UTC (rev 6390)
+++ stack/cxf/branches/tdiesler/trunk/version.properties 2008-04-12 15:36:24 UTC (rev 6391)
@@ -1,52 +1,11 @@
# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $
-specification.title=JBossWS
-specification.vendor=JBoss (http://www.jboss.org)
-specification.version=jbossws-3.0
-
-version.id=cxf-3.0.2.DEV
-repository.id=snapshot
-
-implementation.title=JBoss Web Services - Apache CXF
-implementation.url=http://www.jboss.org/products/jbossws
-implementation.vendor=JBoss Inc.
-implementation.vendor.id=http://www.jboss.org
-
-# Apache CXF version
-cxf.svn.url=http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.5-incubator
-cxf.svn.rev=HEAD
-
# Apache CXF versions
-cxf.version=2.0.5-incubator
-cxf.geronimo.javamail=1.4_spec-1.2
-cxf.geronimo.ws.metadata=2.0_spec-1.1.2
-cxf.jaxws.api=2.0
-cxf.jetty=6.1.8
-cxf.jdom=1.0
-cxf.neethi=2.0.2
-cxf.saaj=1.3
-cxf.spring=2.0.8
-cxf.xbean=2.2.0
-cxf.xml.resolver=1.2
-cxf.xmlschema=1.3.2
+cxf.geronimo.javamail=1.4_spec
+cxf.geronimo.ws.metadata=2.0_spec
# Thirdparty library versions
-jbossws-spi=1.0.2.GA
-jbossws-common=snapshot
jbossws-framework=snapshot
jbossws-jboss42=4.2.1.GA
-
-apache-xml-commons=1.2
-ibm-wsdl4j=1.6.2
-jboss-common-core=2.0.2.GA
-jboss-common-logging-spi=2.0.2.GA
-jboss-javaee=5.0.0.Beta3Update1
jboss-jaxr=1.2.0.GA
-jboss-security-spi=2.0.0.Beta
-stax-api=1.0.1
-sun-jaf=1.1
-sun-jaxb=2.1.6
-sun-jaxrpc=1.1
-sun-servlet=2.5
-woodstox=3.2.4
16 years, 9 months
JBossWS SVN: r6390 - stack/cxf/branches/tdiesler.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-12 08:43:28 -0400 (Sat, 12 Apr 2008)
New Revision: 6390
Added:
stack/cxf/branches/tdiesler/trunk/
Log:
Create userbranch
Copied: stack/cxf/branches/tdiesler/trunk (from rev 6389, stack/cxf/trunk)
16 years, 9 months
JBossWS SVN: r6389 - stack/cxf/branches.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-12 08:43:16 -0400 (Sat, 12 Apr 2008)
New Revision: 6389
Added:
stack/cxf/branches/tdiesler/
Log:
Create userbranch
16 years, 9 months
JBossWS SVN: r6388 - spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-12 08:38:14 -0400 (Sat, 12 Apr 2008)
New Revision: 6388
Modified:
spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java
spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntProvideTestCase.java
Log:
cleanup tests
Modified: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java
===================================================================
--- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java 2008-04-12 12:34:12 UTC (rev 6387)
+++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java 2008-04-12 12:38:14 UTC (rev 6388)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.wsf.spi.tools;
-import java.io.File;
-
/**
* Test the WSConsumeTask.
* This test needs to be executed in 'SPI_HOME/output/tests',
@@ -32,7 +30,7 @@
* @version $Revision$
*/
public class AntConsumeTestCase extends BuildFileTest
-{
+{
protected void setUp() throws Exception
{
super.setUp();
@@ -41,24 +39,15 @@
CmdConsumeTracker.LAST_EVENT = "";
// enforce loading of the tracker implemenation
- System.setProperty(
- "org.jboss.wsf.spi.tools.ConsumerFactoryImpl",
- "org.jboss.test.wsf.spi.tools.CmdConsumeTrackerFactory"
- );
+ System.setProperty("org.jboss.wsf.spi.tools.ConsumerFactoryImpl", "org.jboss.test.wsf.spi.tools.CmdConsumeTrackerFactory");
- // maven style
- if (new File("src/test/resources/smoke/tools/consume-test.xml").exists())
- configureProject("src/test/resources/smoke/tools/consume-test.xml");
-
- // ant style
- else if (new File("resources/smoke/tools/consume-test.xml").exists())
- configureProject("resources/smoke/tools/consume-test.xml");
+ configureProject("src/test/resources/smoke/tools/consume-test.xml");
}
-
+
public void testPlainInvocation()
{
executeTarget("plainInvocation");
- assertTrue("consume() not invoked", CmdConsumeTracker.LAST_EVENT.indexOf("consume")!=-1);
+ assertTrue("consume() not invoked", CmdConsumeTracker.LAST_EVENT.indexOf("consume") != -1);
}
}
Modified: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntProvideTestCase.java
===================================================================
--- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntProvideTestCase.java 2008-04-12 12:34:12 UTC (rev 6387)
+++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntProvideTestCase.java 2008-04-12 12:38:14 UTC (rev 6388)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.wsf.spi.tools;
-import java.io.File;
-
/**
* @author Heiko.Braun(a)jboss.com
* @version $Revision$
@@ -37,36 +35,27 @@
CmdProvideTracker.LAST_EVENT = "";
// enforce loading of the tracker implemenation
- System.setProperty(
- "org.jboss.wsf.spi.tools.ProviderFactoryImpl",
- "org.jboss.test.wsf.spi.tools.CmdProvideTrackerFactory"
- );
+ System.setProperty("org.jboss.wsf.spi.tools.ProviderFactoryImpl", "org.jboss.test.wsf.spi.tools.CmdProvideTrackerFactory");
- // maven style
- if (new File("src/test/resources/smoke/tools/provide-test.xml").exists())
- configureProject("src/test/resources/smoke/tools/provide-test.xml");
-
- // ant style
- else if (new File("resources/smoke/tools/provide-test.xml").exists())
- configureProject("resources/smoke/tools/provide-test.xml");
+ configureProject("src/test/resources/smoke/tools/provide-test.xml");
}
public void testPlainInvocation()
{
executeTarget("plainInvocation");
- assertTrue("provide() not invoked", CmdProvideTracker.LAST_EVENT.indexOf("provide")!=-1);
+ assertTrue("provide() not invoked", CmdProvideTracker.LAST_EVENT.indexOf("provide") != -1);
}
public void testIncludeWSDL()
{
executeTarget("includeWSDL");
- assertTrue("setGenerateWsdl() not invoked", CmdProvideTracker.LAST_EVENT.indexOf("setGenerateWsdl")!=-1);
+ assertTrue("setGenerateWsdl() not invoked", CmdProvideTracker.LAST_EVENT.indexOf("setGenerateWsdl") != -1);
}
public void testExtraClasspath()
{
executeTarget("extraClasspath");
-
+
}
}
16 years, 9 months
JBossWS SVN: r6387 - common/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-12 08:34:12 -0400 (Sat, 12 Apr 2008)
New Revision: 6387
Modified:
common/trunk/pom.xml
Log:
Remove explicit repository definition
Modified: common/trunk/pom.xml
===================================================================
--- common/trunk/pom.xml 2008-04-12 12:34:07 UTC (rev 6386)
+++ common/trunk/pom.xml 2008-04-12 12:34:12 UTC (rev 6387)
@@ -65,34 +65,4 @@
</plugins>
</build>
- <!-- Repositories -->
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Releases Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <url>http://snapshots.jboss.org/maven2</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
</project>
16 years, 9 months
JBossWS SVN: r6386 - spi/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-12 08:34:07 -0400 (Sat, 12 Apr 2008)
New Revision: 6386
Modified:
spi/trunk/pom.xml
Log:
Remove explicit repository definition
Modified: spi/trunk/pom.xml
===================================================================
--- spi/trunk/pom.xml 2008-04-12 12:28:43 UTC (rev 6385)
+++ spi/trunk/pom.xml 2008-04-12 12:34:07 UTC (rev 6386)
@@ -101,34 +101,4 @@
</plugins>
</build>
- <!-- Repositories -->
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Releases Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <url>http://snapshots.jboss.org/maven2</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
</project>
16 years, 9 months
JBossWS SVN: r6385 - framework/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-12 08:28:43 -0400 (Sat, 12 Apr 2008)
New Revision: 6385
Modified:
framework/trunk/.classpath
Log:
eclipse classpath
Modified: framework/trunk/.classpath
===================================================================
--- framework/trunk/.classpath 2008-04-12 12:24:38 UTC (rev 6384)
+++ framework/trunk/.classpath 2008-04-12 12:28:43 UTC (rev 6385)
@@ -7,5 +7,11 @@
<classpathentry kind="var" path="M2_REPO/javax/xml/jaxrpc-api/1.1/jaxrpc-api-1.1.jar"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/common"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/spi"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR7/jbossxb-2.0.0.CR7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar"/>
<classpathentry kind="output" path="target/eclipse"/>
</classpath>
16 years, 9 months