Author: van.halbert Date: 2012-06-02 09:46:43 -0400 (Sat, 02 Jun 2012) New Revision: 4162 Modified: branches/7.7.x/connectors/connector-infinispan/pom.xml branches/7.7.x/connectors/connector-infinispan/src/assembly/kit.xml branches/7.7.x/connectors/connector-infinispan/src/main/ear/META-INF/jboss-app.xml Log: fixed the deployment Modified: branches/7.7.x/connectors/connector-infinispan/pom.xml =================================================================== --- branches/7.7.x/connectors/connector-infinispan/pom.xml 2012-06-02 03:16:47 UTC (rev 4161) +++ branches/7.7.x/connectors/connector-infinispan/pom.xml 2012-06-02 13:46:43 UTC (rev 4162) @@ -8,7 +8,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>connector-infinispan</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <!-- packaging>ear</packaging--> + <packaging>ear</packaging> <name>Infinispan Connector</name> <description>This connector reads data from a Infinispan cache</description> <properties> @@ -16,59 +16,62 @@ <version.hibernate.search>3.1.0.GA</version.hibernate.search> </properties> <dependencies> - + <dependency> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>translator-object</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>translator-object</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> <groupId>javax.resource</groupId> <artifactId>connector-api</artifactId> <version>1.5</version> <scope>provided</scope> </dependency> - - <dependency> - <groupId>org.infinispan</groupId> - <artifactId>infinispan-core</artifactId> - <version>${version.infinispan}</version> - </dependency> - <dependency> - <groupId>org.infinispan</groupId> - <artifactId>infinispan-client-hotrod</artifactId> - <version>${version.infinispan}</version> - </dependency> - - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging</artifactId> - <version>3.1.0.GA</version> - </dependency> - - <dependency> - <groupId>org.jboss.logmanager</groupId> - <artifactId>jboss-logmanager</artifactId> - <version>1.2.2.GA</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - <scope>test</scope> - </dependency> - - - + + <dependency> + <groupId>org.infinispan</groupId> + <artifactId>infinispan-core</artifactId> + <version>${version.infinispan}</version> + </dependency> + <dependency> + <groupId>org.infinispan</groupId> + <artifactId>infinispan-client-hotrod</artifactId> + <version>${version.infinispan}</version> + </dependency> + + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + <version>3.1.0.GA</version> + </dependency> + + <dependency> + <groupId>org.jboss.logmanager</groupId> + <artifactId>jboss-logmanager</artifactId> + <version>1.2.2.GA</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + <scope>test</scope> + </dependency> + + + </dependencies> <build> - + <plugins> <plugin> <artifactId>maven-jar-plugin</artifactId> + <configuration> + <outputDirectory>target/connector-infinispan-7.7.1/connector-infinispan.rar</outputDirectory> + </configuration> <executions> <execution> <id>build_jar</id> @@ -79,222 +82,170 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ear-plugin</artifactId> - <version>2.4</version> - <configuration> - <!-- uri>./target/connector-infinispan-${project.version}</uri--> - <defaultJavaBundleDir></defaultJavaBundleDir> - <generateApplicationXml>false</generateApplicationXml> - <modules> - <javaModule> - <groupId>org.infinispan</groupId> - <artifactId>infinispan-core</artifactId> - <bundleDir>connector-infinispan.rar</bundleDir> - <!--includeInApplicationXml>true</includeInApplicationXml--> - </javaModule> - <javaModule> - <groupId>org.infinispan</groupId> - <artifactId>infinispan-client-hotrod</artifactId> - <bundleDir>connector-infinispan.rar</bundleDir> - </javaModule> - <javaModule> - <groupId>org.jboss.marshalling</groupId> - <artifactId>jboss-marshalling-river</artifactId> - <bundleDir>connector-infinispan.rar</bundleDir> - </javaModule> - <javaModule> - <groupId>org.jboss.marshalling</groupId> - <artifactId>jboss-marshalling</artifactId> - <bundleDir>connector-infinispan.rar</bundleDir> - </javaModule> - <javaModule> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging</artifactId> - <bundleDir>connector-infinispan.rar</bundleDir> - </javaModule> - <javaModule> - <groupId>org.jboss.logmanager</groupId> - <artifactId>jboss-logmanager</artifactId> - <bundleDir>connector-infinispan.rar</bundleDir> - </javaModule> - <javaModule> - <groupId>commons-pool</groupId> - <artifactId>commons-pool</artifactId> - <bundleDir>connector-infinispan.rar</bundleDir> - </javaModule> - <jarModule> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - <excluded>true</excluded> - </jarModule> - - <jarModule> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - <excluded>true</excluded> - </jarModule> - <jarModule> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search</artifactId> - <excluded>true</excluded> - </jarModule> - <jarModule> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - <excluded>true</excluded> - </jarModule> - <jarModule> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - <excluded>true</excluded> - </jarModule> - <jarModule> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core </artifactId> - <excluded>true</excluded> - </jarModule> - <jarModule> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>woodstox-core-asl</artifactId> - <excluded>true</excluded> - </jarModule> - <jarModule> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>stax2-api </artifactId> - <excluded>true</excluded> - </jarModule> - <jarModule> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <excluded>true</excluded> - </jarModule> - <jarModule> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <excluded>true</excluded> - </jarModule> - <jarModule> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <excluded>true</excluded> - </jarModule> - <jarModule> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - <excluded>true</excluded> - </jarModule> - <jarModule> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <excluded>true</excluded> - </jarModule> - <jarModule> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <excluded>true</excluded> - </jarModule> - <jarModule> - <groupId>org.jgroups</groupId> - <artifactId>jgroups</artifactId> - <excluded>true</excluded> - </jarModule> - - <jarModule> - <groupId>org.jboss.spec.javax.transaction</groupId> - <artifactId>jboss-transaction-api_1.1_spec</artifactId> - <excluded>true</excluded> - </jarModule> - <jarModule> - <groupId>org.rhq.helpers</groupId> - <artifactId>rhq-pluginAnnotations</artifactId> - <excluded>true</excluded> - </jarModule> - <jarModule> - <groupId>org.jboss.teiid.connectors</groupId> - <artifactId>translator-object</artifactId> - <excluded>true</excluded> - </jarModule> - </modules> - - <jboss> - <data-sources> - <data-source>infinispan-ds.xml</data-source> - </data-sources> - - <loader-repository> - org.teiid.resource.adapter:loader=teiid-infinispan.ear - </loader-repository> - <loader-repository-config> - java2ParentDelegation=false - </loader-repository-config> - - </jboss> - </configuration> - <executions> - <execution> - <id>deploy-ear</id> - <phase>install</phase> - <goals> - <goal>ear</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>2.3.1</version> - <executions> - <execution> - <id>install-ear</id> - <phase>install</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <packaging>ear</packaging> - <artifactId>${project.artifactId}</artifactId> - <groupId>${project.groupId}</groupId> - <version>${project.version}</version> - <file>${project.build.directory}/${project.artifactId}-${project.version}.ear</file> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.5</version> - <executions> - <execution> - <id>deploy-ear</id> - <phase>deploy</phase> - <goals> - <goal>deploy-file</goal> - </goals> - <configuration> - <url>file:///maven/output</url> - <repositoryId>Internal testing release</repositoryId> - <packaging>ear</packaging> - <artifactId>${project.artifactId}</artifactId> - <groupId>${project.groupId}</groupId> - <version>${project.version}</version> - <file>${project.build.directory}/${project.artifactId}-${project.version}.ear</file> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <version>2.4</version> + <configuration> + <!-- uri>./target/connector-infinispan-${project.version}</uri--> + <defaultJavaBundleDir></defaultJavaBundleDir> + <generateApplicationXml>false</generateApplicationXml> + <modules> + <javaModule> + <groupId>org.infinispan</groupId> + <artifactId>infinispan-core</artifactId> + <bundleDir>connector-infinispan.rar</bundleDir> + <!--includeInApplicationXml>true</includeInApplicationXml--> + </javaModule> + <javaModule> + <groupId>org.infinispan</groupId> + <artifactId>infinispan-client-hotrod</artifactId> + <bundleDir>connector-infinispan.rar</bundleDir> + </javaModule> + <javaModule> + <groupId>org.jboss.marshalling</groupId> + <artifactId>jboss-marshalling-river</artifactId> + <bundleDir>connector-infinispan.rar</bundleDir> + </javaModule> + <javaModule> + <groupId>org.jboss.marshalling</groupId> + <artifactId>jboss-marshalling</artifactId> + <bundleDir>connector-infinispan.rar</bundleDir> + </javaModule> + <javaModule> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + <bundleDir>connector-infinispan.rar</bundleDir> + </javaModule> + <javaModule> + <groupId>org.jboss.logmanager</groupId> + <artifactId>jboss-logmanager</artifactId> + <bundleDir>connector-infinispan.rar</bundleDir> + </javaModule> + <javaModule> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + <bundleDir>connector-infinispan.rar</bundleDir> + </javaModule> + <jarModule> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + <excluded>true</excluded> + </jarModule> + + <jarModule> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + <excluded>true</excluded> + </jarModule> + <jarModule> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search</artifactId> + <excluded>true</excluded> + </jarModule> + <jarModule> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-commons-annotations</artifactId> + <excluded>true</excluded> + </jarModule> + <jarModule> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + <excluded>true</excluded> + </jarModule> + <jarModule> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core </artifactId> + <excluded>true</excluded> + </jarModule> + <jarModule> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>woodstox-core-asl</artifactId> + <excluded>true</excluded> + </jarModule> + <jarModule> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>stax2-api </artifactId> + <excluded>true</excluded> + </jarModule> + <jarModule> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <excluded>true</excluded> + </jarModule> + <jarModule> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <excluded>true</excluded> + </jarModule> + <jarModule> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <excluded>true</excluded> + </jarModule> + <jarModule> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + <excluded>true</excluded> + </jarModule> + <jarModule> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <excluded>true</excluded> + </jarModule> + <jarModule> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <excluded>true</excluded> + </jarModule> + <jarModule> + <groupId>org.jgroups</groupId> + <artifactId>jgroups</artifactId> + <excluded>true</excluded> + </jarModule> + + <jarModule> + <groupId>org.jboss.spec.javax.transaction</groupId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> + <excluded>true</excluded> + </jarModule> + <jarModule> + <groupId>org.rhq.helpers</groupId> + <artifactId>rhq-pluginAnnotations</artifactId> + <excluded>true</excluded> + </jarModule> + <jarModule> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>translator-object</artifactId> + <excluded>true</excluded> + </jarModule> + </modules> + + <jboss> + <data-sources> + <data-source>infinispan-ds.xml</data-source> + </data-sources> + + <loader-repository> + org.teiid.resource.adapter:loader=teiid-infinispan.ear + </loader-repository> + <loader-repository-config> + java2ParentDelegation=false + </loader-repository-config> + + </jboss> + </configuration> + </plugin> </plugins> </build> -</project> - -<distributionManagement> + + <distributionManagement> <repository> <id>Internal testing release</id> <name>Deployment of ear</name> <url>${maven.repo.local}</url> </repository> </distributionManagement> + +</project> + Modified: branches/7.7.x/connectors/connector-infinispan/src/assembly/kit.xml =================================================================== --- branches/7.7.x/connectors/connector-infinispan/src/assembly/kit.xml 2012-06-02 03:16:47 UTC (rev 4161) +++ branches/7.7.x/connectors/connector-infinispan/src/assembly/kit.xml 2012-06-02 13:46:43 UTC (rev 4162) @@ -9,10 +9,10 @@ in order to build a complete set of artifacts to be deployed to a JBoss AS server --> - <id>infinispan.ear</id> + <id>${project.version}</id> <formats> - <format>dir</format> + <format>ear</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> Modified: branches/7.7.x/connectors/connector-infinispan/src/main/ear/META-INF/jboss-app.xml =================================================================== --- branches/7.7.x/connectors/connector-infinispan/src/main/ear/META-INF/jboss-app.xml 2012-06-02 03:16:47 UTC (rev 4161) +++ branches/7.7.x/connectors/connector-infinispan/src/main/ear/META-INF/jboss-app.xml 2012-06-02 13:46:43 UTC (rev 4162) @@ -1,16 +1,11 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE jboss-app - PUBLIC "-//JBoss//DTD J2EE Application 1.3V2//EN" - "http://www.jboss.org/j2ee/dtd/jboss-app_3_2.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE jboss-app PUBLIC + "-//JBoss//DTD J2EE Application 1.4//EN" + "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd"> <jboss-app> - <loader-repository> - org.teiid.resource.adapter:loader=infinispan-jca.ear - <loader-repository-config> - java2ParentDelegation=false - </loader-repository-config> + <loader-repository>org.teiid.resource.adapter:loader=teiid-infinispan.ear<loader-repository-config>java2ParentDelegation=false</loader-repository-config> </loader-repository> - - <module> - <service>infinispan-ds.xml</service> - </module> -</jboss-app> + <module> + <service>infinispan-ds.xml</service> + </module> +</jboss-app> \ No newline at end of file