[jboss-cvs] JBossAS SVN: r65491 - in projects/integration/trunk: build and 9 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Sep 20 09:44:02 EDT 2007


Author: reverbel
Date: 2007-09-20 09:44:02 -0400 (Thu, 20 Sep 2007)
New Revision: 65491

Added:
   projects/integration/trunk/jboss-corba-ots-spi/
   projects/integration/trunk/jboss-corba-ots-spi/.classpath
   projects/integration/trunk/jboss-corba-ots-spi/.project
   projects/integration/trunk/jboss-corba-ots-spi/.settings/
   projects/integration/trunk/jboss-corba-ots-spi/.settings/org.eclipse.jdt.core.prefs
   projects/integration/trunk/jboss-corba-ots-spi/pom-jdk14.xml
   projects/integration/trunk/jboss-corba-ots-spi/pom.xml
   projects/integration/trunk/jboss-corba-ots-spi/src/
   projects/integration/trunk/jboss-corba-ots-spi/src/main/
   projects/integration/trunk/jboss-corba-ots-spi/src/main/org/
   projects/integration/trunk/jboss-corba-ots-spi/src/main/org/jboss/
   projects/integration/trunk/jboss-corba-ots-spi/src/main/org/jboss/iiop/
   projects/integration/trunk/jboss-corba-ots-spi/src/main/org/jboss/iiop/tm/
   projects/integration/trunk/jboss-corba-ots-spi/src/main/org/jboss/iiop/tm/InboundTransactionCurrent.java
Modified:
   projects/integration/trunk/build/assembly/bin-jdk14.xml
   projects/integration/trunk/build/assembly/bin.xml
   projects/integration/trunk/build/assembly/sources.xml
   projects/integration/trunk/build/pom-jdk14.xml
   projects/integration/trunk/build/pom.xml
Log:
Add SPI to be implemented by a CORBA OTS provider, for integration with JBossAS.


Modified: projects/integration/trunk/build/assembly/bin-jdk14.xml
===================================================================
--- projects/integration/trunk/build/assembly/bin-jdk14.xml	2007-09-20 12:44:24 UTC (rev 65490)
+++ projects/integration/trunk/build/assembly/bin-jdk14.xml	2007-09-20 13:44:02 UTC (rev 65491)
@@ -12,5 +12,9 @@
       <directory>../jboss-transaction-spi/target/classes-jdk14</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>
+    <fileSet>
+      <directory>../jboss-corba-ots-spi/target/classes-jdk14</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
   </fileSets>
 </assembly>

Modified: projects/integration/trunk/build/assembly/bin.xml
===================================================================
--- projects/integration/trunk/build/assembly/bin.xml	2007-09-20 12:44:24 UTC (rev 65490)
+++ projects/integration/trunk/build/assembly/bin.xml	2007-09-20 13:44:02 UTC (rev 65491)
@@ -12,5 +12,9 @@
       <directory>../jboss-transaction-spi/target/classes</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>
+    <fileSet>
+      <directory>../jboss-corba-ots-spi/target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
   </fileSets>
 </assembly>

Modified: projects/integration/trunk/build/assembly/sources.xml
===================================================================
--- projects/integration/trunk/build/assembly/sources.xml	2007-09-20 12:44:24 UTC (rev 65490)
+++ projects/integration/trunk/build/assembly/sources.xml	2007-09-20 13:44:02 UTC (rev 65491)
@@ -13,5 +13,9 @@
       <directory>../jboss-transaction-spi/src/main</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>
+    <fileSet>
+      <directory>../jboss-corba-ots-spi/src/main</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
   </fileSets>
 </assembly>

Modified: projects/integration/trunk/build/pom-jdk14.xml
===================================================================
--- projects/integration/trunk/build/pom-jdk14.xml	2007-09-20 12:44:24 UTC (rev 65490)
+++ projects/integration/trunk/build/pom-jdk14.xml	2007-09-20 13:44:02 UTC (rev 65491)
@@ -108,6 +108,7 @@
   <!--<modules>
     <module>../jboss-classloading-spi</module>
     <module>../jboss-transaction-spi</module>
+    <module>../jboss-corba-ots-spi</module>
   </modules>-->
   <reporting>
     <plugins>

