[teiid-commits] teiid SVN: r3080 - in trunk: build and 4 other directories.

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2011-04-08 15:27:28 -0400 (Fri, 08 Apr 2011)
New Revision: 3080

Removed:
   trunk/client/src/main/java/net/sf/retrotranslator/runtime/java/io/
   trunk/client/src/main/java/net/sf/retrotranslator/runtime/java/sql/
   trunk/client/src/main/java/net/sf/retrotranslator/runtime/java/util/
   trunk/client/src/main/java/net/sf/retrotranslator/runtime/javax/net/ssl/
   trunk/client/src/main/java/net/sf/retrotranslator/runtime/org/teiid/core/types/basic/
Modified:
   trunk/build/pom.xml
   trunk/client-jdk15/
   trunk/pom.xml
Log:
TEIID-1491: removing the usage of the retrotranslator from the build. It is proven to be not embedding the runtime jar, and was in alpha state for for 3 years and very poor docs and unusable. I replaced with java execute process that directly uses the Retrotranslator library.

Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml	2011-04-08 19:21:21 UTC (rev 3079)
+++ trunk/build/pom.xml	2011-04-08 19:27:28 UTC (rev 3080)
@@ -8,6 +8,24 @@
   <artifactId>teiid</artifactId>
   <name>Build</name>
   <description>Teiid Build</description>
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.teiid</groupId>
+            <artifactId>teiid-client-jdk15</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.retrotranslator</groupId>
+            <artifactId>retrotranslator-runtime</artifactId>
+            <version>1.2.9</version>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sf.retrotranslator</groupId>
+            <artifactId>retrotranslator-transformer</artifactId>
+            <version>1.2.9</version>
+        </dependency>        
+    </dependencies>     
     <build>
         <outputDirectory>target/kits</outputDirectory>
         <resources>
@@ -86,32 +104,31 @@
                 </descriptors>
               </configuration>
             </plugin>
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
-                <artifactId>retrotranslator-maven-plugin</artifactId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.1.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
                         <goals>
-                            <goal>translate</goal>
+                            <goal>java</goal>
                         </goals>
                         <configuration>
-                            <attach>true</attach>
-                            <target>1.5</target>
-                            <embed>org.teiid.retroruntime</embed>
-                            <destjar>target/teiid-${pom.version}-client-jdk15.jar</destjar>
-                            <verify>false</verify>
-                            <failonwarning>true</failonwarning>
-                            <includes>
-                                <include>
-                                    <directory>target</directory>
-                                    <pattern>teiid-${pom.version}-client.jar</pattern>
-                                </include>
-                            </includes>
+                            <mainClass>net.sf.retrotranslator.transformer.Retrotranslator</mainClass>
+                            <arguments>                     
+                                <argument>-srcjar</argument>
+                                <argument>${pom.basedir}/target/teiid-${pom.version}-client.jar</argument>
+                                <argument>-destjar</argument>
+                                <argument>${pom.basedir}/target/teiid-${pom.version}-client-jdk15.jar</argument>            
+                                <argument>-embed</argument>
+                                <argument>org.teiid.retroruntime</argument>                    
+                            </arguments>
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>             
+            </plugin>              
           </plugins>
         </build>
       </profile>


Property changes on: trunk/client-jdk15
___________________________________________________________________
Added: svn:ignore
   + target

.classpath

.settings

.project


Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2011-04-08 19:21:21 UTC (rev 3079)
+++ trunk/pom.xml	2011-04-08 19:27:28 UTC (rev 3080)
@@ -477,6 +477,7 @@
 		<module>hibernate-dialect</module>
         <module>jboss-integration</module>
 		<module>test-integration</module>
+        <module>client-jdk15</module>
   </modules>
     <distributionManagement>
         <repository>