Author: jeff.yuchang Date: 2010-01-22 10:35:44 -0500 (Fri, 22 Jan 2010) New Revision: 471 Modified: branches/ODE/ODE-2.0-maven/bpel-store/pom.xml branches/ODE/ODE-2.0-maven/jbi/pom.xml branches/ODE/ODE-2.0-maven/jbi/src/main/assembly/bin.xml branches/ODE/ODE-2.0-maven/pom.xml Log: * update for jbi distribution built. tested against smx 3.3. Modified: branches/ODE/ODE-2.0-maven/bpel-store/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/bpel-store/pom.xml 2010-01-22 04:04:07 UTC (rev 470) +++ branches/ODE/ODE-2.0-maven/bpel-store/pom.xml 2010-01-22 15:35:44 UTC (rev 471) @@ -147,7 +147,7 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> + <!--dependency> <groupId>net.sf.saxon</groupId> <artifactId>saxon</artifactId> <scope>test</scope> @@ -166,7 +166,7 @@ <groupId>net.sf.saxon</groupId> <artifactId>saxon-xqj</artifactId> <scope>test</scope> - </dependency> + </dependency--> <dependency> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> Modified: branches/ODE/ODE-2.0-maven/jbi/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/jbi/pom.xml 2010-01-22 04:04:07 UTC (rev 470) +++ branches/ODE/ODE-2.0-maven/jbi/pom.xml 2010-01-22 15:35:44 UTC (rev 471) @@ -43,10 +43,32 @@ <dependency> <groupId>org.apache.ode</groupId> <artifactId>ode-bpel-api</artifactId> - </dependency> + </dependency> <dependency> <groupId>org.apache.ode</groupId> <artifactId>ode-bpel-compiler</artifactId> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + <exclusion> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + </exclusion> + <exclusion> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + <exclusion> + <groupId>xom</groupId> + <artifactId>xom</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.ode</groupId> @@ -59,6 +81,20 @@ <dependency> <groupId>org.apache.ode</groupId> <artifactId>ode-il-common</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.components</groupId> + <artifactId>geronimo-connector</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.components</groupId> + <artifactId>geronimo-transaction</artifactId> + </exclusion> + <exclusion> + <groupId>org.jencks</groupId> + <artifactId>jencks</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.ode</groupId> @@ -71,6 +107,24 @@ <dependency> <groupId>org.apache.ode</groupId> <artifactId>ode-bpel-store</artifactId> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </exclusion> + <exclusion> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jms_1.1_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jpa_1.0_spec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.ode</groupId> @@ -79,19 +133,84 @@ <dependency> <groupId>org.apache.ode</groupId> <artifactId>ode-utils</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-adb</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-codegen</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-kernel</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-java2wsdl</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-jibx</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-saaj</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-xmlbeans</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-javamail_1.4_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>wstx-asl</artifactId> + </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-activation_1.1_spec</artifactId> + </exclusion> + <exclusion> + <groupId>xpp3</groupId> + <artifactId>xpp3_min</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.ode</groupId> <artifactId>ode-runtimes</artifactId> </dependency> <dependency> + <groupId>org.apache.ode</groupId> + <artifactId>ode-bpel-ql</artifactId> + </dependency> + <dependency> + <groupId>org.apache.ode</groupId> + <artifactId>ode-jacob-ap</artifactId> + </dependency> + <dependency> <groupId>org.apache.servicemix.specs</groupId> <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId> <version>${jbi.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.ode</groupId> <artifactId>ode-dao-jpa</artifactId> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.derby</groupId> @@ -100,27 +219,32 @@ <dependency> <groupId>org.apache.ode</groupId> <artifactId>ode-dao-hibernate</artifactId> - <scope>test</scope> + <exclusions> + <exclusion> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.ode</groupId> <artifactId>ode-bpel-api-jca</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.ode</groupId> <artifactId>ode-jca-ra</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.ode</groupId> <artifactId>ode-jca-server</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.ode</groupId> <artifactId>ode-jacob</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> @@ -186,6 +310,24 @@ <groupId>tranql</groupId> <artifactId>tranql-connector</artifactId> <version>${tranql.version}</version> + <exclusions> + <exclusion> + <groupId>geronimo-spec</groupId> + <artifactId>geronimo-spec-j2ee-connector</artifactId> + </exclusion> + <exclusion> + <groupId>geronimo-spec</groupId> + <artifactId>geronimo-spec-jta</artifactId> + </exclusion> + <exclusion> + <groupId>regexp</groupId> + <artifactId>regexp</artifactId> + </exclusion> + <exclusion> + <groupId>net.java.dev.javacc</groupId> + <artifactId>javacc</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>tranql</groupId> @@ -202,6 +344,41 @@ <groupId>commons-primitives</groupId> <artifactId>commons-primitives</artifactId> </dependency> + <dependency> + <groupId>backport-util-concurrent</groupId> + <artifactId>backport-util-concurrent</artifactId> + </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-ejb_2.1_spec</artifactId> + </dependency> + + <!-- This is a way to specify the global exclusion in the dependency tree --> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>provided</scope> + </dependency> </dependencies> Modified: branches/ODE/ODE-2.0-maven/jbi/src/main/assembly/bin.xml =================================================================== --- branches/ODE/ODE-2.0-maven/jbi/src/main/assembly/bin.xml 2010-01-22 04:04:07 UTC (rev 470) +++ branches/ODE/ODE-2.0-maven/jbi/src/main/assembly/bin.xml 2010-01-22 15:35:44 UTC (rev 471) @@ -60,7 +60,8 @@ <dependencySet> <outputDirectory>/lib</outputDirectory> <includes> - <include>ant:ant</include> + <include>ant:ant</include> + <include>org.apache.ode:ode-jbi</include> <include>org.apache.ode:ode-bpel-api</include> <include>org.apache.ode:ode-bpel-api-jca</include> <include>org.apache.ode:ode-bpel-compiler</include> @@ -108,7 +109,9 @@ <include>wsdl4j:wsdl4j</include> <include>tranql:tranql-connector</include> <include>org.apache.ode:xalan</include> - <include>org.apache.xmlbeans:xmlbeans</include> + <include>org.apache.xmlbeans:xmlbeans</include> + <include>com.thoughtworks.xstream:xstream</include> + <include>axion:axion</include> </includes> </dependencySet> Modified: branches/ODE/ODE-2.0-maven/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/pom.xml 2010-01-22 04:04:07 UTC (rev 470) +++ branches/ODE/ODE-2.0-maven/pom.xml 2010-01-22 15:35:44 UTC (rev 471) @@ -77,7 +77,7 @@ <jencks.version>1.3</jencks.version> <jasper.version>4.2.20RC0</jasper.version> <log4j.version>1.2.15</log4j.version> - <saxon.version>9.x</saxon.version> + <saxon.version>9.1.0.8</saxon.version> <servicemix.version>3.3</servicemix.version> <slf4j.version>1.4.3</slf4j.version> <stax-api.version>1.0</stax-api.version> @@ -242,6 +242,11 @@ <name>ODE Maven2 repository</name> <url>http://pxe.intalio.org/public/maven2</url> </repository> + <repository> + <id>JBoss</id> + <name>JBoss Repository</name> + <url>http://repository.jboss.com/maven2/</url> + </repository> </repositories> <pluginRepositories>