Modified: projects/integration/trunk/build/pom.xml
===================================================================
--- projects/integration/trunk/build/pom.xml	2007-09-20 12:44:24 UTC (rev 65490)
+++ projects/integration/trunk/build/pom.xml	2007-09-20 13:44:02 UTC (rev 65491)
@@ -120,6 +120,7 @@
   <modules>
     <module>../jboss-classloading-spi</module>
     <module>../jboss-transaction-spi</module>
+    <module>../jboss-corba-ots-spi</module>
   </modules>
   <reporting>
     <plugins>

Added: projects/integration/trunk/jboss-corba-ots-spi/.classpath
===================================================================
--- projects/integration/trunk/jboss-corba-ots-spi/.classpath	                        (rev 0)
+++ projects/integration/trunk/jboss-corba-ots-spi/.classpath	2007-09-20 13:44:02 UTC (rev 65491)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1/jboss-transaction-api-1.0.1.jar" sourcepath="/M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1/jboss-transaction-api-1.0.1-sources.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Added: projects/integration/trunk/jboss-corba-ots-spi/.project
===================================================================
--- projects/integration/trunk/jboss-corba-ots-spi/.project	                        (rev 0)
+++ projects/integration/trunk/jboss-corba-ots-spi/.project	2007-09-20 13:44:02 UTC (rev 65491)
@@ -0,0 +1,13 @@
+<projectDescription>
+  <name>jboss-corba-ots-spi</name>
+  <comment>The Java Transaction 5.0.0 SPI classes</comment>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
+</projectDescription>
\ No newline at end of file

Added: projects/integration/trunk/jboss-corba-ots-spi/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/integration/trunk/jboss-corba-ots-spi/.settings/org.eclipse.jdt.core.prefs	                        (rev 0)
+++ projects/integration/trunk/jboss-corba-ots-spi/.settings/org.eclipse.jdt.core.prefs	2007-09-20 13:44:02 UTC (rev 65491)
@@ -0,0 +1,5 @@
+#Wed Jul 04 03:05:53 CEST 2007
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5

Added: projects/integration/trunk/jboss-corba-ots-spi/pom-jdk14.xml
===================================================================
--- projects/integration/trunk/jboss-corba-ots-spi/pom-jdk14.xml	                        (rev 0)
+++ projects/integration/trunk/jboss-corba-ots-spi/pom-jdk14.xml	2007-09-20 13:44:02 UTC (rev 65491)
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - Notes for building and running tests.
+  - Do to some limitations of the maven surefire plugin, the tests must
+  - occur in a separate lifecycle from the build.
+  -
+  - mvn -f pom-jdk14.xml install  -  This will build the jdk14 version of the project.
+  - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test  -  This will run the tests using a jdk1.4 jvm  
+  -    Note: the tests will not work by calling mvn test, it must be performed by calling surefire directly.
+  -->
+<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.jboss</groupId>
+    <artifactId>jboss-integration-jdk14</artifactId>
+    <version>5.0.0-SNAPSHOT</version>
+    <relativePath>../build/pom-jdk14.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>jboss</groupId>
+  <artifactId>jboss-corba-orb-spi-jdk14</artifactId>
+  <version>5.0.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <name>JBoss 5.0.0 CORBA OTS SPI</name>
+  <url>http://www.jboss.org</url>
+  <description>SPI to be implemented by CORBA OTS providers for JBoss 5.0.0</description>
+  
+  <build>
+    <outputDirectory>${outputDirectory}</outputDirectory>
+    <testOutputDirectory>${testOutputDirectory}</testOutputDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.jboss.maven.plugins</groupId>
+        <artifactId>maven-jboss-retro-plugin</artifactId>
+        <version>1.0-beta-1</version>
+        <executions>
+          <execution>
+            <id>weave-classes</id>
+            <goals>
+              <goal>weave</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/classes-jdk14</outputDirectory>
+            </configuration>
+          </execution>
+          <execution>
+            <id>weave-test-classes</id>
+            <goals>
+              <goal>weave-tests</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+        <configuration>
+          <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <!-- Skip the tests here because the jdk14 tests have
+          -  to run the tests in a separate profile.
+          -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>              
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <profiles>
+    <!-- Note: to run the jdk14 tests, the surefire plugin must be called outside
+      -  of the lifecycle.  In other words it should be called directly from the command
+      -  line like this
+      -     mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test
+      -->
+    <profile>
+      <id>run-jdk14-tests</id>
+      <properties>
+        <mainOutputDir>target/classes-jdk14</mainOutputDir>
+        <testOutputDir>target/test-classes-jdk14</testOutputDir>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <version>1.0-alpha-3</version>
+            <executions>
+              <execution>
+                <id>enforce-jdk14-property</id>
+                <goals>
+                  <goal>enforce-once</goal>
+                </goals>
+                <configuration>
+                  <rules>
+                    <requireProperty>
+                      <property>java14_home</property>
+                      <message>
+                        The property java14_home should be set to a valid installation of jdk1.4.  The jdk14 tests cannot be run without this property.
+                      </message>
+                    </requireProperty>
+                  </rules>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <jvm>${java14_home}/bin/java</jvm>
+              <forkMode>always</forkMode>
+              <skip>false</skip>           
+              <reportsDirectory>${project.build.directory}/surefire-reports-jdk14</reportsDirectory>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.jboss.javaee</groupId>
+      <artifactId>jboss-transaction-api-jdk14</artifactId>
+    </dependency>
+  </dependencies>
+  
+  <properties>
+    <outputDirectory>target/classes</outputDirectory>
+    <testOutputDirectory>target/test-classes</testOutputDirectory>
+  </properties>
+      
+</project>

