You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by va...@apache.org on 2009/01/28 10:54:07 UTC
svn commit: r738425 - in /lucene/pylucene/trunk/jcc: CHANGES
java/org/apache/ java/org/apache/jcc/PythonException.java
java/org/apache/jcc/PythonVM.java java/org/osafoundation/
jcc/sources/JCCEnv.cpp jcc/sources/jcc.cpp setup.py
Author: vajda
Date: Wed Jan 28 09:54:06 2009
New Revision: 738425
URL: http://svn.apache.org/viewvc?rev=738425&view=rev
Log:
renamed osafoundation package to apache
Added:
lucene/pylucene/trunk/jcc/java/org/apache/
- copied from r738402, lucene/pylucene/trunk/jcc/java/org/osafoundation/
Removed:
lucene/pylucene/trunk/jcc/java/org/osafoundation/
Modified:
lucene/pylucene/trunk/jcc/CHANGES
lucene/pylucene/trunk/jcc/java/org/apache/jcc/PythonException.java
lucene/pylucene/trunk/jcc/java/org/apache/jcc/PythonVM.java
lucene/pylucene/trunk/jcc/jcc/sources/JCCEnv.cpp
lucene/pylucene/trunk/jcc/jcc/sources/jcc.cpp
lucene/pylucene/trunk/jcc/setup.py
Modified: lucene/pylucene/trunk/jcc/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/CHANGES?rev=738425&r1=738424&r2=738425&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/CHANGES (original)
+++ lucene/pylucene/trunk/jcc/CHANGES Wed Jan 28 09:54:06 2009
@@ -5,7 +5,7 @@
------------------
- JCC now a subproject of the Apache PyLucene project
- fixed bug where thread's JNIEnv was not set before calling findClass()
- - unhandled java exception is printed out via ExceptionDescribe()
+ - unhandled java exception now is printed out via ExceptionDescribe()
-
Version 2.0 -> 2.1
Modified: lucene/pylucene/trunk/jcc/java/org/apache/jcc/PythonException.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/java/org/apache/jcc/PythonException.java?rev=738425&r1=738402&r2=738425&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/java/org/apache/jcc/PythonException.java (original)
+++ lucene/pylucene/trunk/jcc/java/org/apache/jcc/PythonException.java Wed Jan 28 09:54:06 2009
@@ -1,6 +1,4 @@
-/*
- * Copyright (c) 2008-2008 Open Source Applications Foundation
- *
+/* ====================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -12,9 +10,10 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
+ * ====================================================================
*/
-package org.osafoundation.jcc;
+package org.apache.jcc;
public class PythonException extends RuntimeException {
Modified: lucene/pylucene/trunk/jcc/java/org/apache/jcc/PythonVM.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/java/org/apache/jcc/PythonVM.java?rev=738425&r1=738402&r2=738425&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/java/org/apache/jcc/PythonVM.java (original)
+++ lucene/pylucene/trunk/jcc/java/org/apache/jcc/PythonVM.java Wed Jan 28 09:54:06 2009
@@ -1,6 +1,4 @@
-/*
- * Copyright (c) 2008-2008 Open Source Applications Foundation
- *
+/* ====================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -12,13 +10,13 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
+ * ====================================================================
*/
-package org.osafoundation.jcc;
+package org.apache.jcc;
public class PythonVM {
-
static protected PythonVM vm;
static {
Modified: lucene/pylucene/trunk/jcc/jcc/sources/JCCEnv.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/JCCEnv.cpp?rev=738425&r1=738424&r2=738425&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/JCCEnv.cpp (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/JCCEnv.cpp Wed Jan 28 09:54:06 2009
@@ -1,6 +1,4 @@
-/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
+/* ====================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -12,6 +10,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
+ * ====================================================================
*/
#include <map>
@@ -81,7 +80,7 @@
_sys = (jclass) vm_env->NewGlobalRef(vm_env->FindClass("java/lang/System"));
_obj = (jclass) vm_env->NewGlobalRef(vm_env->FindClass("java/lang/Object"));
#ifdef _jcc_lib
- _thr = (jclass) vm_env->NewGlobalRef(vm_env->FindClass("org/osafoundation/jcc/PythonException"));
+ _thr = (jclass) vm_env->NewGlobalRef(vm_env->FindClass("org/apache/jcc/PythonException"));
#else
_thr = (jclass) vm_env->NewGlobalRef(vm_env->FindClass("java/lang/RuntimeException"));
#endif
Modified: lucene/pylucene/trunk/jcc/jcc/sources/jcc.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/jcc.cpp?rev=738425&r1=738424&r2=738425&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/jcc.cpp (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/jcc.cpp Wed Jan 28 09:54:06 2009
@@ -1,6 +1,4 @@
-/*
- * Copyright (c) 2007-2008 Open Source Applications Foundation
- *
+/* ====================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -12,6 +10,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
+ * ====================================================================
*/
#include <stdio.h>
@@ -389,7 +388,7 @@
#ifdef _jcc_lib
static void raise_error(JNIEnv *vm_env, const char *message)
{
- jclass cls = vm_env->FindClass("org/osafoundation/jcc/PythonException");
+ jclass cls = vm_env->FindClass("org/apache/jcc/PythonException");
vm_env->ThrowNew(cls, message);
}
@@ -405,7 +404,7 @@
return JNI_VERSION_1_4;
}
- JNIEXPORT void JNICALL Java_org_osafoundation_jcc_PythonVM_init(JNIEnv *vm_env, jobject self, jstring programName, jobjectArray args)
+ JNIEXPORT void JNICALL Java_org_apache_jcc_PythonVM_init(JNIEnv *vm_env, jobject self, jstring programName, jobjectArray args)
{
const char *str = vm_env->GetStringUTFChars(programName, JNI_FALSE);
#ifdef linux
@@ -447,7 +446,7 @@
PyEval_ReleaseLock();
}
- JNIEXPORT jobject JNICALL Java_org_osafoundation_jcc_PythonVM_instantiate(JNIEnv *vm_env, jobject self, jstring moduleName, jstring className)
+ JNIEXPORT jobject JNICALL Java_org_apache_jcc_PythonVM_instantiate(JNIEnv *vm_env, jobject self, jstring moduleName, jstring className)
{
PythonGIL gil(vm_env);
@@ -605,7 +604,7 @@
#ifdef _jcc_lib
static void registerNatives(JNIEnv *vm_env)
{
- jclass cls = vm_env->FindClass("org/osafoundation/jcc/PythonException");
+ jclass cls = vm_env->FindClass("org/apache/jcc/PythonException");
JNINativeMethod methods[] = {
{ "getErrorInfo", "()V", (void *) PythonException_getErrorInfo },
{ "clear", "()V", (void *) PythonException_clear },
Modified: lucene/pylucene/trunk/jcc/setup.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/setup.py?rev=738425&r1=738424&r2=738425&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/setup.py (original)
+++ lucene/pylucene/trunk/jcc/setup.py Wed Jan 28 09:54:06 2009
@@ -1,5 +1,3 @@
-# Copyright (c) 2007-2008 Open Source Applications Foundation
-#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@@ -254,8 +252,8 @@
args = _javac[:]
args.extend(('-d', 'jcc/classes'))
- args.append('java/org/osafoundation/jcc/PythonVM.java')
- args.append('java/org/osafoundation/jcc/PythonException.java')
+ args.append('java/org/apache/jcc/PythonVM.java')
+ args.append('java/org/apache/jcc/PythonException.java')
if not os.path.exists('jcc/classes'):
os.makedirs('jcc/classes')
try:
@@ -265,8 +263,8 @@
process.wait()
if process.returncode != 0:
raise OSError, process.stderr.read()
- package_data.append('classes/org/osafoundation/jcc/PythonVM.class')
- package_data.append('classes/org/osafoundation/jcc/PythonException.class')
+ package_data.append('classes/org/apache/jcc/PythonVM.class')
+ package_data.append('classes/org/apache/jcc/PythonException.class')
extensions.append(Extension('jcc._jcc',
extra_compile_args=cflags,
@@ -280,7 +278,7 @@
'description': 'a C++ code generator for calling Java from C++/Python',
'long_description': open('DESCRIPTION').read(),
'author': 'Andi Vajda',
- 'author_email': 'vajda@osafoundation.org',
+ 'author_email': 'vajda@apache.org',
'classifiers': ['Development Status :: 5 - Production/Stable',
'Environment :: Console',
'Intended Audience :: Developers',