[gatein-commits] gatein SVN: r6042 - in components/wsrp/trunk: admin-gui and 9 other directories.

Author: chris.laprun(a)jboss.com Date: 2011-03-16 16:18:52 -0400 (Wed, 16 Mar 2011) New Revision: 6042 Modified: components/wsrp/trunk/admin-gui/pom.xml components/wsrp/trunk/common/pom.xml components/wsrp/trunk/consumer/pom.xml components/wsrp/trunk/jcr-impl/pom.xml components/wsrp/trunk/pom.xml components/wsrp/trunk/producer/pom.xml components/wsrp/trunk/test/pom.xml components/wsrp/trunk/test/src/main/java/org/gatein/wsrp/test/handler/MockSOAPBody.java components/wsrp/trunk/ws-security/jboss5/pom.xml components/wsrp/trunk/ws-security/wss/pom.xml components/wsrp/trunk/wsrp-producer-war/pom.xml Log: - GTNWSRP-210: Removed dependency on JBoss common. Added explicit dependencies that were previously gotten from GateIn common. Use provided scope whenever possible. Modified: components/wsrp/trunk/admin-gui/pom.xml =================================================================== --- components/wsrp/trunk/admin-gui/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/admin-gui/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -21,7 +21,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<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"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> @@ -82,11 +83,28 @@ </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>provided</scope> + </dependency> + + <!-- Tests --> + <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-consumer</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> Modified: components/wsrp/trunk/common/pom.xml =================================================================== --- components/wsrp/trunk/common/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/common/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -21,7 +21,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<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"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> @@ -44,6 +45,7 @@ <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> @@ -56,16 +58,24 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>javax.xml.soap</groupId> <artifactId>saaj-api</artifactId> + <scope>provided</scope> </dependency> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>com.google.collections</groupId> <artifactId>google-collections</artifactId> </dependency> @@ -73,10 +83,15 @@ <!-- tests --> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> + <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>test-framework</artifactId> <version>${project.version}</version> Modified: components/wsrp/trunk/consumer/pom.xml =================================================================== --- components/wsrp/trunk/consumer/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/consumer/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -21,7 +21,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<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"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> @@ -53,6 +54,7 @@ <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> @@ -71,12 +73,14 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> + <scope>provided</scope> </dependency> <!-- other dependencies --> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> + <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>commons-fileupload</groupId> @@ -99,9 +103,16 @@ </dependency> <dependency> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + </dependency> + + + <!-- Tests --> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.6</version> <scope>test</scope> </dependency> <dependency> @@ -110,6 +121,11 @@ <version>1.8.5</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> </dependencies> <!-- Ignore all classes in the org.gatein.wsrp.test packages as they are not tests --> Modified: components/wsrp/trunk/jcr-impl/pom.xml =================================================================== --- components/wsrp/trunk/jcr-impl/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/jcr-impl/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -37,17 +37,14 @@ <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-consumer</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-producer-lib</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-integration-api</artifactId> - <version>${project.version}</version> </dependency> <dependency> @@ -63,7 +60,20 @@ <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> + <scope>provided</scope> </dependency> + + <!-- Tests --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> \ No newline at end of file Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -48,7 +48,7 @@ <properties> <version.gatein.pc>2.3.0-Beta01</version.gatein.pc> - <version.gatein.common>2.0.4-Beta01</version.gatein.common> + <version.gatein.common>2.0.4-Beta02-SNAPSHOT</version.gatein.common> <version.gatein.wci>2.1.0-Beta01</version.gatein.wci> <version.jsf>1.2_12</version.jsf> Modified: components/wsrp/trunk/producer/pom.xml =================================================================== --- components/wsrp/trunk/producer/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/producer/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -21,7 +21,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<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"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> @@ -49,6 +50,7 @@ <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> @@ -66,6 +68,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>commons-fileupload</groupId> @@ -78,6 +81,7 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> + <scope>provided</scope> </dependency> <!-- tests --> @@ -89,7 +93,7 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> + <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> <dependency> @@ -98,6 +102,11 @@ <version>1.8.5</version> <scope>test</scope> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> Modified: components/wsrp/trunk/test/pom.xml =================================================================== --- components/wsrp/trunk/test/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/test/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -22,7 +22,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> @@ -42,19 +43,33 @@ <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-wsrp1-ws</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>javax.xml.soap</groupId> <artifactId>saaj-api</artifactId> + <scope>provided</scope> </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>provided</scope> + </dependency> </dependencies> Modified: components/wsrp/trunk/test/src/main/java/org/gatein/wsrp/test/handler/MockSOAPBody.java =================================================================== --- components/wsrp/trunk/test/src/main/java/org/gatein/wsrp/test/handler/MockSOAPBody.java 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/test/src/main/java/org/gatein/wsrp/test/handler/MockSOAPBody.java 2011-03-16 20:18:52 UTC (rev 6042) @@ -22,10 +22,15 @@ package org.gatein.wsrp.test.handler; -import org.jboss.util.xml.DOMUtils; +import org.w3c.dom.Document; import org.w3c.dom.Element; +import org.xml.sax.SAXException; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; import javax.xml.soap.SOAPBody; +import java.io.ByteArrayInputStream; import java.io.IOException; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; @@ -38,7 +43,23 @@ public class MockSOAPBody implements InvocationHandler { Element body; + private static DocumentBuilder BUILDER; + static + { + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + factory.setValidating(false); + factory.setNamespaceAware(true); + try + { + BUILDER = factory.newDocumentBuilder(); + } + catch (ParserConfigurationException e) + { + BUILDER = null; + } + } + public MockSOAPBody(Element body) { this.body = body; @@ -47,11 +68,24 @@ public static SOAPBody newInstance(String body) throws IOException { return (SOAPBody)Proxy.newProxyInstance(MockSOAPBody.class.getClassLoader(), new Class[]{SOAPBody.class}, - new MockSOAPBody(DOMUtils.parse(body))); + new MockSOAPBody(parse(body))); } public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { return method.invoke(body, args); } + + private static Element parse(String elementAsString) throws IOException + { + try + { + Document doc = BUILDER.parse(new ByteArrayInputStream(elementAsString.getBytes("UTF-8"))); + return doc.getDocumentElement(); + } + catch (SAXException e) + { + throw new IOException(e.toString()); + } + } } Modified: components/wsrp/trunk/ws-security/jboss5/pom.xml =================================================================== --- components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -50,6 +50,7 @@ <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> Modified: components/wsrp/trunk/ws-security/wss/pom.xml =================================================================== --- components/wsrp/trunk/ws-security/wss/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/ws-security/wss/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -50,6 +50,7 @@ <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId> Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-03-16 20:06:04 UTC (rev 6041) +++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-03-16 20:18:52 UTC (rev 6042) @@ -261,6 +261,7 @@ <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.pc</groupId>