Author: mturk
Date: Mon Apr 27 18:07:25 2009
New Revision: 769078
URL: http://svn.apache.org/viewvc?rev=769078&view=rev
Log:
Move the User and Group to the package base
Added:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Group.java
- copied, changed from r769072,
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/util/Group.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/User.java
- copied, changed from r769072,
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/util/User.java
Removed:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/util/Group.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/util/User.java
Modified:
commons/sandbox/runtime/trunk/src/main/native/os/unix/group.c
commons/sandbox/runtime/trunk/src/main/native/os/unix/user.c
commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestGroup.java
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestUser.java
Copied:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Group.java
(from r769072,
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/util/Group.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Group.java?p2=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Group.java&p1=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/util/Group.java&r1=769072&r2=769078&rev=769078&view=diff
==============================================================================
---
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/util/Group.java
(original)
+++
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Group.java
Mon Apr 27 18:07:25 2009
@@ -14,9 +14,8 @@
* limitations under the License.
*/
-package org.apache.commons.runtime.util;
+package org.apache.commons.runtime;
-import org.apache.commons.runtime.Descriptor;
import org.apache.commons.runtime.exception.NoSuchObjectException;
import java.io.IOException;
Copied:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/User.java
(from r769072,
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/util/User.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/User.java?p2=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/User.java&p1=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/util/User.java&r1=769072&r2=769078&rev=769078&view=diff
==============================================================================
---
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/util/User.java
(original)
+++
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/User.java
Mon Apr 27 18:07:25 2009
@@ -14,9 +14,8 @@
* limitations under the License.
*/
-package org.apache.commons.runtime.util;
+package org.apache.commons.runtime;
-import org.apache.commons.runtime.Descriptor;
import org.apache.commons.runtime.exception.NoSuchObjectException;
import java.io.IOException;
@@ -122,7 +121,7 @@
* {...@code Descriptor} identifier of the user.
*/
public final Descriptor Id;
-
+
/**
* Compares this {...@code User} to the specified object.
*
Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/group.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/group.c?rev=769078&r1=769077&r2=769078&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/group.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/group.c Mon Apr 27
18:07:25 2009
@@ -29,7 +29,7 @@
J_DECLARE_CLAZZ = {
NULL,
NULL,
- ACR_CLASS_PATH "util/Group"
+ ACR_CLASS_PATH "Group"
};
J_DECLARE_M_ID(0000) = {
@@ -63,7 +63,7 @@
"Z"
};
-ACR_CLASS_LDEF(util_Group)
+ACR_CLASS_LDEF(Group)
{
int rv;
@@ -78,7 +78,7 @@
return ACR_SUCCESS;
}
-ACR_CLASS_UDEF(util_Group)
+ACR_CLASS_UDEF(Group)
{
ACR_UnloadClass(_E, &_clazzn);
}
@@ -118,8 +118,8 @@
return grp;
}
-ACR_JNI_EXPORT_DECLARE(jobject, util_Group, get0)(ACR_JNISTDARGS,
- jstring name)
+ACR_JNI_EXPORT_DECLARE(jobject, Group, get0)(ACR_JNISTDARGS,
+ jstring name)
{
jobject grp = NULL;
UNREFERENCED_O;
@@ -147,8 +147,8 @@
return grp;
}
-ACR_JNI_EXPORT_DECLARE(jboolean, util_Group, equals0)(ACR_JNISTDARGS,
- jobject a, jobject b)
+ACR_JNI_EXPORT_DECLARE(jboolean, Group, equals0)(ACR_JNISTDARGS,
+ jobject a, jobject b)
{
gid_t gida = ACR_DescriptorGetInt(_E, a);
gid_t gidb = ACR_DescriptorGetInt(_E, b);
Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/user.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/user.c?rev=769078&r1=769077&r2=769078&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/user.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/user.c Mon Apr 27
18:07:25 2009
@@ -29,7 +29,7 @@
J_DECLARE_CLAZZ = {
NULL,
NULL,
- ACR_CLASS_PATH "util/User"
+ ACR_CLASS_PATH "User"
};
J_DECLARE_M_ID(0000) = {
@@ -74,7 +74,7 @@
"Ljava/lang/String;"
};
-ACR_CLASS_LDEF(util_User)
+ACR_CLASS_LDEF(User)
{
int rv;
@@ -91,7 +91,7 @@
return ACR_SUCCESS;
}
-ACR_CLASS_UDEF(util_User)
+ACR_CLASS_UDEF(User)
{
ACR_UnloadClass(_E, &_clazzn);
}
@@ -133,8 +133,8 @@
return usr;
}
-ACR_JNI_EXPORT_DECLARE(jobject, util_User, get0)(ACR_JNISTDARGS,
- jstring name)
+ACR_JNI_EXPORT_DECLARE(jobject, User, get0)(ACR_JNISTDARGS,
+ jstring name)
{
jobject usr = NULL;
UNREFERENCED_O;
@@ -162,8 +162,8 @@
return usr;
}
-ACR_JNI_EXPORT_DECLARE(jboolean, util_User, equals0)(ACR_JNISTDARGS,
- jobject a, jobject b)
+ACR_JNI_EXPORT_DECLARE(jboolean, User, equals0)(ACR_JNISTDARGS,
+ jobject a, jobject b)
{
uid_t uida = ACR_DescriptorGetInt(_E, a);
uid_t uidb = ACR_DescriptorGetInt(_E, b);
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c?rev=769078&r1=769077&r2=769078&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c Mon Apr 27
18:07:25 2009
@@ -246,18 +246,18 @@
/* Forward class loading declarations */
ACR_CLASS_LDEC(Descriptor);
ACR_CLASS_LDEC(Pointer);
+ACR_CLASS_LDEC(Group);
+ACR_CLASS_LDEC(User);
ACR_CLASS_LDEC(io_File);
-ACR_CLASS_LDEC(util_Group);
-ACR_CLASS_LDEC(util_User);
ACR_DECLARE(int) ACR_LoadRuntimeClasses(JNIEnv *_E)
{
ACR_CLASS_LRUN(Descriptor);
ACR_CLASS_LRUN(Pointer);
+ ACR_CLASS_LRUN(Group);
+ ACR_CLASS_LRUN(User);
ACR_CLASS_LRUN(io_File);
- ACR_CLASS_LRUN(util_Group);
- ACR_CLASS_LRUN(util_User);
#ifdef WIN32
#endif
@@ -270,9 +270,9 @@
ACR_CLASS_URUN(Descriptor);
ACR_CLASS_URUN(Pointer);
+ ACR_CLASS_URUN(Group);
+ ACR_CLASS_URUN(User);
ACR_CLASS_URUN(io_File);
- ACR_CLASS_URUN(util_Group);
- ACR_CLASS_URUN(util_User);
#ifdef WIN32
#endif
Modified:
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestGroup.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestGroup.java?rev=769078&r1=769077&r2=769078&view=diff
==============================================================================
---
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestGroup.java
(original)
+++
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestGroup.java
Mon Apr 27 18:07:25 2009
@@ -16,7 +16,6 @@
package org.apache.commons.runtime;
-import org.apache.commons.runtime.util.Group;
import org.apache.commons.runtime.exception.*;
import java.lang.System;
Modified:
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestUser.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestUser.java?rev=769078&r1=769077&r2=769078&view=diff
==============================================================================
---
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestUser.java
(original)
+++
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestUser.java
Mon Apr 27 18:07:25 2009
@@ -16,7 +16,6 @@
package org.apache.commons.runtime;
-import org.apache.commons.runtime.util.User;
import org.apache.commons.runtime.exception.*;
import java.lang.System;
