[jboss-svn-commits] JBL Code SVN: r37694 - in labs/jbosstm/trunk/ArjunaJTS: jts and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 1 15:58:34 EDT 2011
Author: mmusgrov
Date: 2011-11-01 15:58:33 -0400 (Tue, 01 Nov 2011)
New Revision: 37694
Modified:
labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml
labs/jbosstm/trunk/ArjunaJTS/jts/idl/omg/XA.idl
labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml
labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml
Log:
[JBTM-934] New pom profiles for switching idl compilers:- jacorb is the default and idlj is the only other supported compiler
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml 2011-10-31 18:54:52 UTC (rev 37693)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/pom.xml 2011-11-01 19:58:33 UTC (rev 37694)
@@ -29,44 +29,6 @@
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>idlj-maven-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.jacorb</groupId>
- <artifactId>jacorb-idl-compiler</artifactId>
- <version>2.2.3</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <goals>
- <goal>generate-test</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <compiler>jacorb</compiler>
- <sourceDirectory>tests/idl/</sourceDirectory>
- <sources>
- <source>
- <includes>
- <include>test.idl</include>
- </includes>
- <additionalArguments>
- <additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
- <additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
- </additionalArguments>
- </source>
- </sources>
- <includeDirs>
- <includeDir>../jts/idl/omg</includeDir>
- <includeDir>../jts/idl/arjuna</includeDir>
- <includeDir>../jts/../jacorb/idl/omg</includeDir>
- </includeDirs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
@@ -155,4 +117,129 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jacorb</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>idlj-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb-idl-compiler</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-test</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <compiler>jacorb</compiler>
+ <sourceDirectory>tests/idl/</sourceDirectory>
+ <sources>
+ <source>
+ <includes>
+ <include>test.idl</include>
+ </includes>
+ <additionalArguments>
+ <additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
+ <additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
+ </additionalArguments>
+ </source>
+ </sources>
+ <includeDirs>
+ <includeDir>../jts/idl/omg</includeDir>
+ <includeDir>../jts/idl/arjuna</includeDir>
+ <includeDir>../jts/../jacorb/idl/omg</includeDir>
+ </includeDirs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>idlj</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>idlj-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-test</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <compiler>idlj</compiler>
+ <sourceDirectory>tests/idl/</sourceDirectory>
+ <sources>
+ <source>
+ <includes>
+ <include>test.idl</include>
+ </includes>
+ <compatible>false</compatible>
+<!-- the defines option is broken in 1.1) hence the use of -d option below
+ <defines>
+ <define>
+ <symbol>ORB_OTS_SUPPORT</symbol>
+ <value>1</value>
+ </define>
+ <define>
+ <symbol>ORB_CURRENT_SUPPORT</symbol>
+ <value>1</value>
+ </define>
+ </defines>
+-->
+
+ <packagePrefixes>
+ <packagePrefix>
+ <type>CosTransactions</type>
+ <prefix>org.omg</prefix>
+ </packagePrefix>
+ </packagePrefixes>
+
+ <additionalArguments>
+ <additionalArgument>-i</additionalArgument>
+ <additionalArgument>${basedir}/../jts/idl/omg</additionalArgument>
+ <additionalArgument>-i</additionalArgument>
+ <additionalArgument>${basedir}/../jts/idl/arjuna</additionalArgument>
+ <additionalArgument>-i</additionalArgument>
+ <additionalArgument>${env.JAVA_HOME}/lib</additionalArgument>
+ <additionalArgument>-d</additionalArgument>
+ <additionalArgument>ORB_OTS_SUPPORT=1</additionalArgument>
+ <additionalArgument>-d</additionalArgument>
+ <additionalArgument>ORB_CURRENT_SUPPORT=1</additionalArgument>
+ </additionalArguments>
+ </source>
+ </sources>
+<!-- the includeDirs option is broken in 1.1 (and in 1.2-SNAPSHOT) hence the use of -i above
+ <includeDirs>
+ <includeDir>idl</includeDir>
+ <includeDir>../jts/idl/omg</includeDir>
+ <includeDir>../jts/idl/arjuna</includeDir>
+ <includeDir>${env.JAVA_HOME}/lib</includeDir>
+ </includeDirs>
+-->
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/idl/omg/XA.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/idl/omg/XA.idl 2011-10-31 18:54:52 UTC (rev 37693)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/idl/omg/XA.idl 2011-11-01 19:58:33 UTC (rev 37694)
@@ -82,7 +82,8 @@
in long rmid, in unsigned long flags);
};
- local interface CurrentConnection
+ /*local interface CurrentConnection*/
+ interface CurrentConnection
{
void start( // xa_start(TMNOFLAGS) or xa_start(TMJOIN)
in CosTransactions::Coordinator tx,
@@ -123,7 +124,8 @@
void unregister_before_completion_callback(in unsigned long key);
};
- local interface Connector
+ /*local interface Connector*/
+ interface Connector
{
ResourceManager create_resource_manager(in string resource_manager_name,
in XASwitch xa_switch,
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml 2011-10-31 18:54:52 UTC (rev 37693)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/pom.xml 2011-11-01 19:58:33 UTC (rev 37694)
@@ -34,82 +34,6 @@
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>idlj-maven-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.jacorb</groupId>
- <artifactId>jacorb-idl-compiler</artifactId>
- <version>2.2.3</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <compiler>jacorb</compiler>
- <sourceDirectory>idl/</sourceDirectory>
- <outputDirectory>target/generated-sources/idl</outputDirectory>
- <sources>
- <source>
- <includes>
- <include>omg/CosTransactions.idl</include>
- <include>arjuna/ArjunaOTS.idl</include>
- <include>omg/XA.idl</include>
- </includes>
- <additionalArguments>
- <additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
- <additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>CosTransactions:org.omg.CosTransactions</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>XA:org.omg.XA</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>ArjunaOTS:com.arjuna.ArjunaOTS</additionalArgument>
- </additionalArguments>
- </source>
- </sources>
- <includeDirs>
- <includeDir>../jacorb/idl/omg</includeDir>
- </includeDirs>
- </configuration>
- </execution>
- <execution>
- <id>generate-test-sources</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>generate-test</goal>
- </goals>
- <configuration>
- <compiler>jacorb</compiler>
- <sourceDirectory>tests/idl/</sourceDirectory>
- <outputDirectory>target/generated-test-sources/idl</outputDirectory>
- <sources>
- <source>
- <includes>
- <include>TestModule.idl</include>
- </includes>
- <additionalArguments>
- <additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
- <additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>TestModule:com.hp.mwtests.ts.jts.TestModule</additionalArgument>
- </additionalArguments>
- </source>
- </sources>
- <includeDirs>
- <includeDir>idl/omg</includeDir>
- <includeDir>../jacorb/idl/omg</includeDir>
- </includeDirs>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
@@ -196,4 +120,214 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jacorb</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>idlj-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb-idl-compiler</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <compiler>jacorb</compiler>
+ <sourceDirectory>idl/</sourceDirectory>
+ <outputDirectory>target/generated-sources/idl</outputDirectory>
+ <sources>
+ <source>
+ <includes>
+ <include>omg/CosTransactions.idl</include>
+ <include>arjuna/ArjunaOTS.idl</include>
+ <include>omg/XA.idl</include>
+ </includes>
+ <additionalArguments>
+ <additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
+ <additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
+ <additionalArgument>-i2jpackage</additionalArgument>
+ <additionalArgument>CosTransactions:org.omg.CosTransactions</additionalArgument>
+ <additionalArgument>-i2jpackage</additionalArgument>
+ <additionalArgument>XA:org.omg.XA</additionalArgument>
+ <additionalArgument>-i2jpackage</additionalArgument>
+ <additionalArgument>ArjunaOTS:com.arjuna.ArjunaOTS</additionalArgument>
+ </additionalArguments>
+ </source>
+ </sources>
+ <includeDirs>
+ <includeDir>../jacorb/idl/omg</includeDir>
+ </includeDirs>
+ </configuration>
+ </execution>
+ <execution>
+ <id>generate-test-sources</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>generate-test</goal>
+ </goals>
+ <configuration>
+ <compiler>jacorb</compiler>
+ <sourceDirectory>tests/idl/</sourceDirectory>
+ <outputDirectory>target/generated-test-sources/idl</outputDirectory>
+ <sources>
+ <source>
+ <includes>
+ <include>TestModule.idl</include>
+ </includes>
+ <additionalArguments>
+ <additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
+ <additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
+ <additionalArgument>-i2jpackage</additionalArgument>
+ <additionalArgument>TestModule:com.hp.mwtests.ts.jts.TestModule</additionalArgument>
+ </additionalArguments>
+ </source>
+ </sources>
+ <includeDirs>
+ <includeDir>idl/omg</includeDir>
+ <includeDir>../jacorb/idl/omg</includeDir>
+ </includeDirs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>idlj</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>idlj-maven-plugin</artifactId>
+ <executions>
+
+ <execution>
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <compiler>idlj</compiler>
+ <sourceDirectory>idl/</sourceDirectory>
+ <outputDirectory>target/generated-sources/idl</outputDirectory>
+ <sources>
+ <source>
+ <includes>
+ <include>omg/CosTransactions.idl</include>
+ <include>arjuna/ArjunaOTS.idl</include>
+ <include>omg/XA.idl</include>
+ </includes>
+ <compatible>false</compatible>
+ <packagePrefixes>
+ <packagePrefix>
+ <type>CosTransactions</type>
+ <prefix>org.omg</prefix>
+ </packagePrefix>
+ <packagePrefix>
+ <type>XA</type>
+ <prefix>org.omg</prefix>
+ </packagePrefix>
+ <packagePrefix>
+ <type>ArjunaOTS</type>
+ <prefix>com.arjuna</prefix>
+ </packagePrefix>
+ </packagePrefixes>
+ <additionalArguments>
+ <additionalArgument>-i</additionalArgument>
+ <additionalArgument>${basedir}/idl/omg</additionalArgument>
+ <additionalArgument>-i</additionalArgument>
+ <additionalArgument>${env.JAVA_HOME}/lib</additionalArgument>
+
+ <additionalArgument>-d</additionalArgument>
+ <additionalArgument>ORB_OTS_SUPPORT=1</additionalArgument>
+ <additionalArgument>-d</additionalArgument>
+ <additionalArgument>ORB_CURRENT_SUPPORT=1</additionalArgument>
+ <additionalArgument>-fallTIE</additionalArgument>
+ </additionalArguments>
+ </source>
+ </sources>
+ <includeDirs>
+<!-- broken in 1.1 (and 1.2-SNAPSHOT)
+ <includeDir>idl/omg</includeDir>
+ <includeDir>${env.JAVA_HOME}/lib</includeDir>
+-->
+ </includeDirs>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>generate-test-sources</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>generate-test</goal>
+ </goals>
+ <configuration>
+ <compiler>idlj</compiler>
+ <sourceDirectory>tests/idl/</sourceDirectory>
+ <outputDirectory>target/generated-test-sources/idl</outputDirectory>
+ <sources>
+ <source>
+ <includes>
+ <include>TestModule.idl</include>
+ </includes>
+ <compatible>false</compatible>
+ <packagePrefixes>
+ <packagePrefix>
+ <type>TestModule</type>
+ <prefix>com.hp.mwtests.ts.jts</prefix>
+ </packagePrefix>
+ <packagePrefix>
+ <type>CosTransactions</type>
+ <prefix>org.omg</prefix>
+ </packagePrefix>
+ </packagePrefixes>
+ <additionalArguments>
+ <additionalArgument>-i</additionalArgument>
+ <additionalArgument>${basedir}/idl/omg</additionalArgument>
+ <additionalArgument>-i</additionalArgument>
+ <additionalArgument>${env.JAVA_HOME}/lib</additionalArgument>
+
+ <additionalArgument>-d</additionalArgument>
+ <additionalArgument>ORB_OTS_SUPPORT=1</additionalArgument>
+ <additionalArgument>-d</additionalArgument>
+ <additionalArgument>ORB_CURRENT_SUPPORT=1</additionalArgument>
+ <additionalArgument>-fallTIE</additionalArgument>
+ </additionalArguments>
+ </source>
+ </sources>
+ <includeDirs>
+<!-- broken in 1.1 (and 1.2-SNAPSHOT)
+ <includeDir>idl/omg</includeDir>
+ <includeDir>${env.JAVA_HOME}/lib</includeDir>
+-->
+ </includeDirs>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml 2011-10-31 18:54:52 UTC (rev 37693)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/pom.xml 2011-11-01 19:58:33 UTC (rev 37694)
@@ -55,47 +55,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>idlj-maven-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.jacorb</groupId>
- <artifactId>jacorb-idl-compiler</artifactId>
- <version>2.2.3</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <goals>
- <goal>generate-test</goal>
- </goals>
- <configuration>
- <sourceDirectory>tests/idl/</sourceDirectory>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <compiler>jacorb</compiler>
- <sources>
- <source>
- <includes>
- <include>orbtests.idl</include>
- </includes>
- <additionalArguments>
- <additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
- <additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
- <additionalArgument>-i2jpackage</additionalArgument>
- <additionalArgument>orbtests:com.hp.mwtests.orbportability.orbspecific.orbtests</additionalArgument>
- </additionalArguments>
- </source>
- </sources>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
@@ -159,4 +118,102 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jacorb</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>idlj-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb-idl-compiler</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-test</goal>
+ </goals>
+ <configuration>
+ <sourceDirectory>tests/idl/</sourceDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <compiler>jacorb</compiler>
+ <sources>
+ <source>
+ <includes>
+ <include>orbtests.idl</include>
+ </includes>
+ <additionalArguments>
+ <additionalArgument>-DORB_OTS_SUPPORT=1</additionalArgument>
+ <additionalArgument>-DORB_CURRENT_SUPPORT=1</additionalArgument>
+ <additionalArgument>-i2jpackage</additionalArgument>
+ <additionalArgument>orbtests:com.hp.mwtests.orbportability.orbspecific.orbtests</additionalArgument>
+ </additionalArguments>
+ </source>
+ </sources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>idlj</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>idlj-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-test</goal>
+ </goals>
+ <configuration>
+ <sourceDirectory>tests/idl/</sourceDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <compiler>idlj</compiler>
+ <sources>
+ <source>
+ <includes>
+ <include>orbtests.idl</include>
+ </includes>
+ <packagePrefixes>
+ <packagePrefix>
+ <type>orbtests</type>
+ <prefix>com.hp.mwtests.orbportability.orbspecific</prefix>
+ </packagePrefix>
+ </packagePrefixes>
+ <compatible>false</compatible>
+ <additionalArguments>
+ <additionalArgument>-d</additionalArgument>
+ <additionalArgument>ORB_OTS_SUPPORT=1</additionalArgument>
+ <additionalArgument>-d</additionalArgument>
+ <additionalArgument>ORB_CURRENT_SUPPORT=1</additionalArgument>
+ </additionalArguments>
+ </source>
+ </sources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
More information about the jboss-svn-commits
mailing list