incubator-kato-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From monte...@apache.org
Subject svn commit: r882202 - in /incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi: javah/pom.xml linux-x86/pom.xml pom.xml src/main/native/katovmapi.c tests/pom.xml tests/src/test/java/test/apache/kato/vmapi/TestLibraryLoad.java
Date Thu, 19 Nov 2009 16:43:23 GMT
Author: monteith
Date: Thu Nov 19 16:43:23 2009
New Revision: 882202

URL: http://svn.apache.org/viewvc?rev=882202&view=rev
Log:
Add fixes for changes to DumpTrigger.

Modified:
    incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/javah/pom.xml
    incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/linux-x86/pom.xml
    incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/pom.xml
    incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/src/main/native/katovmapi.c
    incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/pom.xml
    incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/src/test/java/test/apache/kato/vmapi/TestLibraryLoad.java

Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/javah/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/javah/pom.xml?rev=882202&r1=882201&r2=882202&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/javah/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/javah/pom.xml Thu Nov
19 16:43:23 2009
@@ -36,7 +36,7 @@
   <dependencies>
    	<dependency>
    		<groupId>org.apache.kato</groupId>
-   		<artifactId>kato.common</artifactId>
+   		<artifactId>kato.common.142</artifactId>
    		<version>M1-incubating</version>
    	</dependency>
    </dependencies>
@@ -57,7 +57,7 @@
              <phase>generate-sources</phase>
              <configuration>
                <classNames>
-                 <className>org.apache.kato.common.DumpTrigger</className>
+                 <className>org.apache.kato.common142.DumpTrigger</className>
                  
                </classNames>
              </configuration>

Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/linux-x86/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/linux-x86/pom.xml?rev=882202&r1=882201&r2=882202&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/linux-x86/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/linux-x86/pom.xml Thu
Nov 19 16:43:23 2009
@@ -32,6 +32,7 @@
 
 	<groupId>org.apache.kato.native</groupId>
 	<artifactId>libkatovmapi-linux-x86</artifactId>
+    <version>M1-incubating</version>
 
 	<name>Linux x86 Version of Kato VM Native Library</name>
 

Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/pom.xml?rev=882202&r1=882201&r2=882202&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/pom.xml Thu Nov 19
16:43:23 2009
@@ -58,6 +58,7 @@
 			<properties>
 				<javah.os>win32</javah.os>
 				<machine.linker></machine.linker>
+                <kato.vmapi.libname>katovmapi-windows-x86.dll</kato.vmapi.libname>
 			</properties>
 			<modules>
 				<module>javah</module>
@@ -77,6 +78,7 @@
 			<properties>
 				<javah.os>win64</javah.os>
 				<machine.linker>/machine:AMD64</machine.linker>
+                <kato.vmapi.libname>katovmapi-windows-x86.dll</kato.vmapi.libname>
 			</properties>
 			<modules>
 				<module>javah</module>
@@ -98,6 +100,9 @@
 				<module>linux-x86</module>
 				<module>tests</module>
 			</modules>
+            <properties>
+                <kato.vmapi.libname>libkatovmapi-linux-x86.so</kato.vmapi.libname>
+            </properties>
 		</profile>
 
 		<profile>
@@ -113,6 +118,9 @@
 				<module>aix</module>
 				<module>tests</module>
 			</modules>
+            <properties>
+                <kato.vmapi.libname>libkatovmapi-aix.a</kato.vmapi.libname>
+            </properties>
 		</profile>
 
 		<!-- use this during release:prepare -->

Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/src/main/native/katovmapi.c
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/src/main/native/katovmapi.c?rev=882202&r1=882201&r2=882202&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/src/main/native/katovmapi.c
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/src/main/native/katovmapi.c
Thu Nov 19 16:43:23 2009
@@ -13,7 +13,7 @@
  ******************************************************************************/
 
 
-#include "org_apache_kato_common_DumpTrigger.h"
+#include "org_apache_kato_common142_DumpTrigger.h"
 
 #ifdef __linux__
 #include <signal.h>
@@ -25,7 +25,7 @@
  * Method:    getNativeProcessID
  * Signature: ()I
  */
-JNIEXPORT jint JNICALL Java_org_apache_kato_common_DumpTrigger_getNativeProcessID
+JNIEXPORT jint JNICALL Java_org_apache_kato_common142_DumpTrigger_getNativeProcessID
 (JNIEnv *env, jobject obj) {
 	 jint result=0;
 
@@ -45,7 +45,7 @@
  * Class:     org_apache_kato_common_DumpTrigger
  * Method:    triggernativeDump
  * Signature: ()Z
- */JNIEXPORT jboolean JNICALL Java_org_apache_kato_common_DumpTrigger_sendDumpSignal
+ */JNIEXPORT jboolean JNICALL Java_org_apache_kato_common142_DumpTrigger_sendDumpSignal
  (JNIEnv *env, jobject obj, jint processID) {
 
 	

Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/pom.xml?rev=882202&r1=882201&r2=882202&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/pom.xml Thu Nov
19 16:43:23 2009
@@ -57,6 +57,10 @@
 							<name>libloc</name>
 							<value>${basedir}/../target</value>
 						</property>
+                        <property>
+                            <name>org.apache.kato.dumptrigger.librarypath</name>
+                            <value>${basedir}/../target/${kato.vmapi.libname}</value>
+                        </property>
 					</systemProperties>
 				</configuration>
 			</plugin>

Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/src/test/java/test/apache/kato/vmapi/TestLibraryLoad.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/src/test/java/test/apache/kato/vmapi/TestLibraryLoad.java?rev=882202&r1=882201&r2=882202&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/src/test/java/test/apache/kato/vmapi/TestLibraryLoad.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/src/test/java/test/apache/kato/vmapi/TestLibraryLoad.java
Thu Nov 19 16:43:23 2009
@@ -4,7 +4,7 @@
 
 import junit.framework.TestCase;
 
-import org.apache.kato.common.DumpTrigger;
+import org.apache.kato.common142.DumpTrigger;
 
 public class TestLibraryLoad extends TestCase {
 



Mime
View raw message