Added: projects/integration/trunk/jboss-corba-ots-spi/pom.xml
===================================================================
--- projects/integration/trunk/jboss-corba-ots-spi/pom.xml	                        (rev 0)
+++ projects/integration/trunk/jboss-corba-ots-spi/pom.xml	2007-09-20 13:44:02 UTC (rev 65491)
@@ -0,0 +1,23 @@
+<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.jboss</groupId>
+    <artifactId>jboss-integration</artifactId>
+    <version>5.0.0.Beta3</version>
+    <relativePath>../build/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.jboss</groupId>
+  <artifactId>jboss-corba-ots-spi</artifactId>
+  <version>5.0.0.Beta3</version>
+  <packaging>jar</packaging>
+  <name>JBoss 5.0.0 CORBA OTS SPI</name>
+  <url>http://www.jboss.org</url>
+  <description>SPI to be implemented by CORBA OTS providers for JBoss 5.0.0</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.jboss.javaee</groupId>
+      <artifactId>jboss-transaction-api</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Added: projects/integration/trunk/jboss-corba-ots-spi/src/main/org/jboss/iiop/tm/InboundTransactionCurrent.java
===================================================================
--- projects/integration/trunk/jboss-corba-ots-spi/src/main/org/jboss/iiop/tm/InboundTransactionCurrent.java	                        (rev 0)
+++ projects/integration/trunk/jboss-corba-ots-spi/src/main/org/jboss/iiop/tm/InboundTransactionCurrent.java	2007-09-20 13:44:02 UTC (rev 65491)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.iiop.tm;
+
+import javax.transaction.Transaction;
+
+/**
+ * Interface to be implemented by a CORBA OTS provider for integration with 
+ * JBossAS. The CORBA OTS provider must (i) create an object that implements 
+ * this interface and (ii) register an initial reference for that object  
+ * with the JBossAS ORB, under name "JBossInboundTransactionCurrent".
+ * <p>
+ * Step (ii) above should be done by a call 
+ * <code>orbInitInfo.register_initial_reference</code> within the 
+ * <code>pre_init</code> method of an 
+ * <code>org.omg.PortableInterceptor.ORBInitializer</code>, 
+ * which will probably be also the initializer that registers a server request
+ * interceptor for the OTS provider.
+ * 
+ * @author <a href="mailto:reverbel at ime.usp.br">Francisco Reverbel</a>
+ * @version $Revision$
+ */
+public interface InboundTransactionCurrent
+{
+   /**
+    * Gets the Transaction instance associated with the current incoming 
+    * request. This method should be called only by code that handles incoming
+    * requests; its return value is undefined in the case of a call issued 
+    * outside of a request scope.
+    * 
+    * @return the javax.transaction.Transaction instance associated with the 
+    *         current incoming request, or null if that request was not issued
+    *         within the scope of some transaction.
+    */
+   Transaction getCurrentTransaction();
+
+}




More information about the jboss-cvs-commits mailing list