Author: thomas.diesler(a)jboss.com Date: 2008-04-30 16:32:06 -0400 (Wed, 30 Apr 2008) New Revision: 6821 Added: stack/native/branches/tdiesler/trunk/modules/core/src/main/resources/ stack/native/branches/tdiesler/trunk/modules/core/src/main/resources/META-INF/ stack/native/branches/tdiesler/trunk/modules/core/src/main/resources/dtd/ stack/native/branches/tdiesler/trunk/modules/core/src/main/resources/schema/ Removed: stack/native/branches/tdiesler/trunk/src/main/resources/dtd/ stack/native/branches/tdiesler/trunk/src/main/resources/jbossws-core.jar/ stack/native/branches/tdiesler/trunk/src/main/resources/schema/ Modified: stack/native/branches/tdiesler/trunk/.classpath stack/native/branches/tdiesler/trunk/modules/core/pom.xml stack/native/branches/tdiesler/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java stack/native/branches/tdiesler/trunk/modules/jaxrpc/pom.xml stack/native/branches/tdiesler/trunk/modules/jaxws-ext/pom.xml stack/native/branches/tdiesler/trunk/modules/jaxws/pom.xml stack/native/branches/tdiesler/trunk/modules/saaj/pom.xml stack/native/branches/tdiesler/trunk/pom.xml Log: Modified: stack/native/branches/tdiesler/trunk/.classpath =================================================================== --- stack/native/branches/tdiesler/trunk/.classpath 2008-04-30 18:50:34 UTC (rev 6820) +++ stack/native/branches/tdiesler/trunk/.classpath 2008-04-30 20:32:06 UTC (rev 6821) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="modules/jaxrpc/src/main/java"/> + <classpathentry kind="src" path="modules/core/src/main/java"/> <classpathentry kind="src" path="modules/jaxws-ext/src/main/java"/> <classpathentry kind="src" path="modules/jaxws/src/main/java"/> <classpathentry kind="src" path="modules/saaj/src/main/java"/> Modified: stack/native/branches/tdiesler/trunk/modules/core/pom.xml =================================================================== --- stack/native/branches/tdiesler/trunk/modules/core/pom.xml 2008-04-30 18:50:34 UTC (rev 6820) +++ stack/native/branches/tdiesler/trunk/modules/core/pom.xml 2008-04-30 20:32:06 UTC (rev 6821) @@ -8,7 +8,7 @@ <!-- Parent --> <parent> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> <version>3.0.2-SNAPSHOT</version> </parent> @@ -16,15 +16,116 @@ <!-- Dependencies --> <dependencies> <dependency> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-jaxws-ext</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-jaxrpc</artifactId> <version>${project.version}</version> </dependency> + + <!-- provided apis --> + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>provided</scope> + </dependency> + + <!-- jboss provided --> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + <scope>provided</scope> + </dependency> + + <!-- transitve dependencies --> + <dependency> + <groupId>com.sun.xml.fastinfoset</groupId> + <artifactId>FastInfoset</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-tools</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.jettison</groupId> + <artifactId>jettison</artifactId> + </dependency> + <dependency> + <groupId>jboss.jaxbintros</groupId> + <artifactId>jboss-jaxb-intros</artifactId> + </dependency> + <dependency> + <groupId>wscommons-policy</groupId> + <artifactId>policy</artifactId> + </dependency> + <dependency> + <groupId>woodstox</groupId> + <artifactId>wstx-lgpl</artifactId> + </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </dependency> + <dependency> + <groupId>xml-security</groupId> + <artifactId>xmlsec</artifactId> + </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <showDeprecation>false</showDeprecation> + <showWarnings>false</showWarnings> + </configuration> + </plugin> + + </plugins> + + </build> </project> Modified: stack/native/branches/tdiesler/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java =================================================================== --- stack/native/branches/tdiesler/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2008-04-30 18:50:34 UTC (rev 6820) +++ stack/native/branches/tdiesler/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2008-04-30 20:32:06 UTC (rev 6821) @@ -50,7 +50,6 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import org.apache.xml.utils.DefaultErrorHandler; import org.jboss.logging.Logger; import org.jboss.util.naming.Util; import org.jboss.ws.WSException; @@ -63,6 +62,7 @@ import org.jboss.wsf.common.DOMWriter; import org.jboss.wsf.common.utils.UUIDGenerator; import org.w3c.dom.Element; +import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; @@ -537,7 +537,7 @@ factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schema...;, is); DocumentBuilder docBuilder = factory.newDocumentBuilder(); - DefaultErrorHandler errorHandler = new Validator(); + ErrorHandler errorHandler = new Validator(); docBuilder.setErrorHandler(errorHandler); docBuilder.parse(new InputSource(new StringReader(msg))); log.info("Document validated!"); @@ -672,7 +672,7 @@ } - private class Validator extends DefaultErrorHandler + private class Validator implements ErrorHandler { public void error(SAXParseException exception) throws SAXException { Copied: stack/native/branches/tdiesler/trunk/modules/core/src/main/resources/META-INF (from rev 6817, stack/native/branches/tdiesler/trunk/src/main/resources/jbossws-core.jar/META-INF) Copied: stack/native/branches/tdiesler/trunk/modules/core/src/main/resources/dtd (from rev 6817, stack/native/branches/tdiesler/trunk/src/main/resources/dtd) Copied: stack/native/branches/tdiesler/trunk/modules/core/src/main/resources/schema (from rev 6817, stack/native/branches/tdiesler/trunk/src/main/resources/schema) Modified: stack/native/branches/tdiesler/trunk/modules/jaxrpc/pom.xml =================================================================== --- stack/native/branches/tdiesler/trunk/modules/jaxrpc/pom.xml 2008-04-30 18:50:34 UTC (rev 6820) +++ stack/native/branches/tdiesler/trunk/modules/jaxrpc/pom.xml 2008-04-30 20:32:06 UTC (rev 6821) @@ -8,7 +8,7 @@ <!-- Parent --> <parent> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> <version>3.0.2-SNAPSHOT</version> </parent> @@ -16,7 +16,7 @@ <!-- Dependencies --> <dependencies> <dependency> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-saaj</artifactId> <version>${project.version}</version> </dependency> Modified: stack/native/branches/tdiesler/trunk/modules/jaxws/pom.xml =================================================================== --- stack/native/branches/tdiesler/trunk/modules/jaxws/pom.xml 2008-04-30 18:50:34 UTC (rev 6820) +++ stack/native/branches/tdiesler/trunk/modules/jaxws/pom.xml 2008-04-30 20:32:06 UTC (rev 6821) @@ -8,7 +8,7 @@ <!-- Parent --> <parent> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> <version>3.0.2-SNAPSHOT</version> </parent> @@ -16,7 +16,7 @@ <!-- Dependencies --> <dependencies> <dependency> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-saaj</artifactId> <version>${project.version}</version> </dependency> Modified: stack/native/branches/tdiesler/trunk/modules/jaxws-ext/pom.xml =================================================================== --- stack/native/branches/tdiesler/trunk/modules/jaxws-ext/pom.xml 2008-04-30 18:50:34 UTC (rev 6820) +++ stack/native/branches/tdiesler/trunk/modules/jaxws-ext/pom.xml 2008-04-30 20:32:06 UTC (rev 6821) @@ -8,7 +8,7 @@ <!-- Parent --> <parent> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> <version>3.0.2-SNAPSHOT</version> </parent> @@ -16,7 +16,7 @@ <!-- Dependencies --> <dependencies> <dependency> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-jaxws</artifactId> <version>${project.version}</version> </dependency> Modified: stack/native/branches/tdiesler/trunk/modules/saaj/pom.xml =================================================================== --- stack/native/branches/tdiesler/trunk/modules/saaj/pom.xml 2008-04-30 18:50:34 UTC (rev 6820) +++ stack/native/branches/tdiesler/trunk/modules/saaj/pom.xml 2008-04-30 20:32:06 UTC (rev 6821) @@ -8,7 +8,7 @@ <!-- Parent --> <parent> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> <version>3.0.2-SNAPSHOT</version> </parent> Modified: stack/native/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/native/branches/tdiesler/trunk/pom.xml 2008-04-30 18:50:34 UTC (rev 6820) +++ stack/native/branches/tdiesler/trunk/pom.xml 2008-04-30 20:32:06 UTC (rev 6821) @@ -16,7 +16,7 @@ <modelVersion>4.0.0</modelVersion> <name>JBoss Web Services - Stack Native</name> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> <packaging>pom</packaging> @@ -35,6 +35,7 @@ <module>modules/jaxrpc</module> <module>modules/jaxws</module> <module>modules/jaxws-ext</module> + <module>modules/core</module> </modules> <!-- Properties --> @@ -46,12 +47,21 @@ <jbossws.jboss423.version>3.0.0-SNAPSHOT</jbossws.jboss423.version> <jbossws.jboss500.version>3.0.0-SNAPSHOT</jbossws.jboss500.version> <jbossws.jboss501.version>3.0.0-SNAPSHOT</jbossws.jboss501.version> + <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version> + <javassist.version>3.6.0.GA</javassist.version> <jboss.common.version>1.2.1.GA</jboss.common.version> + <jboss.jaxbintros.version>1.0.0.beta2</jboss.jaxbintros.version> + <jboss.microcontainer.version>2.0.0.Beta11</jboss.microcontainer.version> + <jboss.remoting.version>2.4.0.CR1</jboss.remoting.version> <jaxb.api.version>2.1</jaxb.api.version> <jaxb.impl.version>2.1.6</jaxb.impl.version> <juddi.service.version>1.2.0.GA</juddi.service.version> <sun.fastinfoset.version>1.2.2</sun.fastinfoset.version> + <sun.jaxws.version>2.1.3</sun.jaxws.version> <woodstox.version>3.1.1</woodstox.version> + <wscommons.policy.version>1.0</wscommons.policy.version> + <xmlsec.version>1.3.0</xmlsec.version> + <xalan.version>2.7.0</xalan.version> </properties> <!-- DependencyManagement --> @@ -157,6 +167,18 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> @@ -165,19 +187,48 @@ <!-- jboss provided --> <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>${javassist.version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>jboss.common</groupId> <artifactId>jboss-common</artifactId> <version>${jboss.common.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + <version>${jboss.remoting.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + <version>${jboss.microcontainer.version}</version> + <scope>provided</scope> + </dependency> <!-- transitve dependencies --> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>${jaxb.api.version}</version> + <groupId>com.sun.xml.fastinfoset</groupId> + <artifactId>FastInfoset</artifactId> + <version>${sun.fastinfoset.version}</version> </dependency> <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-tools</artifactId> + <version>${sun.jaxws.version}</version> + <exclusions> + <exclusion> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-rt</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> <version>${jaxb.impl.version}</version> @@ -188,11 +239,46 @@ <version>${jaxb.impl.version}</version> </dependency> <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb.api.version}</version> + </dependency> + <dependency> + <groupId>jboss.jaxbintros</groupId> + <artifactId>jboss-jaxb-intros</artifactId> + <version>${jboss.jaxbintros.version}</version> + </dependency> + <dependency> <groupId>jboss.jaxr</groupId> <artifactId>juddi-service</artifactId> <version>${juddi.service.version}</version> <type>sar</type> </dependency> + <dependency> + <groupId>org.codehaus.jettison</groupId> + <artifactId>jettison</artifactId> + <version>${codehaus.jettison.version}</version> + </dependency> + <dependency> + <groupId>wscommons-policy</groupId> + <artifactId>policy</artifactId> + <version>${wscommons.policy.version}</version> + </dependency> + <dependency> + <groupId>woodstox</groupId> + <artifactId>wstx-lgpl</artifactId> + <version>${woodstox.version}</version> + </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>${xalan.version}</version> + </dependency> + <dependency> + <groupId>xml-security</groupId> + <artifactId>xmlsec</artifactId> + <version>${xmlsec.version}</version> + </dependency> </dependencies> </dependencyManagement> @@ -304,16 +390,16 @@ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> <!-- - Cannot bind to lifecycle with multiple modules - http://jira.codehaus.org/browse/MASSEMBLY-319 + Cannot bind to lifecycle with multiple modules + http://jira.codehaus.org/browse/MASSEMBLY-319 <executions> - <execution> - <id>build-deploy-artifacts</id> - <phase>package</phase> - <goals> - <goal>directory-inline</goal> - </goals> - </execution> + <execution> + <id>build-deploy-artifacts</id> + <phase>package</phase> + <goals> + <goal>directory-inline</goal> + </goals> + </execution> </executions--> <descriptors> <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor>