JBossWS SVN: r6524 - common/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 17:36:59 -0400 (Fri, 18 Apr 2008)
New Revision: 6524
Modified:
common/trunk/.classpath
Log:
Fix eclipse output
Modified: common/trunk/.classpath
===================================================================
--- common/trunk/.classpath 2008-04-18 21:22:23 UTC (rev 6523)
+++ common/trunk/.classpath 2008-04-18 21:36:59 UTC (rev 6524)
@@ -3,5 +3,5 @@
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="output" path="target/eclipse-classes"/>
</classpath>
18 years
JBossWS SVN: r6523 - framework/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 17:22:23 -0400 (Fri, 18 Apr 2008)
New Revision: 6523
Modified:
framework/trunk/pom.xml
Log:
Use jbossws-parent
Modified: framework/trunk/pom.xml
===================================================================
--- framework/trunk/pom.xml 2008-04-18 21:22:18 UTC (rev 6522)
+++ framework/trunk/pom.xml 2008-04-18 21:22:23 UTC (rev 6523)
@@ -82,7 +82,6 @@
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
<version>${jbossxb.version}</version>
- <!-- dependencies not in sync with jboss-4.2.2 -->
<exclusions>
<exclusion>
<groupId>jboss.common.core</groupId>
18 years
JBossWS SVN: r6522 - in stack/cxf/branches/tdiesler/trunk: modules/client and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 17:22:18 -0400 (Fri, 18 Apr 2008)
New Revision: 6522
Modified:
stack/cxf/branches/tdiesler/trunk/build.xml
stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml
stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml
stack/cxf/branches/tdiesler/trunk/pom.xml
Log:
Use jbossws-parent
Modified: stack/cxf/branches/tdiesler/trunk/build.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-18 20:20:41 UTC (rev 6521)
+++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-18 21:22:18 UTC (rev 6522)
@@ -95,13 +95,11 @@
<!-- ================================================================== -->
<target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${cxf.output.dir}"/>
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="clean"/>
+ </exec>
</target>
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${int.cxf.dir}/thirdparty"/>
- </target>
-
<target name="main" description="Executes the default target (most)." depends="most"/>
<target name="most" description="Builds almost everything." depends="jars,tests-main"/>
Modified: stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-18 20:20:41 UTC (rev 6521)
+++ stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-18 21:22:18 UTC (rev 6522)
@@ -14,7 +14,23 @@
<!-- Dependencies -->
<dependencies>
+
+ <!-- jbossws dependencies -->
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ </dependency>
+
+ <!-- CXF dependencies -->
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
</dependency>
@@ -42,22 +58,13 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
</dependency>
+
+ <!-- jboss provided -->
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
+ <groupId>jboss.common</groupId>
+ <artifactId>jboss-common</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- </dependency>
+
</dependencies>
</project>
Modified: stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-18 20:20:41 UTC (rev 6521)
+++ stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-18 21:22:18 UTC (rev 6522)
@@ -15,12 +15,40 @@
<!-- Dependencies -->
<dependencies>
+
+ <!-- jbossws dependencies -->
<dependency>
- <groupId>jboss.jaxr</groupId>
- <artifactId>juddi-service</artifactId>
- <type>sar</type>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <classifier>scripts</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss42</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss42</artifactId>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+
+ <!-- CXF dependencies -->
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
</dependency>
@@ -48,40 +76,19 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
</dependency>
+
+ <!-- jboss provided -->
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
+ <groupId>jboss.common</groupId>
+ <artifactId>jboss-common</artifactId>
</dependency>
+
+ <!-- transitve dependencies -->
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
+ <groupId>jboss.jaxr</groupId>
+ <artifactId>juddi-service</artifactId>
+ <type>sar</type>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <classifier>scripts</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss42</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss42</artifactId>
- <classifier>resources</classifier>
- <type>zip</type>
- <scope>provided</scope>
- </dependency>
</dependencies>
<!-- Plugins -->
Modified: stack/cxf/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-18 20:20:41 UTC (rev 6521)
+++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-18 21:22:18 UTC (rev 6522)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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>
<name>JBoss Web Services - Stack CXF</name>
@@ -20,8 +21,11 @@
<properties>
<cxf.version>2.0.5-incubator</cxf.version>
<jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version>
+ <jbossws.framework.version>${version}</jbossws.framework.version>
<jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss42.version>4.2.2-SNAPSHOT</jbossws.jboss42.version>
+ <jboss.common.version>1.2.1.GA</jboss.common.version>
+ <juddi.service.version>1.2.0.GA</juddi.service.version>
</properties>
<modules>
@@ -33,19 +37,53 @@
<!-- DependencyManagement -->
<dependencyManagement>
<dependencies>
+
+ <!-- jbossws dependencies -->
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ <version>${jbossws.common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>${jbossws.spi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <version>${jbossws.framework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <version>${version}</version>
+ <classifier>scripts</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss42</artifactId>
+ <version>${jbossws.jboss42.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss42</artifactId>
+ <version>${jbossws.jboss42.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+
+ <!-- provided apis -->
+ <dependency>
<groupId>javax.xml</groupId>
<artifactId>jaxrpc-api</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>
+
+ <!-- CXF dependencies -->
<dependency>
- <groupId>jboss.jaxr</groupId>
- <artifactId>juddi-service</artifactId>
- <version>1.2.0.GA</version>
- <type>sar</type>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
<version>${cxf.version}</version>
@@ -85,46 +123,22 @@
<artifactId>cxf-rt-ws-policy</artifactId>
<version>${cxf.version}</version>
</dependency>
+
+ <!-- jboss provided -->
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.2.5.GA</version>
+ <groupId>jboss.common</groupId>
+ <artifactId>jboss-common</artifactId>
+ <version>${jboss.common.version}</version>
<scope>provided</scope>
</dependency>
+
+ <!-- transitve dependencies -->
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- <version>${jbossws.common.version}</version>
+ <groupId>jboss.jaxr</groupId>
+ <artifactId>juddi-service</artifactId>
+ <version>${juddi.service.version}</version>
+ <type>sar</type>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <version>${version}</version>
- <classifier>scripts</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss42</artifactId>
- <version>${jbossws.jboss42.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss42</artifactId>
- <version>${jbossws.jboss42.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- <version>${jbossws.spi.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
18 years
JBossWS SVN: r6521 - maven/parent/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 16:20:41 -0400 (Fri, 18 Apr 2008)
New Revision: 6521
Added:
maven/parent/trunk/.classpath
maven/parent/trunk/.project
Modified:
maven/parent/trunk/
Log:
eclipse classpath
Property changes on: maven/parent/trunk
___________________________________________________________________
Name: svn:ignore
+ target
Added: maven/parent/trunk/.classpath
===================================================================
--- maven/parent/trunk/.classpath (rev 0)
+++ maven/parent/trunk/.classpath 2008-04-18 20:20:41 UTC (rev 6521)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: maven/parent/trunk/.project
===================================================================
--- maven/parent/trunk/.project (rev 0)
+++ maven/parent/trunk/.project 2008-04-18 20:20:41 UTC (rev 6521)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbossws-parent</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
18 years
JBossWS SVN: r6520 - container/jboss42/branches/jbossws-jboss422.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 16:18:23 -0400 (Fri, 18 Apr 2008)
New Revision: 6520
Modified:
container/jboss42/branches/jbossws-jboss422/pom.xml
Log:
Use jbossws-parent
Modified: container/jboss42/branches/jbossws-jboss422/pom.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-18 20:18:20 UTC (rev 6519)
+++ container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-18 20:18:23 UTC (rev 6520)
@@ -8,17 +8,11 @@
<version>4.2.2-SNAPSHOT</version>
- <organization>
- <name>JBoss, a division of Red Hat</name>
- <url>http://www.jboss.org</url>
- </organization>
- <url>http://maven.apache.org</url>
-
<!-- Parent -->
<parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>3</version>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<!-- Properties -->
@@ -219,26 +213,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>false</showDeprecation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
</plugins>
</build>
18 years
JBossWS SVN: r6519 - 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-18 16:18:20 -0400 (Fri, 18 Apr 2008)
New Revision: 6519
Modified:
spi/trunk/pom.xml
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/ExtensibleWebServiceContext.java
Log:
Use jbossws-parent
Modified: spi/trunk/pom.xml
===================================================================
--- spi/trunk/pom.xml 2008-04-18 20:18:13 UTC (rev 6518)
+++ spi/trunk/pom.xml 2008-04-18 20:18:20 UTC (rev 6519)
@@ -9,25 +9,27 @@
<version>3.0.0-SNAPSHOT</version>
- <organization>
- <name>JBoss, a division of Red Hat</name>
- <url>http://www.jboss.org</url>
- </organization>
- <url>http://maven.apache.org</url>
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <!-- Properties -->
+ <properties>
+ <dom4j.version>1.6.1</dom4j.version>
+ <getopt.version>1.0.13</getopt.version>
+ <jboss.common.version>1.2.1.GA</jboss.common.version>
+ <jboss.microcontainer.version>1.0.2</jboss.microcontainer.version>
+ <jbossxb.version>1.0.0.SP1</jbossxb.version>
+ </properties>
+
<!-- Dependencies -->
<dependencies>
+
+ <!-- provided apis -->
<dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
- <groupId>gnu-getopt</groupId>
- <artifactId>getopt</artifactId>
- <version>1.0.13</version>
- </dependency>
- <dependency>
<groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId>
<version>3.0</version>
@@ -51,38 +53,67 @@
<version>2.1</version>
<scope>provided</scope>
</dependency>
+
+ <!-- jboss provided -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
+ <groupId>jboss.common</groupId>
+ <artifactId>jboss-common</artifactId>
+ <version>${jboss.common.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-microcontainer</artifactId>
+ <version>${jboss.microcontainer.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>${jbossxb.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss.common.core</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.logging.log4j</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- transitive dependencies -->
+ <dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.0</version>
- <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>2.0.5.GA</version>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>${dom4j.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>2.0.0.Beta4</version>
- <scope>provided</scope>
+ <groupId>gnu-getopt</groupId>
+ <artifactId>getopt</artifactId>
+ <version>${getopt.version}</version>
</dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
- <!-- Parent -->
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>3</version>
- </parent>
-
<!-- Plugins -->
<build>
<resources>
@@ -93,25 +124,6 @@
</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-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
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-18 20:18:13 UTC (rev 6518)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/ExtensibleWebServiceContext.java 2008-04-18 20:18:20 UTC (rev 6519)
@@ -22,6 +22,7 @@
package org.jboss.wsf.spi.invocation;
import java.security.Principal;
+import java.util.Collection;
import javax.xml.ws.EndpointReference;
import javax.xml.ws.WebServiceContext;
@@ -29,6 +30,7 @@
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
@@ -66,4 +68,14 @@
{
throw new WebServiceException("Not implemented");
}
+
+ public EndpointReference getEndpointReference(Element... arg0)
+ {
+ throw new WebServiceException("Not implemented");
+ }
+
+ public <T extends EndpointReference> T getEndpointReference(Class<T> arg0, Element... arg1)
+ {
+ throw new WebServiceException("Not implemented");
+ }
}
\ No newline at end of file
18 years
JBossWS SVN: r6518 - in stack/cxf/branches/tdiesler/trunk: modules/server and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 16:18:13 -0400 (Fri, 18 Apr 2008)
New Revision: 6518
Modified:
stack/cxf/branches/tdiesler/trunk/.classpath
stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml
stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml
stack/cxf/branches/tdiesler/trunk/pom.xml
stack/cxf/branches/tdiesler/trunk/profiles-example.xml
Log:
Use jbossws-parent
Modified: stack/cxf/branches/tdiesler/trunk/.classpath
===================================================================
--- stack/cxf/branches/tdiesler/trunk/.classpath 2008-04-18 20:18:04 UTC (rev 6517)
+++ stack/cxf/branches/tdiesler/trunk/.classpath 2008-04-18 20:18:13 UTC (rev 6518)
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="src" output="modules/server/target/classes" path="modules/server/src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="modules/server/src/main/resources/jbossws-cxf-server.jar" path="modules/server/src/main/resources/jbossws-cxf-server.jar"/>
+ <classpathentry excluding="**" kind="src" output="modules/server/src/main/resources/jbossws-cxf.sar" path="modules/server/src/main/resources/jbossws-cxf.sar"/>
+ <classpathentry kind="src" output="modules/client/target/classes" path="modules/client/src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="modules/client/src/main/resources" path="modules/client/src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Modified: stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-18 20:18:04 UTC (rev 6517)
+++ stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-18 20:18:13 UTC (rev 6518)
@@ -73,12 +73,14 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss42</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss42</artifactId>
<classifier>resources</classifier>
<type>zip</type>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-18 20:18:04 UTC (rev 6517)
+++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-18 20:18:13 UTC (rev 6518)
@@ -94,17 +94,27 @@
</activation>
<properties>
<jboss.version>4.2.2.GA</jboss.version>
+ <jbossws.integration.target>jboss422</jbossws.integration.target>
+ <!-- versions defined in build/build-thirdparty.xml -->
+ <jboss.remoting.version>2.2.2.SP1</jboss.remoting.version>
+ <jboss.serialization.version>1.0.3.GA</jboss.serialization.version>
</properties>
<dependencies>
<dependency>
+ <groupId>org.jboss.client</groupId>
+ <artifactId>jbossall-client</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <!--
+ <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-serialization</artifactId>
- <version>1.0.3.GA</version>
+ <version>${jboss.serialization.version}</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-remoting</artifactId>
- <version>2.2.2.SP1</version>
+ <version>${jboss.remoting.version}</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
@@ -126,30 +136,27 @@
<artifactId>jbosssx-client</artifactId>
<version>${jboss.version}</version>
</dependency>
+ -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <artifactId>jbossws-cxf-client</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-cxf-client</artifactId>
- <version>${version}</version>
+ <artifactId>jbossws-common</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
- <version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss42</artifactId>
- <version>4.2.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
- <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: stack/cxf/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-18 20:18:04 UTC (rev 6517)
+++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-18 20:18:13 UTC (rev 6518)
@@ -9,23 +9,19 @@
<version>3.0.2-SNAPSHOT</version>
- <organization>
- <name>JBoss, a division of Red Hat</name>
- <url>http://www.jboss.org</url>
- </organization>
- <url>http://maven.apache.org</url>
-
<!-- Parent -->
<parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>3</version>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<!-- Properties -->
<properties>
- <jboss.integration.target>jboss422</jboss.integration.target>
- <cxf-version>2.0.5-incubator</cxf-version>
+ <cxf.version>2.0.5-incubator</cxf.version>
+ <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version>
+ <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version>
+ <jbossws.jboss42.version>4.2.2-SNAPSHOT</jbossws.jboss42.version>
</properties>
<modules>
@@ -52,42 +48,42 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
@@ -98,7 +94,7 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-common</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>${jbossws.common.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
@@ -115,19 +111,19 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss42</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>${jbossws.jboss42.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss42</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>${jbossws.jboss42.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>${jbossws.spi.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -172,4 +168,4 @@
<layout>legacy</layout>
</repository>
</repositories>
-</project>
\ No newline at end of file
+</project>
Modified: stack/cxf/branches/tdiesler/trunk/profiles-example.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-18 20:18:04 UTC (rev 6517)
+++ stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-18 20:18:13 UTC (rev 6518)
@@ -9,7 +9,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
- <jboss.integration.target>jboss422</jboss.integration.target>
+ <jbossws.integration.target>jboss422</jbossws.integration.target>
<jboss421.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA</jboss421.home>
<jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
<jboss423.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA</jboss423.home>
18 years
JBossWS SVN: r6517 - common/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 16:18:04 -0400 (Fri, 18 Apr 2008)
New Revision: 6517
Modified:
common/trunk/pom.xml
Log:
Use jbossws-parent
Modified: common/trunk/pom.xml
===================================================================
--- common/trunk/pom.xml 2008-04-18 20:17:59 UTC (rev 6516)
+++ common/trunk/pom.xml 2008-04-18 20:18:04 UTC (rev 6517)
@@ -9,50 +9,72 @@
<version>3.0.0-SNAPSHOT</version>
- <organization>
- <name>JBoss, a division of Red Hat</name>
- <url>http://www.jboss.org</url>
- </organization>
- <url>http://maven.apache.org</url>
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
<!-- Properties -->
<properties>
<jbossws.spi>3.0.0-SNAPSHOT</jbossws.spi>
+ <jboss.common.version>1.2.1.GA</jboss.common.version>
+ <jboss.microcontainer.version>1.0.2</jboss.microcontainer.version>
</properties>
<!-- Dependencies -->
<dependencies>
+
+ <!-- jbossws dependencies -->
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>${jbossws.spi}</version>
+ </dependency>
+
+ <!-- provided apis -->
+ <dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<version>2.1</version>
<scope>provided</scope>
</dependency>
+
+ <!-- jboss provided -->
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.7.0</version>
+ <groupId>jboss.common</groupId>
+ <artifactId>jboss-common</artifactId>
+ <version>${jboss.common.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>2.0.0.Beta4</version>
+ <artifactId>jboss-dependency</artifactId>
+ <version>${jboss.microcontainer.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- <version>${jbossws.spi}</version>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-microcontainer</artifactId>
+ <version>${jboss.microcontainer.version}</version>
+ <scope>provided</scope>
</dependency>
+
+ <!-- transitve dependencies -->
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+
</dependencies>
- <!-- Parent -->
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>3</version>
- </parent>
-
<!-- Plugins -->
<build>
<resources>
@@ -64,25 +86,6 @@
</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-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
18 years
JBossWS SVN: r6516 - framework/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 16:17:59 -0400 (Fri, 18 Apr 2008)
New Revision: 6516
Modified:
framework/trunk/pom.xml
Log:
Use jbossws-parent
Modified: framework/trunk/pom.xml
===================================================================
--- framework/trunk/pom.xml 2008-04-18 19:56:01 UTC (rev 6515)
+++ framework/trunk/pom.xml 2008-04-18 20:17:59 UTC (rev 6516)
@@ -9,28 +9,38 @@
<version>3.0.2-SNAPSHOT</version>
- <organization>
- <name>JBoss, a division of Red Hat</name>
- <url>http://www.jboss.org</url>
- </organization>
- <url>http://maven.apache.org</url>
-
<!-- Parent -->
<parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>3</version>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<!-- Properties -->
<properties>
- <jbossws-common>3.0.0-SNAPSHOT</jbossws-common>
- <jbossws-spi>3.0.0-SNAPSHOT</jbossws-spi>
+ <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version>
+ <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version>
+ <jboss.common.version>1.2.1.GA</jboss.common.version>
+ <jbossxb.version>1.0.0.SP1</jbossxb.version>
</properties>
<!-- Dependencies -->
<dependencies>
+
+ <!-- jbossws dependencies -->
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ <version>${jbossws.common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>${jbossws.spi.version}</version>
+ </dependency>
+
+ <!-- provided apis -->
+ <dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
<version>1.0</version>
@@ -60,27 +70,41 @@
<version>2.1</version>
<scope>provided</scope>
</dependency>
+
+ <!-- jboss provided -->
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- <version>${jbossws-common}</version>
+ <groupId>jboss.common</groupId>
+ <artifactId>jboss-common</artifactId>
+ <version>${jboss.common.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- <version>${jbossws-spi}</version>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
- <version>2.0.0.CR8</version>
+ <version>${jbossxb.version}</version>
+ <!-- dependencies not in sync with jboss-4.2.2 -->
+ <exclusions>
+ <exclusion>
+ <groupId>jboss.common.core</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.logging.log4j</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
<scope>provided</scope>
</dependency>
+
+ <!-- transitve dependencies -->
<dependency>
<groupId>tjws</groupId>
<artifactId>webserver</artifactId>
<version>1.3.3</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
@@ -142,23 +166,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
</plugins>
</build>
18 years
JBossWS SVN: r6515 - maven and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 15:56:01 -0400 (Fri, 18 Apr 2008)
New Revision: 6515
Added:
maven/
maven/parent/
maven/parent/trunk/
maven/parent/trunk/pom.xml
Log:
Add jbossws-parent
Copied: maven/parent/trunk/pom.xml (from rev 6514, spi/trunk/pom.xml)
===================================================================
--- maven/parent/trunk/pom.xml (rev 0)
+++ maven/parent/trunk/pom.xml 2008-04-18 19:56:01 UTC (rev 6515)
@@ -0,0 +1,88 @@
+<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>
+
+ <name>JBoss Web Services</name>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <version>1.0-SNAPSHOT</version>
+
+ <organization>
+ <name>JBoss, a division of Red Hat</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+
+ <url>http://www.jboss.org/jbossws</url>
+
+ <prerequisites>
+ <maven>2.0</maven>
+ </prerequisites>
+
+ <!-- IssueManagement -->
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.jboss.org/jira/browse/JBWS</url>
+ </issueManagement>
+
+ <!-- licenses -->
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+
+ <!-- Plugins -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <optimize>true</optimize>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- distributionManagement -->
+ <distributionManagement>
+ <repository>
+ <!-- Copy the distribution jar file to a local checkout of the maven repository
+ - This variable can be set in $MAVEN_HOME/conf/settings.xml -->
+ <id>repository.jboss.org</id>
+ <url>file://${maven.repository.root}</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ </snapshotRepository>
+ </distributionManagement>
+</project>
18 years