[riftsaw-commits] riftsaw SVN: r452 - in branches/ODE/ODE-2.0-maven/jbi: src/main/assembly and 1 other directory.

Author: jeff.yuchang Date: 2010-01-11 05:46:56 -0500 (Mon, 11 Jan 2010) New Revision: 452 Modified: branches/ODE/ODE-2.0-maven/jbi/pom.xml branches/ODE/ODE-2.0-maven/jbi/src/main/assembly/bin.xml Log: * add maven-jbi-plugin for jbi.xml generation. Modified: branches/ODE/ODE-2.0-maven/jbi/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/jbi/pom.xml 2010-01-11 09:12:13 UTC (rev 451) +++ branches/ODE/ODE-2.0-maven/jbi/pom.xml 2010-01-11 10:46:56 UTC (rev 452) @@ -94,6 +94,10 @@ <artifactId>ode-dao-jpa</artifactId> </dependency> <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + </dependency> + <dependency> <groupId>org.apache.ode</groupId> <artifactId>ode-dao-hibernate</artifactId> <scope>test</scope> @@ -184,6 +188,12 @@ <version>${tranql.version}</version> </dependency> <dependency> + <groupId>tranql</groupId> + <artifactId>tranql-connector-derby-common</artifactId> + <version>${tranql.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>geronimo-spec</groupId> <artifactId>geronimo-spec-jms</artifactId> <version>${geronimo.specs.jms.version}</version> @@ -197,14 +207,45 @@ <build> <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <!-- FIXME: temporary skip it --> - <skipTests>true</skipTests> - </configuration> - </plugin> <plugin> + <groupId>org.apache.servicemix.tooling</groupId> + <artifactId>jbi-maven-plugin</artifactId> + <version>3.2.3</version> + <extensions>true</extensions> + <executions> + <execution> + <id>jbi-generation</id> + <phase>process-resources</phase> + <goals> + <goal>generate-jbi-component-descriptor</goal> + </goals> + <configuration> + <component>org.apache.ode.jbi.OdeComponent</component> + <bootstrap>org.apache.ode.jbi.OdeBootstrap</bootstrap> + <bootstrapClassLoaderDelegation>parent-first</bootstrapClassLoaderDelegation> + <componentClassLoaderDelegation>self-first</componentClassLoaderDelegation> + <type>service-engine</type> + <name>OdeBpelEngine</name> + <description>ODE JBI Integration Layer</description> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <!-- FIXME: temporary skip it --> + <skipTests>true</skipTests> + <systemProperties> + <property> + <name>java.naming.factory.initial</name> + <value>org.apache.xbean.spring.jndi.SpringInitialContextFactory</value> + </property> + </systemProperties> + </configuration> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <executions> 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-11 09:12:13 UTC (rev 451) +++ branches/ODE/ODE-2.0-maven/jbi/src/main/assembly/bin.xml 2010-01-11 10:46:56 UTC (rev 452) @@ -20,7 +20,7 @@ <assembly> <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> <id></id> - <includeBaseDirectory>true</includeBaseDirectory> + <includeBaseDirectory>false</includeBaseDirectory> <formats> <format>zip</format> </formats> @@ -33,13 +33,26 @@ <includes> <include>ode-jbi.properties</include> </includes> - </fileSet> - + </fileSet> + <fileSet> - <directory>src/main/resources</directory> - <outputDirectory>/resources</outputDirectory> - </fileSet> + <directory>target</directory> + <outputDirectory>/META-INF</outputDirectory> + <includes> + <include>jbi.xml</include> + </includes> + </fileSet> + + <fileSet> + <directory>${basedir}/../dao-jpa-db/target/derby</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + <fileSet> + <directory>${basedir}/../dao-hibernate-db/target/derby</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + </fileSets> <dependencySets> @@ -48,54 +61,54 @@ <outputDirectory>/lib</outputDirectory> <includes> <include>ant:ant</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> - <include>org.apache.ode:ode-bpel-connector</include> - <include>org.apache.ode:ode-bpel-dao</include> - <include>org.apache.ode:ode-il-common</include> - <include>org.apache.ode:ode-jca-ra</include> - <include>org.apache.ode:ode-jca-server</include> - <include>org.apache.ode:ode-runtimes</include> - <include>org.apache.ode:ode-bpel-ql</include> - <include>org.apache.ode:ode-engine</include> - <include>org.apache.ode:ode-scheduler-simple</include> - <include>org.apache.ode:ode-bpel-schemas</include> - <include>org.apache.ode:ode-bpel-store</include> - <include>org.apache.ode:ode-dao-hibernate</include> - <include>org.apache.ode:ode-dao-jpa</include> - <include>org.apache.ode:ode-jacob</include> - <include>org.apache.ode:ode-jacob-ap</include> - <include>org.apache.ode:ode-utils</include> - <include>org.apache.ws.commons.axiom:axiom-api</include> - <include>org.apache.ws.commons.axiom:axiom-impl</include> - <include>org.apache.ws.commons.axiom:axiom-dom</include> - <include>backport-util-concurrent:backport-util-concurrent</include> - <include>commons-codec:commons-codec</include> - <include>commons-collections:commons-collections</include> - <include>commons-dbcp:commons-dbcp</include> - <include>commons-lang:commons-lang</include> - <include>commons-pool:commons-pool</include> - <include>commons-primitives:commons-primitives</include> - <include>org.apache.derby:derby</include> - <include>org.apache.geronimo.specs:geronimo-ejb_2.1_spec</include> - <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include> - <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include> - <include>geronimo-spec:geronimo-spec-jms</include> - <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include> - <include>jaxen:jaxen</include> - <include>log4j:log4j</include> - <include>org.apache.openjpa:openjpa</include> - <include>javax.persistence:persistence-api</include> - <include>net.sourceforge.serp:serp</include> - <include>net.sf.saxon:saxon</include> - <include>net.sf.saxon:saxon-xpath</include> - <include>net.sf.saxon:saxon-dom</include> - <include>net.sf.saxon:saxon-xqj</include> - <include>wsdl4j:wsdl4j</include> - <include>tranql:tranql-connector</include> - <include>org.apache.ode:xalan</include> - <include>org.apache.xmlbeans:xmlbeans</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> + <include>org.apache.ode:ode-bpel-connector</include> + <include>org.apache.ode:ode-bpel-dao</include> + <include>org.apache.ode:ode-il-common</include> + <include>org.apache.ode:ode-jca-ra</include> + <include>org.apache.ode:ode-jca-server</include> + <include>org.apache.ode:ode-runtimes</include> + <include>org.apache.ode:ode-bpel-ql</include> + <include>org.apache.ode:ode-engine</include> + <include>org.apache.ode:ode-scheduler-simple</include> + <include>org.apache.ode:ode-bpel-schemas</include> + <include>org.apache.ode:ode-bpel-store</include> + <include>org.apache.ode:ode-dao-hibernate</include> + <include>org.apache.ode:ode-dao-jpa</include> + <include>org.apache.ode:ode-jacob</include> + <include>org.apache.ode:ode-jacob-ap</include> + <include>org.apache.ode:ode-utils</include> + <include>org.apache.ws.commons.axiom:axiom-api</include> + <include>org.apache.ws.commons.axiom:axiom-impl</include> + <include>org.apache.ws.commons.axiom:axiom-dom</include> + <include>backport-util-concurrent:backport-util-concurrent</include> + <include>commons-codec:commons-codec</include> + <include>commons-collections:commons-collections</include> + <include>commons-dbcp:commons-dbcp</include> + <include>commons-lang:commons-lang</include> + <include>commons-pool:commons-pool</include> + <include>commons-primitives:commons-primitives</include> + <include>org.apache.derby:derby</include> + <include>org.apache.geronimo.specs:geronimo-ejb_2.1_spec</include> + <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include> + <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include> + <include>geronimo-spec:geronimo-spec-jms</include> + <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include> + <include>jaxen:jaxen</include> + <include>log4j:log4j</include> + <include>org.apache.openjpa:openjpa</include> + <include>javax.persistence:persistence-api</include> + <include>net.sourceforge.serp:serp</include> + <include>net.sf.saxon:saxon</include> + <include>net.sf.saxon:saxon-xpath</include> + <include>net.sf.saxon:saxon-dom</include> + <include>net.sf.saxon:saxon-xqj</include> + <include>wsdl4j:wsdl4j</include> + <include>tranql:tranql-connector</include> + <include>org.apache.ode:xalan</include> + <include>org.apache.xmlbeans:xmlbeans</include> </includes> </dependencySet>